diff --git a/src/UnusedModulesController.php b/src/Controller/UnusedModulesController.php
similarity index 97%
rename from src/UnusedModulesController.php
rename to src/Controller/UnusedModulesController.php
index 7d7abe331da6a4564717d8ea717d7692f2c6b97e..66b40b478f4b44fb233545f28e08e8b0734e3d2a 100644
--- a/src/UnusedModulesController.php
+++ b/src/Controller/UnusedModulesController.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Drupal\unused_modules;
+namespace Drupal\unused_modules\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\unused_modules\UnusedModulesHelperService;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/unused_modules.routing.yml b/unused_modules.routing.yml
index 0fdcc249d826e5f54159371e6d0b956f52465fc3..7fb5bddda176714007aa6b0557f7a89bd0bd0dbd 100644
--- a/unused_modules.routing.yml
+++ b/unused_modules.routing.yml
@@ -4,7 +4,7 @@
 unused_modules.overview.projects.disabled:
   path: '/admin/config/development/unused_modules/projects/disabled'
   defaults:
-    _controller: '\Drupal\unused_modules\UnusedModulesController::renderProjectsTable'
+    _controller: '\Drupal\unused_modules\Controller\UnusedModulesController::renderProjectsTable'
     _title: 'Unused Modules'
     filter: 'disabled'
   requirements:
@@ -13,7 +13,7 @@ unused_modules.overview.projects.disabled:
 unused_modules.overview.projects.all:
   path: '/admin/config/development/unused_modules/projects/all'
   defaults:
-    _controller: '\Drupal\unused_modules\UnusedModulesController::renderProjectsTable'
+    _controller: '\Drupal\unused_modules\Controller\UnusedModulesController::renderProjectsTable'
     _title: 'Unused Modules'
     filter: 'all'
   requirements:
@@ -22,7 +22,7 @@ unused_modules.overview.projects.all:
 unused_modules.overview.modules.disabled:
   path: '/admin/config/development/unused_modules/modules/disabled'
   defaults:
-    _controller: '\Drupal\unused_modules\UnusedModulesController::renderModulesTable'
+    _controller: '\Drupal\unused_modules\Controller\UnusedModulesController::renderModulesTable'
     _title: 'Unused Modules'
     filter: 'disabled'
   requirements:
@@ -31,7 +31,7 @@ unused_modules.overview.modules.disabled:
 unused_modules.overview.modules.all:
   path: '/admin/config/development/unused_modules/modules/all'
   defaults:
-    _controller: '\Drupal\unused_modules\UnusedModulesController::renderModulesTable'
+    _controller: '\Drupal\unused_modules\Controller\UnusedModulesController::renderModulesTable'
     _title: 'Unused Modules'
     filter: 'all'
   requirements: