diff --git a/install.php b/install.php
index 9ba7377f..88160562 100755
--- a/install.php
+++ b/install.php
@@ -30,4 +30,4 @@ define('PSM_INSTALL', true);
 require 'src/bootstrap.php';
 
 $router = new psm\Router();
-$router->run('config_install');
+$router->run('install');
diff --git a/src/psm/Module/Config/ConfigModule.class.php b/src/psm/Module/Config/ConfigModule.class.php
old mode 100644
new mode 100755
index 047b1564..d6ce4c01
--- a/src/psm/Module/Config/ConfigModule.class.php
+++ b/src/psm/Module/Config/ConfigModule.class.php
@@ -33,7 +33,6 @@ class ConfigModule implements ModuleInterface {
 	public function getControllers() {
 		return array(
 			'config' => __NAMESPACE__ . '\Controller\ConfigController',
-			'install' => __NAMESPACE__ . '\Controller\InstallController',
 		);
 
 	}
diff --git a/src/psm/Module/Config/Controller/InstallController.class.php b/src/psm/Module/Install/Controller/InstallController.class.php
similarity index 99%
rename from src/psm/Module/Config/Controller/InstallController.class.php
rename to src/psm/Module/Install/Controller/InstallController.class.php
index f6c562ff..7fb4dbce 100755
--- a/src/psm/Module/Config/Controller/InstallController.class.php
+++ b/src/psm/Module/Install/Controller/InstallController.class.php
@@ -26,7 +26,7 @@
  * @since		phpservermon 2.1.0
  **/
 
-namespace psm\Module\Config\Controller;
+namespace psm\Module\Install\Controller;
 use psm\Module\AbstractController;
 use psm\Service\Database;
 use psm\Service\Template;
diff --git a/src/psm/Module/Install/InstallModule.class.php b/src/psm/Module/Install/InstallModule.class.php
new file mode 100755
index 00000000..4ee600c1
--- /dev/null
+++ b/src/psm/Module/Install/InstallModule.class.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * PHP Server Monitor
+ * Monitor your servers and websites.
+ *
+ * This file is part of PHP Server Monitor.
+ * PHP Server Monitor is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PHP Server Monitor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PHP Server Monitor.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package     phpservermon
+ * @author      Pepijn Over <pep@neanderthal-technology.com>
+ * @copyright   Copyright (c) 2008-2014 Pepijn Over <pep@neanderthal-technology.com>
+ * @license     http://www.gnu.org/licenses/gpl.txt GNU GPL v3
+ * @version     Release: @package_version@
+ * @link        http://www.phpservermonitor.org/
+ * @since		phpservermon 2.2
+ **/
+
+namespace psm\Module\Install;
+use psm\Module\ModuleInterface;
+
+class InstallModule implements ModuleInterface {
+	public function getControllers() {
+		return array(
+			'install' => __NAMESPACE__ . '\Controller\InstallController',
+		);
+
+	}
+}
diff --git a/src/psm/Router.class.php b/src/psm/Router.class.php
old mode 100644
new mode 100755
index a9225c89..91fcff03
--- a/src/psm/Router.class.php
+++ b/src/psm/Router.class.php
@@ -84,6 +84,7 @@ class Router {
 			'config' => new Module\Config\ConfigModule(),
 			'server' => new Module\Server\ServerModule(),
 			'user' => new Module\User\UserModule(),
+			'install' => new Module\Install\InstallModule(),
 		);
 	}