diff --git a/global/overlay/etc/puppet/soc/facts.d/.empty b/global/overlay/etc/puppet/modules/soc/facts.d/.empty
similarity index 100%
rename from global/overlay/etc/puppet/soc/facts.d/.empty
rename to global/overlay/etc/puppet/modules/soc/facts.d/.empty
diff --git a/global/overlay/etc/puppet/soc/files/sso/acme-dns-auth.py b/global/overlay/etc/puppet/modules/soc/files/sso/acme-dns-auth.py
similarity index 100%
rename from global/overlay/etc/puppet/soc/files/sso/acme-dns-auth.py
rename to global/overlay/etc/puppet/modules/soc/files/sso/acme-dns-auth.py
diff --git a/global/overlay/etc/puppet/soc/files/sso/apache-ssl.conf b/global/overlay/etc/puppet/modules/soc/files/sso/apache-ssl.conf
similarity index 100%
rename from global/overlay/etc/puppet/soc/files/sso/apache-ssl.conf
rename to global/overlay/etc/puppet/modules/soc/files/sso/apache-ssl.conf
diff --git a/global/overlay/etc/puppet/soc/files/sso/attribute-map.xml b/global/overlay/etc/puppet/modules/soc/files/sso/attribute-map.xml
similarity index 100%
rename from global/overlay/etc/puppet/soc/files/sso/attribute-map.xml
rename to global/overlay/etc/puppet/modules/soc/files/sso/attribute-map.xml
diff --git a/global/overlay/etc/puppet/soc/files/sso/attribute-policy.xml b/global/overlay/etc/puppet/modules/soc/files/sso/attribute-policy.xml
similarity index 100%
rename from global/overlay/etc/puppet/soc/files/sso/attribute-policy.xml
rename to global/overlay/etc/puppet/modules/soc/files/sso/attribute-policy.xml
diff --git a/global/overlay/etc/puppet/soc/files/sso/md-signer2.crt b/global/overlay/etc/puppet/modules/soc/files/sso/md-signer2.crt
similarity index 100%
rename from global/overlay/etc/puppet/soc/files/sso/md-signer2.crt
rename to global/overlay/etc/puppet/modules/soc/files/sso/md-signer2.crt
diff --git a/global/overlay/etc/puppet/soc/manifests/sso.pp b/global/overlay/etc/puppet/modules/soc/manifests/sso.pp
similarity index 100%
rename from global/overlay/etc/puppet/soc/manifests/sso.pp
rename to global/overlay/etc/puppet/modules/soc/manifests/sso.pp
diff --git a/global/overlay/etc/puppet/soc/templates/sso/apache-groups.txt.erb b/global/overlay/etc/puppet/modules/soc/templates/sso/apache-groups.txt.erb
similarity index 100%
rename from global/overlay/etc/puppet/soc/templates/sso/apache-groups.txt.erb
rename to global/overlay/etc/puppet/modules/soc/templates/sso/apache-groups.txt.erb
diff --git a/global/overlay/etc/puppet/soc/templates/sso/apache-site.conf.erb b/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb
similarity index 100%
rename from global/overlay/etc/puppet/soc/templates/sso/apache-site.conf.erb
rename to global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb
diff --git a/global/overlay/etc/puppet/soc/templates/sso/docker-compose.yml.erb b/global/overlay/etc/puppet/modules/soc/templates/sso/docker-compose.yml.erb
similarity index 100%
rename from global/overlay/etc/puppet/soc/templates/sso/docker-compose.yml.erb
rename to global/overlay/etc/puppet/modules/soc/templates/sso/docker-compose.yml.erb
diff --git a/global/overlay/etc/puppet/soc/templates/sso/shibboleth2.xml.erb b/global/overlay/etc/puppet/modules/soc/templates/sso/shibboleth2.xml.erb
similarity index 100%
rename from global/overlay/etc/puppet/soc/templates/sso/shibboleth2.xml.erb
rename to global/overlay/etc/puppet/modules/soc/templates/sso/shibboleth2.xml.erb
diff --git a/global/overlay/etc/puppet/soc/templates/sso/shibd.logger.erb b/global/overlay/etc/puppet/modules/soc/templates/sso/shibd.logger.erb
similarity index 100%
rename from global/overlay/etc/puppet/soc/templates/sso/shibd.logger.erb
rename to global/overlay/etc/puppet/modules/soc/templates/sso/shibd.logger.erb