diff --git a/spec/unit/ral/types/exec.rb b/spec/unit/ral/type/exec.rb
similarity index 100%
rename from spec/unit/ral/types/exec.rb
rename to spec/unit/ral/type/exec.rb
diff --git a/spec/unit/ral/types/file.rb b/spec/unit/ral/type/file.rb
similarity index 100%
rename from spec/unit/ral/types/file.rb
rename to spec/unit/ral/type/file.rb
diff --git a/spec/unit/ral/types/interface.rb b/spec/unit/ral/type/interface.rb
similarity index 100%
rename from spec/unit/ral/types/interface.rb
rename to spec/unit/ral/type/interface.rb
diff --git a/spec/unit/ral/types/mount.rb b/spec/unit/ral/type/mount.rb
similarity index 100%
rename from spec/unit/ral/types/mount.rb
rename to spec/unit/ral/type/mount.rb
diff --git a/spec/unit/ral/types/nagios.rb b/spec/unit/ral/type/nagios.rb
similarity index 100%
rename from spec/unit/ral/types/nagios.rb
rename to spec/unit/ral/type/nagios.rb
diff --git a/spec/unit/ral/types/package.rb b/spec/unit/ral/type/package.rb
similarity index 100%
rename from spec/unit/ral/types/package.rb
rename to spec/unit/ral/type/package.rb
diff --git a/spec/unit/ral/types/schedule.rb b/spec/unit/ral/type/schedule.rb
similarity index 100%
rename from spec/unit/ral/types/schedule.rb
rename to spec/unit/ral/type/schedule.rb
diff --git a/spec/unit/ral/types/service.rb b/spec/unit/ral/type/service.rb
similarity index 100%
rename from spec/unit/ral/types/service.rb
rename to spec/unit/ral/type/service.rb
diff --git a/spec/unit/ral/types/user.rb b/spec/unit/ral/type/user.rb
similarity index 100%
rename from spec/unit/ral/types/user.rb
rename to spec/unit/ral/type/user.rb
diff --git a/test/ral/types/basic.rb b/test/ral/type/basic.rb
similarity index 100%
rename from test/ral/types/basic.rb
rename to test/ral/type/basic.rb
diff --git a/test/ral/types/cron.rb b/test/ral/type/cron.rb
similarity index 100%
rename from test/ral/types/cron.rb
rename to test/ral/type/cron.rb
diff --git a/test/ral/types/exec.rb b/test/ral/type/exec.rb
similarity index 100%
rename from test/ral/types/exec.rb
rename to test/ral/type/exec.rb
diff --git a/test/ral/types/file.rb b/test/ral/type/file.rb
similarity index 100%
rename from test/ral/types/file.rb
rename to test/ral/type/file.rb
diff --git a/test/ral/types/file/target.rb b/test/ral/type/file/target.rb
similarity index 100%
rename from test/ral/types/file/target.rb
rename to test/ral/type/file/target.rb
diff --git a/test/ral/types/filebucket.rb b/test/ral/type/filebucket.rb
similarity index 100%
rename from test/ral/types/filebucket.rb
rename to test/ral/type/filebucket.rb
diff --git a/test/ral/types/fileignoresource.rb b/test/ral/type/fileignoresource.rb
similarity index 100%
rename from test/ral/types/fileignoresource.rb
rename to test/ral/type/fileignoresource.rb
diff --git a/test/ral/types/filesources.rb b/test/ral/type/filesources.rb
similarity index 100%
rename from test/ral/types/filesources.rb
rename to test/ral/type/filesources.rb
diff --git a/test/ral/types/group.rb b/test/ral/type/group.rb
similarity index 100%
rename from test/ral/types/group.rb
rename to test/ral/type/group.rb
diff --git a/test/ral/types/host.rb b/test/ral/type/host.rb
similarity index 100%
rename from test/ral/types/host.rb
rename to test/ral/type/host.rb
diff --git a/test/ral/types/mailalias.rb b/test/ral/type/mailalias.rb
similarity index 100%
rename from test/ral/types/mailalias.rb
rename to test/ral/type/mailalias.rb
diff --git a/test/ral/types/parameter.rb b/test/ral/type/parameter.rb
similarity index 100%
rename from test/ral/types/parameter.rb
rename to test/ral/type/parameter.rb
diff --git a/test/ral/types/port.rb b/test/ral/type/port.rb
similarity index 100%
rename from test/ral/types/port.rb
rename to test/ral/type/port.rb
diff --git a/test/ral/types/property.rb b/test/ral/type/property.rb
similarity index 100%
rename from test/ral/types/property.rb
rename to test/ral/type/property.rb
diff --git a/test/ral/types/resources.rb b/test/ral/type/resources.rb
similarity index 100%
rename from test/ral/types/resources.rb
rename to test/ral/type/resources.rb
diff --git a/test/ral/types/service.rb b/test/ral/type/service.rb
similarity index 100%
rename from test/ral/types/service.rb
rename to test/ral/type/service.rb
diff --git a/test/ral/types/sshkey.rb b/test/ral/type/sshkey.rb
similarity index 100%
rename from test/ral/types/sshkey.rb
rename to test/ral/type/sshkey.rb
diff --git a/test/ral/types/tidy.rb b/test/ral/type/tidy.rb
similarity index 100%
rename from test/ral/types/tidy.rb
rename to test/ral/type/tidy.rb
diff --git a/test/ral/types/user.rb b/test/ral/type/user.rb
similarity index 100%
rename from test/ral/types/user.rb
rename to test/ral/type/user.rb
diff --git a/test/ral/types/yumrepo.rb b/test/ral/type/yumrepo.rb
similarity index 100%
rename from test/ral/types/yumrepo.rb
rename to test/ral/type/yumrepo.rb
diff --git a/test/ral/types/zone.rb b/test/ral/type/zone.rb
similarity index 100%
rename from test/ral/types/zone.rb
rename to test/ral/type/zone.rb