diff --git a/application/clicommands/SetupCommand.php b/modules/setup/application/clicommands/SetupCommand.php
similarity index 100%
rename from application/clicommands/SetupCommand.php
rename to modules/setup/application/clicommands/SetupCommand.php
diff --git a/application/controllers/SetupController.php b/modules/setup/application/controllers/SetupController.php
similarity index 100%
rename from application/controllers/SetupController.php
rename to modules/setup/application/controllers/SetupController.php
diff --git a/application/forms/Setup/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
similarity index 100%
rename from application/forms/Setup/AdminAccountPage.php
rename to modules/setup/application/forms/AdminAccountPage.php
diff --git a/application/forms/Setup/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
similarity index 100%
rename from application/forms/Setup/AuthBackendPage.php
rename to modules/setup/application/forms/AuthBackendPage.php
diff --git a/application/forms/Setup/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
similarity index 100%
rename from application/forms/Setup/AuthenticationPage.php
rename to modules/setup/application/forms/AuthenticationPage.php
diff --git a/application/forms/Setup/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
similarity index 100%
rename from application/forms/Setup/DatabaseCreationPage.php
rename to modules/setup/application/forms/DatabaseCreationPage.php
diff --git a/application/forms/Setup/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
similarity index 100%
rename from application/forms/Setup/DbResourcePage.php
rename to modules/setup/application/forms/DbResourcePage.php
diff --git a/application/forms/Setup/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
similarity index 100%
rename from application/forms/Setup/GeneralConfigPage.php
rename to modules/setup/application/forms/GeneralConfigPage.php
diff --git a/application/forms/Setup/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
similarity index 100%
rename from application/forms/Setup/LdapDiscoveryConfirmPage.php
rename to modules/setup/application/forms/LdapDiscoveryConfirmPage.php
diff --git a/application/forms/Setup/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
similarity index 100%
rename from application/forms/Setup/LdapDiscoveryPage.php
rename to modules/setup/application/forms/LdapDiscoveryPage.php
diff --git a/application/forms/Setup/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
similarity index 100%
rename from application/forms/Setup/LdapResourcePage.php
rename to modules/setup/application/forms/LdapResourcePage.php
diff --git a/application/forms/Setup/ModulePage.php b/modules/setup/application/forms/ModulePage.php
similarity index 100%
rename from application/forms/Setup/ModulePage.php
rename to modules/setup/application/forms/ModulePage.php
diff --git a/application/forms/Setup/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
similarity index 100%
rename from application/forms/Setup/PreferencesPage.php
rename to modules/setup/application/forms/PreferencesPage.php
diff --git a/application/forms/Setup/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
similarity index 100%
rename from application/forms/Setup/RequirementsPage.php
rename to modules/setup/application/forms/RequirementsPage.php
diff --git a/application/forms/Setup/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
similarity index 100%
rename from application/forms/Setup/SummaryPage.php
rename to modules/setup/application/forms/SummaryPage.php
diff --git a/application/forms/Setup/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
similarity index 100%
rename from application/forms/Setup/WelcomePage.php
rename to modules/setup/application/forms/WelcomePage.php
diff --git a/application/views/scripts/form/setup-admin-account.phtml b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
similarity index 100%
rename from application/views/scripts/form/setup-admin-account.phtml
rename to modules/setup/application/views/scripts/form/setup-admin-account.phtml
diff --git a/application/views/scripts/form/setup-modules.phtml b/modules/setup/application/views/scripts/form/setup-modules.phtml
similarity index 100%
rename from application/views/scripts/form/setup-modules.phtml
rename to modules/setup/application/views/scripts/form/setup-modules.phtml
diff --git a/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
similarity index 100%
rename from application/views/scripts/form/setup-requirements.phtml
rename to modules/setup/application/views/scripts/form/setup-requirements.phtml
diff --git a/application/views/scripts/form/setup-summary.phtml b/modules/setup/application/views/scripts/form/setup-summary.phtml
similarity index 100%
rename from application/views/scripts/form/setup-summary.phtml
rename to modules/setup/application/views/scripts/form/setup-summary.phtml
diff --git a/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
similarity index 100%
rename from application/views/scripts/form/setup-welcome.phtml
rename to modules/setup/application/views/scripts/form/setup-welcome.phtml
diff --git a/application/views/scripts/setup/index.phtml b/modules/setup/application/views/scripts/setup/index.phtml
similarity index 100%
rename from application/views/scripts/setup/index.phtml
rename to modules/setup/application/views/scripts/setup/index.phtml
diff --git a/application/views/scripts/setup/parts/finish.phtml b/modules/setup/application/views/scripts/setup/parts/finish.phtml
similarity index 100%
rename from application/views/scripts/setup/parts/finish.phtml
rename to modules/setup/application/views/scripts/setup/parts/finish.phtml
diff --git a/application/views/scripts/setup/parts/wizard.phtml b/modules/setup/application/views/scripts/setup/parts/wizard.phtml
similarity index 100%
rename from application/views/scripts/setup/parts/wizard.phtml
rename to modules/setup/application/views/scripts/setup/parts/wizard.phtml
diff --git a/library/Icinga/Exception/InstallException.php b/modules/setup/library/Setup/Exception/SetupException.php
similarity index 100%
rename from library/Icinga/Exception/InstallException.php
rename to modules/setup/library/Setup/Exception/SetupException.php
diff --git a/library/Icinga/Web/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
similarity index 100%
rename from library/Icinga/Web/Setup/Requirements.php
rename to modules/setup/library/Setup/Requirements.php
diff --git a/library/Icinga/Web/Setup/Setup.php b/modules/setup/library/Setup/Setup.php
similarity index 100%
rename from library/Icinga/Web/Setup/Setup.php
rename to modules/setup/library/Setup/Setup.php
diff --git a/library/Icinga/Web/Setup/SetupWizard.php b/modules/setup/library/Setup/SetupWizard.php
similarity index 100%
rename from library/Icinga/Web/Setup/SetupWizard.php
rename to modules/setup/library/Setup/SetupWizard.php
diff --git a/library/Icinga/Web/Setup/Step.php b/modules/setup/library/Setup/Step.php
similarity index 100%
rename from library/Icinga/Web/Setup/Step.php
rename to modules/setup/library/Setup/Step.php
diff --git a/library/Icinga/Installation/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
similarity index 100%
rename from library/Icinga/Installation/AuthenticationStep.php
rename to modules/setup/library/Setup/Steps/AuthenticationStep.php
diff --git a/library/Icinga/Installation/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
similarity index 100%
rename from library/Icinga/Installation/DatabaseStep.php
rename to modules/setup/library/Setup/Steps/DatabaseStep.php
diff --git a/library/Icinga/Installation/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
similarity index 100%
rename from library/Icinga/Installation/GeneralConfigStep.php
rename to modules/setup/library/Setup/Steps/GeneralConfigStep.php
diff --git a/library/Icinga/Installation/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
similarity index 100%
rename from library/Icinga/Installation/ResourceStep.php
rename to modules/setup/library/Setup/Steps/ResourceStep.php
diff --git a/library/Icinga/Web/Setup/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
similarity index 100%
rename from library/Icinga/Web/Setup/DbTool.php
rename to modules/setup/library/Setup/Utils/DbTool.php
diff --git a/library/Icinga/Web/Setup/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
similarity index 100%
rename from library/Icinga/Web/Setup/EnableModuleStep.php
rename to modules/setup/library/Setup/Utils/EnableModuleStep.php
diff --git a/library/Icinga/Web/Setup/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
similarity index 100%
rename from library/Icinga/Web/Setup/MakeDirStep.php
rename to modules/setup/library/Setup/Utils/MakeDirStep.php
diff --git a/library/Icinga/Web/Form/Validator/TokenValidator.php b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
similarity index 100%
rename from library/Icinga/Web/Form/Validator/TokenValidator.php
rename to modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
diff --git a/library/Icinga/Application/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
similarity index 100%
rename from library/Icinga/Application/WebWizard.php
rename to modules/setup/library/Setup/WebWizard.php
diff --git a/public/css/icinga/setup.less b/modules/setup/public/css/module.less
similarity index 100%
rename from public/css/icinga/setup.less
rename to modules/setup/public/css/module.less