diff --git a/environment.conf b/environment.conf
index a986777..11e1003 100644
--- a/environment.conf
+++ b/environment.conf
@@ -1,2 +1,2 @@
-modulepath          = site:modules:$basemodulepath
+modulepath          = site-modules:modules:$basemodulepath
 config_version      = 'scripts/config_version.sh $environmentpath $environment'
diff --git a/site/profile/manifests/base.pp b/site-modules/profile/manifests/base.pp
similarity index 100%
rename from site/profile/manifests/base.pp
rename to site-modules/profile/manifests/base.pp
diff --git a/site/profile/manifests/example.pp b/site-modules/profile/manifests/example.pp
similarity index 100%
rename from site/profile/manifests/example.pp
rename to site-modules/profile/manifests/example.pp
diff --git a/site/role/manifests/database_server.pp b/site-modules/role/manifests/database_server.pp
similarity index 100%
rename from site/role/manifests/database_server.pp
rename to site-modules/role/manifests/database_server.pp
diff --git a/site/role/manifests/example.pp b/site-modules/role/manifests/example.pp
similarity index 100%
rename from site/role/manifests/example.pp
rename to site-modules/role/manifests/example.pp
diff --git a/site/role/manifests/webserver.pp b/site-modules/role/manifests/webserver.pp
similarity index 100%
rename from site/role/manifests/webserver.pp
rename to site-modules/role/manifests/webserver.pp