diff --git a/lib/SimpleSAML/Controller/Metadata.php b/modules/saml/lib/Controller/Metadata.php
similarity index 100%
rename from lib/SimpleSAML/Controller/Metadata.php
rename to modules/saml/lib/Controller/Metadata.php
diff --git a/lib/SimpleSAML/Controller/SingleLogout.php b/modules/saml/lib/Controller/SingleLogout.php
similarity index 100%
rename from lib/SimpleSAML/Controller/SingleLogout.php
rename to modules/saml/lib/Controller/SingleLogout.php
diff --git a/lib/SimpleSAML/Controller/WebBrowserSingleSignOn.php b/modules/saml/lib/Controller/WebBrowserSingleSignOn.php
similarity index 100%
rename from lib/SimpleSAML/Controller/WebBrowserSingleSignOn.php
rename to modules/saml/lib/Controller/WebBrowserSingleSignOn.php
diff --git a/modules/saml/routing/routes/routes.yaml b/modules/saml/routing/routes/routes.yaml
index 1361b4cdf370f04959d60a3a051cf4dc21e57436..4b61e1755e735445726e0d51849df74766b1a511 100644
--- a/modules/saml/routing/routes/routes.yaml
+++ b/modules/saml/routing/routes/routes.yaml
@@ -28,3 +28,18 @@ saml-legacy-sp-singleLogoutService:
 saml-legacy-sp-metadata:
     path:       /sp/metadata.php/{sourceId}
     defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\ServiceProvider::metadata', path: /saml/sp/metadata, permanent: true }
+websso-single-sign-on:
+    path:       /idp/singleSignOnService
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\WebBrowserSingleSignOn::singleSignOnService' }
+websso-artifact-resolution:
+    path:       //idp/artifactResolutionService
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\WebBrowserSingleSignOn::artifactResolutionService' }
+websso-metadata:
+    path:       /idp/metadata
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\Metadata::metadata' }
+websso-single-logout:
+    path:       /idp/singleLogout
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\SingleLogout::singleLogout' }
+websso-init-single-logout:
+    path:       /idp/initSingleLogout
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\SingleLogout::initSingleLogout' }
diff --git a/routing/routes/routes.yml b/routing/routes/routes.yml
index fb76ec573bf4a215526af13351ac9454761c4cb3..bcc6ae92545bf279d382376795a1a9ab7825d0cb 100644
--- a/routing/routes/routes.yml
+++ b/routing/routes/routes.yml
@@ -12,34 +12,18 @@ add_trailing_slash:
         url: "[a-zA-Z0-9_-]+[^/]$"
     methods: [GET]
 
-websso-single-sign-on:
-    path:       /saml2/idp/singleSignOnService
-    defaults:   { _controller: 'SimpleSAML\Controller\WebBrowserSingleSignOn::singleSignOnService' }
-websso-artifact-resolution:
-    path:       /saml2/idp/artifactResolutionService
-    defaults:   { _controller: 'SimpleSAML\Controller\WebBrowserSingleSignOn::artifactResolutionService' }
-websso-metadata:
-    path:       /saml2/idp/metadata
-    defaults:   { _controller: 'SimpleSAML\Controller\Metadata::metadata' }
-websso-single-logout:
-    path:       /saml2/idp/singleLogout
-    defaults:   { _controller: 'SimpleSAML\Controller\SingleLogout::singleLogout' }
-websso-init-single-logout:
-    path:       /saml2/idp/initSingleLogout
-    defaults:   { _controller: 'SimpleSAML\Controller\SingleLogout::initSingleLogout' }
-
 websso-legacy-single-sign-on:
     path:       /saml2/idp/SSOService.php
-    defaults:   { _controller: 'SimpleSAML\Controller\WebBrowserSingleSignOn::singleSignOnService', path: /saml2/idp/singleSignOnService, permanent: true }
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\WebBrowserSingleSignOn::singleSignOnService', path: /saml2/idp/singleSignOnService, permanent: true }
 websso-legacy-artifact-resolution:
     path:       /saml2/idp/ArtifactResolutionService.php
-    defaults:   { _controller: 'SimpleSAML\Controller\WebBrowserSingleSignOn::artifactResolutionService', path: /saml2/idp/artifactResolutionService, permanent: true }
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\WebBrowserSingleSignOn::artifactResolutionService', path: /saml2/idp/artifactResolutionService, permanent: true }
 websso-legacy-metadata:
     path:       /saml2/idp/metadata.php
-    defaults:   { _controller: 'SimpleSAML\Controller\Metadata::metadata', path: /saml2/idp/metadata, permanent: true }
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\Metadata::metadata', path: /saml2/idp/metadata, permanent: true }
 websso-legacy-single-logout:
     path:       /saml2/idp/SingleLogoutService.php
-    defaults:   { _controller: 'SimpleSAML\Controller\SingleLogout::singleLogout', path: /saml2/idp/singleLogout, permanent: true }
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\SingleLogout::singleLogout', path: /saml2/idp/singleLogout, permanent: true }
 websso-legacy-init-single-logout:
     path:       /saml2/idp/initSLO.php
-    defaults:   { _controller: 'SimpleSAML\Controller\SingleLogout::initSingleLogout', path: /saml2/idp/initSingleLogout, permanent: true }
+    defaults:   { _controller: 'SimpleSAML\Module\saml\Controller\SingleLogout::initSingleLogout', path: /saml2/idp/initSingleLogout, permanent: true }