diff --git a/composer.json b/composer.json
index 549c703b0ae32b1aa60bdce700f6baacc8eceaf7..fa2d8aaaaa44afafb2afd2d60c10b6ee3a975fe8 100644
--- a/composer.json
+++ b/composer.json
@@ -22,23 +22,23 @@
     "autoload": {
         "psr-4": {
             "SimpleSAML\\": "src/SimpleSAML",
-            "SimpleSAML\\Module\\admin\\": "modules/admin/lib",
-            "SimpleSAML\\Module\\core\\": "modules/core/lib",
-            "SimpleSAML\\Module\\cron\\": "modules/cron/lib",
-            "SimpleSAML\\Module\\exampleauth\\": "modules/exampleauth/lib",
-            "SimpleSAML\\Module\\multiauth\\": "modules/multiauth/lib",
-            "SimpleSAML\\Module\\saml\\": "modules/saml/lib"
+            "SimpleSAML\\Module\\admin\\": "modules/admin/src",
+            "SimpleSAML\\Module\\core\\": "modules/core/src",
+            "SimpleSAML\\Module\\cron\\": "modules/cron/src",
+            "SimpleSAML\\Module\\exampleauth\\": "modules/exampleauth/src",
+            "SimpleSAML\\Module\\multiauth\\": "modules/multiauth/src",
+            "SimpleSAML\\Module\\saml\\": "modules/saml/src"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "SimpleSAML\\Test\\": ["tests", "tests/src/SimpleSAML"],
-            "SimpleSAML\\Test\\Module\\admin\\": ["tests//modules/admin/lib"],
-            "SimpleSAML\\Test\\Module\\core\\": ["tests/modules/core/lib"],
-            "SimpleSAML\\Test\\Module\\cron\\": ["tests/modules/cron/lib"],
-            "SimpleSAML\\Test\\Module\\exampleauth\\": ["tests/modules/exampleauth/lib"],
-            "SimpleSAML\\Test\\Module\\multiauth\\": ["tests/modules/multiauth/lib"],
-            "SimpleSAML\\Test\\Module\\saml\\": ["tests/modules/saml/lib"]
+            "SimpleSAML\\Test\\Module\\admin\\": ["tests//modules/admin/src"],
+            "SimpleSAML\\Test\\Module\\core\\": ["tests/modules/core/src"],
+            "SimpleSAML\\Test\\Module\\cron\\": ["tests/modules/cron/src"],
+            "SimpleSAML\\Test\\Module\\exampleauth\\": ["tests/modules/exampleauth/src"],
+            "SimpleSAML\\Test\\Module\\multiauth\\": ["tests/modules/multiauth/src"],
+            "SimpleSAML\\Test\\Module\\saml\\": ["tests/modules/saml/src"]
         }
     },
     "require": {
diff --git a/modules/admin/lib/Controller/Config.php b/modules/admin/src/Controller/Config.php
similarity index 100%
rename from modules/admin/lib/Controller/Config.php
rename to modules/admin/src/Controller/Config.php
diff --git a/modules/admin/lib/Controller/Federation.php b/modules/admin/src/Controller/Federation.php
similarity index 100%
rename from modules/admin/lib/Controller/Federation.php
rename to modules/admin/src/Controller/Federation.php
diff --git a/modules/admin/lib/Controller/Menu.php b/modules/admin/src/Controller/Menu.php
similarity index 100%
rename from modules/admin/lib/Controller/Menu.php
rename to modules/admin/src/Controller/Menu.php
diff --git a/modules/admin/lib/Controller/Sandbox.php b/modules/admin/src/Controller/Sandbox.php
similarity index 100%
rename from modules/admin/lib/Controller/Sandbox.php
rename to modules/admin/src/Controller/Sandbox.php
diff --git a/modules/admin/lib/Controller/Test.php b/modules/admin/src/Controller/Test.php
similarity index 100%
rename from modules/admin/lib/Controller/Test.php
rename to modules/admin/src/Controller/Test.php
diff --git a/modules/core/lib/Auth/Process/AttributeAdd.php b/modules/core/src/Auth/Process/AttributeAdd.php
similarity index 100%
rename from modules/core/lib/Auth/Process/AttributeAdd.php
rename to modules/core/src/Auth/Process/AttributeAdd.php
diff --git a/modules/core/lib/Auth/Process/AttributeAlter.php b/modules/core/src/Auth/Process/AttributeAlter.php
similarity index 100%
rename from modules/core/lib/Auth/Process/AttributeAlter.php
rename to modules/core/src/Auth/Process/AttributeAlter.php
diff --git a/modules/core/lib/Auth/Process/AttributeCopy.php b/modules/core/src/Auth/Process/AttributeCopy.php
similarity index 100%
rename from modules/core/lib/Auth/Process/AttributeCopy.php
rename to modules/core/src/Auth/Process/AttributeCopy.php
diff --git a/modules/core/lib/Auth/Process/AttributeLimit.php b/modules/core/src/Auth/Process/AttributeLimit.php
similarity index 100%
rename from modules/core/lib/Auth/Process/AttributeLimit.php
rename to modules/core/src/Auth/Process/AttributeLimit.php
diff --git a/modules/core/lib/Auth/Process/AttributeMap.php b/modules/core/src/Auth/Process/AttributeMap.php
similarity index 100%
rename from modules/core/lib/Auth/Process/AttributeMap.php
rename to modules/core/src/Auth/Process/AttributeMap.php
diff --git a/modules/core/lib/Auth/Process/AttributeValueMap.php b/modules/core/src/Auth/Process/AttributeValueMap.php
similarity index 100%
rename from modules/core/lib/Auth/Process/AttributeValueMap.php
rename to modules/core/src/Auth/Process/AttributeValueMap.php
diff --git a/modules/core/lib/Auth/Process/Cardinality.php b/modules/core/src/Auth/Process/Cardinality.php
similarity index 100%
rename from modules/core/lib/Auth/Process/Cardinality.php
rename to modules/core/src/Auth/Process/Cardinality.php
diff --git a/modules/core/lib/Auth/Process/CardinalitySingle.php b/modules/core/src/Auth/Process/CardinalitySingle.php
similarity index 100%
rename from modules/core/lib/Auth/Process/CardinalitySingle.php
rename to modules/core/src/Auth/Process/CardinalitySingle.php
diff --git a/modules/core/lib/Auth/Process/ExtendIdPSession.php b/modules/core/src/Auth/Process/ExtendIdPSession.php
similarity index 100%
rename from modules/core/lib/Auth/Process/ExtendIdPSession.php
rename to modules/core/src/Auth/Process/ExtendIdPSession.php
diff --git a/modules/core/lib/Auth/Process/GenerateGroups.php b/modules/core/src/Auth/Process/GenerateGroups.php
similarity index 100%
rename from modules/core/lib/Auth/Process/GenerateGroups.php
rename to modules/core/src/Auth/Process/GenerateGroups.php
diff --git a/modules/core/lib/Auth/Process/LanguageAdaptor.php b/modules/core/src/Auth/Process/LanguageAdaptor.php
similarity index 100%
rename from modules/core/lib/Auth/Process/LanguageAdaptor.php
rename to modules/core/src/Auth/Process/LanguageAdaptor.php
diff --git a/modules/core/lib/Auth/Process/PHP.php b/modules/core/src/Auth/Process/PHP.php
similarity index 100%
rename from modules/core/lib/Auth/Process/PHP.php
rename to modules/core/src/Auth/Process/PHP.php
diff --git a/modules/core/lib/Auth/Process/ScopeAttribute.php b/modules/core/src/Auth/Process/ScopeAttribute.php
similarity index 100%
rename from modules/core/lib/Auth/Process/ScopeAttribute.php
rename to modules/core/src/Auth/Process/ScopeAttribute.php
diff --git a/modules/core/lib/Auth/Process/ScopeFromAttribute.php b/modules/core/src/Auth/Process/ScopeFromAttribute.php
similarity index 100%
rename from modules/core/lib/Auth/Process/ScopeFromAttribute.php
rename to modules/core/src/Auth/Process/ScopeFromAttribute.php
diff --git a/modules/core/lib/Auth/Process/StatisticsWithAttribute.php b/modules/core/src/Auth/Process/StatisticsWithAttribute.php
similarity index 100%
rename from modules/core/lib/Auth/Process/StatisticsWithAttribute.php
rename to modules/core/src/Auth/Process/StatisticsWithAttribute.php
diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/src/Auth/Process/TargetedID.php
similarity index 100%
rename from modules/core/lib/Auth/Process/TargetedID.php
rename to modules/core/src/Auth/Process/TargetedID.php
diff --git a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php b/modules/core/src/Auth/Process/WarnShortSSOInterval.php
similarity index 100%
rename from modules/core/lib/Auth/Process/WarnShortSSOInterval.php
rename to modules/core/src/Auth/Process/WarnShortSSOInterval.php
diff --git a/modules/core/lib/Auth/Source/AbstractSourceSelector.php b/modules/core/src/Auth/Source/AbstractSourceSelector.php
similarity index 100%
rename from modules/core/lib/Auth/Source/AbstractSourceSelector.php
rename to modules/core/src/Auth/Source/AbstractSourceSelector.php
diff --git a/modules/core/lib/Auth/Source/AdminPassword.php b/modules/core/src/Auth/Source/AdminPassword.php
similarity index 100%
rename from modules/core/lib/Auth/Source/AdminPassword.php
rename to modules/core/src/Auth/Source/AdminPassword.php
diff --git a/modules/core/lib/Auth/Source/IPSourceSelector.php b/modules/core/src/Auth/Source/IPSourceSelector.php
similarity index 100%
rename from modules/core/lib/Auth/Source/IPSourceSelector.php
rename to modules/core/src/Auth/Source/IPSourceSelector.php
diff --git a/modules/core/lib/Auth/UserPassBase.php b/modules/core/src/Auth/UserPassBase.php
similarity index 100%
rename from modules/core/lib/Auth/UserPassBase.php
rename to modules/core/src/Auth/UserPassBase.php
diff --git a/modules/core/lib/Auth/UserPassOrgBase.php b/modules/core/src/Auth/UserPassOrgBase.php
similarity index 100%
rename from modules/core/lib/Auth/UserPassOrgBase.php
rename to modules/core/src/Auth/UserPassOrgBase.php
diff --git a/modules/core/lib/Controller/ErrorReport.php b/modules/core/src/Controller/ErrorReport.php
similarity index 100%
rename from modules/core/lib/Controller/ErrorReport.php
rename to modules/core/src/Controller/ErrorReport.php
diff --git a/modules/core/lib/Controller/Exception.php b/modules/core/src/Controller/Exception.php
similarity index 100%
rename from modules/core/lib/Controller/Exception.php
rename to modules/core/src/Controller/Exception.php
diff --git a/modules/core/lib/Controller/Login.php b/modules/core/src/Controller/Login.php
similarity index 100%
rename from modules/core/lib/Controller/Login.php
rename to modules/core/src/Controller/Login.php
diff --git a/modules/core/lib/Controller/Logout.php b/modules/core/src/Controller/Logout.php
similarity index 100%
rename from modules/core/lib/Controller/Logout.php
rename to modules/core/src/Controller/Logout.php
diff --git a/modules/core/lib/Controller/Redirection.php b/modules/core/src/Controller/Redirection.php
similarity index 100%
rename from modules/core/lib/Controller/Redirection.php
rename to modules/core/src/Controller/Redirection.php
diff --git a/modules/core/lib/Stats/Output/File.php b/modules/core/src/Stats/Output/File.php
similarity index 100%
rename from modules/core/lib/Stats/Output/File.php
rename to modules/core/src/Stats/Output/File.php
diff --git a/modules/core/lib/Stats/Output/Log.php b/modules/core/src/Stats/Output/Log.php
similarity index 100%
rename from modules/core/lib/Stats/Output/Log.php
rename to modules/core/src/Stats/Output/Log.php
diff --git a/modules/core/lib/Storage/SQLPermanentStorage.php b/modules/core/src/Storage/SQLPermanentStorage.php
similarity index 100%
rename from modules/core/lib/Storage/SQLPermanentStorage.php
rename to modules/core/src/Storage/SQLPermanentStorage.php
diff --git a/modules/cron/lib/Controller/Cron.php b/modules/cron/src/Controller/Cron.php
similarity index 100%
rename from modules/cron/lib/Controller/Cron.php
rename to modules/cron/src/Controller/Cron.php
diff --git a/modules/cron/lib/Cron.php b/modules/cron/src/Cron.php
similarity index 100%
rename from modules/cron/lib/Cron.php
rename to modules/cron/src/Cron.php
diff --git a/modules/exampleauth/lib/Auth/Process/RedirectTest.php b/modules/exampleauth/src/Auth/Process/RedirectTest.php
similarity index 100%
rename from modules/exampleauth/lib/Auth/Process/RedirectTest.php
rename to modules/exampleauth/src/Auth/Process/RedirectTest.php
diff --git a/modules/exampleauth/lib/Auth/Source/External.php b/modules/exampleauth/src/Auth/Source/External.php
similarity index 100%
rename from modules/exampleauth/lib/Auth/Source/External.php
rename to modules/exampleauth/src/Auth/Source/External.php
diff --git a/modules/exampleauth/lib/Auth/Source/StaticSource.php b/modules/exampleauth/src/Auth/Source/StaticSource.php
similarity index 100%
rename from modules/exampleauth/lib/Auth/Source/StaticSource.php
rename to modules/exampleauth/src/Auth/Source/StaticSource.php
diff --git a/modules/exampleauth/lib/Auth/Source/UserPass.php b/modules/exampleauth/src/Auth/Source/UserPass.php
similarity index 100%
rename from modules/exampleauth/lib/Auth/Source/UserPass.php
rename to modules/exampleauth/src/Auth/Source/UserPass.php
diff --git a/modules/exampleauth/lib/Controller/ExampleAuth.php b/modules/exampleauth/src/Controller/ExampleAuth.php
similarity index 100%
rename from modules/exampleauth/lib/Controller/ExampleAuth.php
rename to modules/exampleauth/src/Controller/ExampleAuth.php
diff --git a/modules/multiauth/lib/Auth/Source/MultiAuth.php b/modules/multiauth/src/Auth/Source/MultiAuth.php
similarity index 100%
rename from modules/multiauth/lib/Auth/Source/MultiAuth.php
rename to modules/multiauth/src/Auth/Source/MultiAuth.php
diff --git a/modules/multiauth/lib/Controller/DiscoController.php b/modules/multiauth/src/Controller/DiscoController.php
similarity index 100%
rename from modules/multiauth/lib/Controller/DiscoController.php
rename to modules/multiauth/src/Controller/DiscoController.php
diff --git a/modules/saml/lib/Auth/Process/AttributeNameID.php b/modules/saml/src/Auth/Process/AttributeNameID.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/AttributeNameID.php
rename to modules/saml/src/Auth/Process/AttributeNameID.php
diff --git a/modules/saml/lib/Auth/Process/AuthnContextClassRef.php b/modules/saml/src/Auth/Process/AuthnContextClassRef.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/AuthnContextClassRef.php
rename to modules/saml/src/Auth/Process/AuthnContextClassRef.php
diff --git a/modules/saml/lib/Auth/Process/ExpectedAuthnContextClassRef.php b/modules/saml/src/Auth/Process/ExpectedAuthnContextClassRef.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/ExpectedAuthnContextClassRef.php
rename to modules/saml/src/Auth/Process/ExpectedAuthnContextClassRef.php
diff --git a/modules/saml/lib/Auth/Process/FilterScopes.php b/modules/saml/src/Auth/Process/FilterScopes.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/FilterScopes.php
rename to modules/saml/src/Auth/Process/FilterScopes.php
diff --git a/modules/saml/lib/Auth/Process/NameIDAttribute.php b/modules/saml/src/Auth/Process/NameIDAttribute.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/NameIDAttribute.php
rename to modules/saml/src/Auth/Process/NameIDAttribute.php
diff --git a/modules/saml/lib/Auth/Process/PersistentNameID.php b/modules/saml/src/Auth/Process/PersistentNameID.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/PersistentNameID.php
rename to modules/saml/src/Auth/Process/PersistentNameID.php
diff --git a/modules/saml/lib/Auth/Process/PersistentNameID2TargetedID.php b/modules/saml/src/Auth/Process/PersistentNameID2TargetedID.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/PersistentNameID2TargetedID.php
rename to modules/saml/src/Auth/Process/PersistentNameID2TargetedID.php
diff --git a/modules/saml/lib/Auth/Process/SQLPersistentNameID.php b/modules/saml/src/Auth/Process/SQLPersistentNameID.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/SQLPersistentNameID.php
rename to modules/saml/src/Auth/Process/SQLPersistentNameID.php
diff --git a/modules/saml/lib/Auth/Process/TransientNameID.php b/modules/saml/src/Auth/Process/TransientNameID.php
similarity index 100%
rename from modules/saml/lib/Auth/Process/TransientNameID.php
rename to modules/saml/src/Auth/Process/TransientNameID.php
diff --git a/modules/saml/lib/Auth/Source/SP.php b/modules/saml/src/Auth/Source/SP.php
similarity index 100%
rename from modules/saml/lib/Auth/Source/SP.php
rename to modules/saml/src/Auth/Source/SP.php
diff --git a/modules/saml/lib/BaseNameIDGenerator.php b/modules/saml/src/BaseNameIDGenerator.php
similarity index 100%
rename from modules/saml/lib/BaseNameIDGenerator.php
rename to modules/saml/src/BaseNameIDGenerator.php
diff --git a/modules/saml/lib/Controller/Disco.php b/modules/saml/src/Controller/Disco.php
similarity index 100%
rename from modules/saml/lib/Controller/Disco.php
rename to modules/saml/src/Controller/Disco.php
diff --git a/modules/saml/lib/Controller/Metadata.php b/modules/saml/src/Controller/Metadata.php
similarity index 100%
rename from modules/saml/lib/Controller/Metadata.php
rename to modules/saml/src/Controller/Metadata.php
diff --git a/modules/saml/lib/Controller/Proxy.php b/modules/saml/src/Controller/Proxy.php
similarity index 100%
rename from modules/saml/lib/Controller/Proxy.php
rename to modules/saml/src/Controller/Proxy.php
diff --git a/modules/saml/lib/Controller/ServiceProvider.php b/modules/saml/src/Controller/ServiceProvider.php
similarity index 100%
rename from modules/saml/lib/Controller/ServiceProvider.php
rename to modules/saml/src/Controller/ServiceProvider.php
diff --git a/modules/saml/lib/Controller/SingleLogout.php b/modules/saml/src/Controller/SingleLogout.php
similarity index 100%
rename from modules/saml/lib/Controller/SingleLogout.php
rename to modules/saml/src/Controller/SingleLogout.php
diff --git a/modules/saml/lib/Controller/WebBrowserSingleSignOn.php b/modules/saml/src/Controller/WebBrowserSingleSignOn.php
similarity index 100%
rename from modules/saml/lib/Controller/WebBrowserSingleSignOn.php
rename to modules/saml/src/Controller/WebBrowserSingleSignOn.php
diff --git a/modules/saml/lib/Error.php b/modules/saml/src/Error.php
similarity index 100%
rename from modules/saml/lib/Error.php
rename to modules/saml/src/Error.php
diff --git a/modules/saml/lib/Error/NoAuthnContext.php b/modules/saml/src/Error/NoAuthnContext.php
similarity index 100%
rename from modules/saml/lib/Error/NoAuthnContext.php
rename to modules/saml/src/Error/NoAuthnContext.php
diff --git a/modules/saml/lib/Error/NoAvailableIDP.php b/modules/saml/src/Error/NoAvailableIDP.php
similarity index 100%
rename from modules/saml/lib/Error/NoAvailableIDP.php
rename to modules/saml/src/Error/NoAvailableIDP.php
diff --git a/modules/saml/lib/Error/NoPassive.php b/modules/saml/src/Error/NoPassive.php
similarity index 100%
rename from modules/saml/lib/Error/NoPassive.php
rename to modules/saml/src/Error/NoPassive.php
diff --git a/modules/saml/lib/Error/NoSupportedIDP.php b/modules/saml/src/Error/NoSupportedIDP.php
similarity index 100%
rename from modules/saml/lib/Error/NoSupportedIDP.php
rename to modules/saml/src/Error/NoSupportedIDP.php
diff --git a/modules/saml/lib/Error/ProxyCountExceeded.php b/modules/saml/src/Error/ProxyCountExceeded.php
similarity index 100%
rename from modules/saml/lib/Error/ProxyCountExceeded.php
rename to modules/saml/src/Error/ProxyCountExceeded.php
diff --git a/modules/saml/lib/IdP/SAML2.php b/modules/saml/src/IdP/SAML2.php
similarity index 100%
rename from modules/saml/lib/IdP/SAML2.php
rename to modules/saml/src/IdP/SAML2.php
diff --git a/modules/saml/lib/IdP/SQLNameID.php b/modules/saml/src/IdP/SQLNameID.php
similarity index 100%
rename from modules/saml/lib/IdP/SQLNameID.php
rename to modules/saml/src/IdP/SQLNameID.php
diff --git a/modules/saml/lib/Message.php b/modules/saml/src/Message.php
similarity index 100%
rename from modules/saml/lib/Message.php
rename to modules/saml/src/Message.php
diff --git a/modules/saml/lib/SP/LogoutStore.php b/modules/saml/src/SP/LogoutStore.php
similarity index 100%
rename from modules/saml/lib/SP/LogoutStore.php
rename to modules/saml/src/SP/LogoutStore.php
diff --git a/tests/modules/admin/lib/Controller/ConfigTest.php b/tests/modules/admin/src/Controller/ConfigTest.php
similarity index 100%
rename from tests/modules/admin/lib/Controller/ConfigTest.php
rename to tests/modules/admin/src/Controller/ConfigTest.php
diff --git a/tests/modules/admin/lib/Controller/FederationTest.php b/tests/modules/admin/src/Controller/FederationTest.php
similarity index 100%
rename from tests/modules/admin/lib/Controller/FederationTest.php
rename to tests/modules/admin/src/Controller/FederationTest.php
diff --git a/tests/modules/admin/lib/Controller/SandboxTest.php b/tests/modules/admin/src/Controller/SandboxTest.php
similarity index 100%
rename from tests/modules/admin/lib/Controller/SandboxTest.php
rename to tests/modules/admin/src/Controller/SandboxTest.php
diff --git a/tests/modules/admin/lib/Controller/TestTest.php b/tests/modules/admin/src/Controller/TestTest.php
similarity index 100%
rename from tests/modules/admin/lib/Controller/TestTest.php
rename to tests/modules/admin/src/Controller/TestTest.php
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php b/tests/modules/core/src/Auth/Process/AttributeAddTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/AttributeAddTest.php
rename to tests/modules/core/src/Auth/Process/AttributeAddTest.php
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php b/tests/modules/core/src/Auth/Process/AttributeAlterTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
rename to tests/modules/core/src/Auth/Process/AttributeAlterTest.php
diff --git a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php b/tests/modules/core/src/Auth/Process/AttributeCopyTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
rename to tests/modules/core/src/Auth/Process/AttributeCopyTest.php
diff --git a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php b/tests/modules/core/src/Auth/Process/AttributeLimitTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
rename to tests/modules/core/src/Auth/Process/AttributeLimitTest.php
diff --git a/tests/modules/core/lib/Auth/Process/AttributeMapTest.php b/tests/modules/core/src/Auth/Process/AttributeMapTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/AttributeMapTest.php
rename to tests/modules/core/src/Auth/Process/AttributeMapTest.php
diff --git a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php b/tests/modules/core/src/Auth/Process/AttributeValueMapTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
rename to tests/modules/core/src/Auth/Process/AttributeValueMapTest.php
diff --git a/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php b/tests/modules/core/src/Auth/Process/CardinalitySingleTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
rename to tests/modules/core/src/Auth/Process/CardinalitySingleTest.php
diff --git a/tests/modules/core/lib/Auth/Process/CardinalityTest.php b/tests/modules/core/src/Auth/Process/CardinalityTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/CardinalityTest.php
rename to tests/modules/core/src/Auth/Process/CardinalityTest.php
diff --git a/tests/modules/core/lib/Auth/Process/PHPTest.php b/tests/modules/core/src/Auth/Process/PHPTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/PHPTest.php
rename to tests/modules/core/src/Auth/Process/PHPTest.php
diff --git a/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php b/tests/modules/core/src/Auth/Process/ScopeAttributeTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
rename to tests/modules/core/src/Auth/Process/ScopeAttributeTest.php
diff --git a/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php b/tests/modules/core/src/Auth/Process/ScopeFromAttributeTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
rename to tests/modules/core/src/Auth/Process/ScopeFromAttributeTest.php
diff --git a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php b/tests/modules/core/src/Auth/Process/TargetedIDTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Process/TargetedIDTest.php
rename to tests/modules/core/src/Auth/Process/TargetedIDTest.php
diff --git a/tests/modules/core/lib/Auth/Source/IPSourceSelectorTest.php b/tests/modules/core/src/Auth/Source/IPSourceSelectorTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/Source/IPSourceSelectorTest.php
rename to tests/modules/core/src/Auth/Source/IPSourceSelectorTest.php
diff --git a/tests/modules/core/lib/Auth/UserPassBaseTest.php b/tests/modules/core/src/Auth/UserPassBaseTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/UserPassBaseTest.php
rename to tests/modules/core/src/Auth/UserPassBaseTest.php
diff --git a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php b/tests/modules/core/src/Auth/UserPassOrgBaseTest.php
similarity index 100%
rename from tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
rename to tests/modules/core/src/Auth/UserPassOrgBaseTest.php
diff --git a/tests/modules/core/lib/Controller/ErrorReportTest.php b/tests/modules/core/src/Controller/ErrorReportTest.php
similarity index 100%
rename from tests/modules/core/lib/Controller/ErrorReportTest.php
rename to tests/modules/core/src/Controller/ErrorReportTest.php
diff --git a/tests/modules/core/lib/Controller/LoginTest.php b/tests/modules/core/src/Controller/LoginTest.php
similarity index 100%
rename from tests/modules/core/lib/Controller/LoginTest.php
rename to tests/modules/core/src/Controller/LoginTest.php
diff --git a/tests/modules/core/lib/Controller/LogoutTest.php b/tests/modules/core/src/Controller/LogoutTest.php
similarity index 100%
rename from tests/modules/core/lib/Controller/LogoutTest.php
rename to tests/modules/core/src/Controller/LogoutTest.php
diff --git a/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php b/tests/modules/core/src/Storage/SQLPermanentStorageTest.php
similarity index 100%
rename from tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
rename to tests/modules/core/src/Storage/SQLPermanentStorageTest.php
diff --git a/tests/modules/cron/lib/Controller/CronTest.php b/tests/modules/cron/src/Controller/CronTest.php
similarity index 100%
rename from tests/modules/cron/lib/Controller/CronTest.php
rename to tests/modules/cron/src/Controller/CronTest.php
diff --git a/tests/modules/exampleauth/lib/Controller/ExampleAuthTest.php b/tests/modules/exampleauth/src/Controller/ExampleAuthTest.php
similarity index 100%
rename from tests/modules/exampleauth/lib/Controller/ExampleAuthTest.php
rename to tests/modules/exampleauth/src/Controller/ExampleAuthTest.php
diff --git a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php b/tests/modules/multiauth/src/Auth/Source/MultiAuthTest.php
similarity index 100%
rename from tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
rename to tests/modules/multiauth/src/Auth/Source/MultiAuthTest.php
diff --git a/tests/modules/multiauth/lib/Controller/DiscoControllerTest.php b/tests/modules/multiauth/src/Controller/DiscoControllerTest.php
similarity index 100%
rename from tests/modules/multiauth/lib/Controller/DiscoControllerTest.php
rename to tests/modules/multiauth/src/Controller/DiscoControllerTest.php
diff --git a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php b/tests/modules/saml/src/Auth/Process/FilterScopesTest.php
similarity index 100%
rename from tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
rename to tests/modules/saml/src/Auth/Process/FilterScopesTest.php
diff --git a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php b/tests/modules/saml/src/Auth/Process/NameIDAttributeTest.php
similarity index 100%
rename from tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
rename to tests/modules/saml/src/Auth/Process/NameIDAttributeTest.php
diff --git a/tests/modules/saml/lib/Auth/Source/SPTest.php b/tests/modules/saml/src/Auth/Source/SPTest.php
similarity index 100%
rename from tests/modules/saml/lib/Auth/Source/SPTest.php
rename to tests/modules/saml/src/Auth/Source/SPTest.php
diff --git a/tests/modules/saml/lib/Controller/DiscoTest.php b/tests/modules/saml/src/Controller/DiscoTest.php
similarity index 100%
rename from tests/modules/saml/lib/Controller/DiscoTest.php
rename to tests/modules/saml/src/Controller/DiscoTest.php
diff --git a/tests/modules/saml/lib/Controller/MetadataTest.php b/tests/modules/saml/src/Controller/MetadataTest.php
similarity index 100%
rename from tests/modules/saml/lib/Controller/MetadataTest.php
rename to tests/modules/saml/src/Controller/MetadataTest.php
diff --git a/tests/modules/saml/lib/Controller/ProxyTest.php b/tests/modules/saml/src/Controller/ProxyTest.php
similarity index 100%
rename from tests/modules/saml/lib/Controller/ProxyTest.php
rename to tests/modules/saml/src/Controller/ProxyTest.php
diff --git a/tests/modules/saml/lib/Controller/ServiceProviderTest.php b/tests/modules/saml/src/Controller/ServiceProviderTest.php
similarity index 100%
rename from tests/modules/saml/lib/Controller/ServiceProviderTest.php
rename to tests/modules/saml/src/Controller/ServiceProviderTest.php
diff --git a/tests/modules/saml/lib/IdP/SAML2Test.php b/tests/modules/saml/src/IdP/SAML2Test.php
similarity index 100%
rename from tests/modules/saml/lib/IdP/SAML2Test.php
rename to tests/modules/saml/src/IdP/SAML2Test.php
diff --git a/tests/modules/saml/lib/IdP/SQLNameIDTest.php b/tests/modules/saml/src/IdP/SQLNameIDTest.php
similarity index 100%
rename from tests/modules/saml/lib/IdP/SQLNameIDTest.php
rename to tests/modules/saml/src/IdP/SQLNameIDTest.php