diff --git a/application/clicommands/SetupCommand.php b/application/clicommands/SetupCommand.php
index a8b9ea4f6..caa07ae1d 100644
--- a/application/clicommands/SetupCommand.php
+++ b/application/clicommands/SetupCommand.php
@@ -6,7 +6,7 @@ namespace Icinga\Clicommands;
 
 use Icinga\Application\Logger;
 use Icinga\Cli\Command;
-use Icinga\Config\Webserver\Webserver;
+use Icinga\Web\Setup\Webserver\Webserver;
 use Icinga\Exception\ProgrammingError;
 
 /**
diff --git a/library/Icinga/Config/Webserver/Apache2.php b/library/Icinga/Web/Setup/Webserver/Apache2.php
similarity index 93%
rename from library/Icinga/Config/Webserver/Apache2.php
rename to library/Icinga/Web/Setup/Webserver/Apache2.php
index 077bf8bc3..49db80e9b 100644
--- a/library/Icinga/Config/Webserver/Apache2.php
+++ b/library/Icinga/Web/Setup/Webserver/Apache2.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Config\Webserver;
+namespace Icinga\Web\Setup\Webserver;
 
 /**
  * Generate apache 2.x (< 2.4) configuration
diff --git a/library/Icinga/Config/Webserver/Apache24.php b/library/Icinga/Web/Setup/Webserver/Apache24.php
similarity index 93%
rename from library/Icinga/Config/Webserver/Apache24.php
rename to library/Icinga/Web/Setup/Webserver/Apache24.php
index ad758abcd..29e927770 100644
--- a/library/Icinga/Config/Webserver/Apache24.php
+++ b/library/Icinga/Web/Setup/Webserver/Apache24.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Config\Webserver;
+namespace Icinga\Web\Setup\Webserver;
 
 /**
  * Generate apache2.4 configuration
diff --git a/library/Icinga/Config/Webserver/Nginx.php b/library/Icinga/Web/Setup/Webserver/Nginx.php
similarity index 95%
rename from library/Icinga/Config/Webserver/Nginx.php
rename to library/Icinga/Web/Setup/Webserver/Nginx.php
index bd670083c..90996b2a0 100644
--- a/library/Icinga/Config/Webserver/Nginx.php
+++ b/library/Icinga/Web/Setup/Webserver/Nginx.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Config\Webserver;
+namespace Icinga\Web\Setup\Webserver;
 
 /**
  * Create nginx webserver configuration
diff --git a/library/Icinga/Config/Webserver/Webserver.php b/library/Icinga/Web/Setup/Webserver/Webserver.php
similarity index 98%
rename from library/Icinga/Config/Webserver/Webserver.php
rename to library/Icinga/Web/Setup/Webserver/Webserver.php
index 349af82de..b246cffd0 100644
--- a/library/Icinga/Config/Webserver/Webserver.php
+++ b/library/Icinga/Web/Setup/Webserver/Webserver.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Config\Webserver;
+namespace Icinga\Web\Setup\Webserver;
 
 use Icinga\Application\ApplicationBootstrap;
 use Icinga\Exception\ProgrammingError;