diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index d192e7ce..a2b07bb6 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -1,9 +1,8 @@
 <?php
 
-use Icinga\Module\Director\ActionController;
-
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Util;
+use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Web\Url;
 
 class Director_ConfigController extends ActionController
diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 6eaad5de..9e5cd30a 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,6 +1,6 @@
 <?php
 
-use Icinga\Module\Director\ActionController;
+use Icinga\Module\Director\Web\Controller\ActionController;
 
 class Director_ListController extends ActionController
 {
diff --git a/application/controllers/SettingsController.php b/application/controllers/SettingsController.php
index 7a0416bf..42e64a9a 100644
--- a/application/controllers/SettingsController.php
+++ b/application/controllers/SettingsController.php
@@ -1,9 +1,8 @@
 <?php
 
-use Icinga\Module\Director\ActionController;
-
-use Icinga\Forms\ConfigForm;
 use Icinga\Data\ResourceFactory;
+use Icinga\Forms\ConfigForm;
+use Icinga\Module\Director\Web\Controller\ActionController;
 
 class Director_SettingsController extends ActionController
 {
diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php
index 42b1f8c6..9782f28a 100644
--- a/application/controllers/ShowController.php
+++ b/application/controllers/ShowController.php
@@ -1,9 +1,8 @@
 <?php
 
-use Icinga\Module\Director\ActionController;
-
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Util;
+use Icinga\Module\Director\Web\Controller\ActionController;
 
 class Director_ShowController extends ActionController
 {
diff --git a/application/controllers/WelcomeController.php b/application/controllers/WelcomeController.php
index 3618c440..030e8bff 100644
--- a/application/controllers/WelcomeController.php
+++ b/application/controllers/WelcomeController.php
@@ -1,6 +1,6 @@
 <?php
 
-use Icinga\Module\Director\ActionController;
+use Icinga\Module\Director\Web\Controller\ActionController;
 
 class Director_WelcomeController extends ActionController
 {
diff --git a/library/Director/ActionController.php b/library/Director/Web/Controller/ActionController.php
similarity index 98%
rename from library/Director/ActionController.php
rename to library/Director/Web/Controller/ActionController.php
index 3fa24a66..8d3fe55d 100644
--- a/library/Director/ActionController.php
+++ b/library/Director/Web/Controller/ActionController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Director;
+namespace Icinga\Module\Director\Web\Controller;
 
 use Icinga\Application\Icinga;
 use Icinga\Module\Director\Db;
diff --git a/library/Director/Web/Controller/ObjectController.php b/library/Director/Web/Controller/ObjectController.php
index 71b2fa59..777db70e 100644
--- a/library/Director/Web/Controller/ObjectController.php
+++ b/library/Director/Web/Controller/ObjectController.php
@@ -2,7 +2,6 @@
 
 namespace Icinga\Module\Director\Web\Controller;
 
-use Icinga\Module\Director\ActionController;
 use Icinga\Web\Url;
 
 abstract class ObjectController extends ActionController
diff --git a/library/Director/Web/Controller/ObjectsController.php b/library/Director/Web/Controller/ObjectsController.php
index 7380ef26..e17e9545 100644
--- a/library/Director/Web/Controller/ObjectsController.php
+++ b/library/Director/Web/Controller/ObjectsController.php
@@ -2,8 +2,6 @@
 
 namespace Icinga\Module\Director\Web\Controller;
 
-use Icinga\Module\Director\ActionController;
-
 abstract class ObjectsController extends ActionController
 {
     protected $dummy;