diff --git a/app/controllers/automation.php b/app/controllers/automationController.php
similarity index 100%
rename from app/controllers/automation.php
rename to app/controllers/automationController.php
diff --git a/app/controllers/dashboard.php b/app/controllers/dashboardController.php
similarity index 100%
rename from app/controllers/dashboard.php
rename to app/controllers/dashboardController.php
diff --git a/app/controllers/home.php b/app/controllers/homeController.php
similarity index 100%
rename from app/controllers/home.php
rename to app/controllers/homeController.php
diff --git a/app/controllers/login.php b/app/controllers/loginController.php
similarity index 100%
rename from app/controllers/login.php
rename to app/controllers/loginController.php
diff --git a/app/controllers/scene.php b/app/controllers/sceneController.php
similarity index 100%
rename from app/controllers/scene.php
rename to app/controllers/sceneController.php
diff --git a/app/controllers/setting.php b/app/controllers/settingController.php
similarity index 100%
rename from app/controllers/setting.php
rename to app/controllers/settingController.php
diff --git a/app/controllers/settings.php b/app/controllers/settings.php
deleted file mode 100644
index dcda809..0000000
--- a/app/controllers/settings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-if (isset($_POST) && !empty($_POST)){
-	if (isset($_POST['submitPasswordChange']) && $_POST['submitPasswordChange'] != "") {
-		$oldPassword = $_POST['oldPassword'];
-		$newPassword = $_POST['newPassword1'];
-		$newPassword2 = $_POST['newPassword2'];
-		UserManager::changePassword($oldPassword, $newPassword, $newPassword2);
-		header('Location: ' . BASEDIR . 'logout');
-		die();
-	} else if (isset($_POST['submitCreateUser']) && $_POST['submitCreateUser'] != "") {
-		$userName = $_POST['userName'];
-		$password = $_POST['userPassword'];
-		UserManager::createUser($userName, $password);
-		header('Location: ' . BASEDIR . 'setting');
-		die();
-	}
-}
diff --git a/app/models/Partial.php b/app/models/Partial.php
index b367a2b..5609556 100644
--- a/app/models/Partial.php
+++ b/app/models/Partial.php
@@ -7,7 +7,7 @@ class Partial{
 
 	function __construct($path = "", $debug = false) {
 		$this->debug = $debug;
-		if (!empty('../app/templates/part/' . $path . '.phtml') && file_exists('../app/templates/part/' . $path . '.phtml')) {
+		if (!empty('../app/views/templates/part/' . $path . '.phtml') && file_exists('../app/views/templates/part/' . $path . '.phtml')) {
 			$this->path = $path;
 		} else {
 			echo '<pre>';
@@ -29,6 +29,6 @@ class Partial{
 			extract($this->assignedValues);
 		}
 
-		require('../app/templates/part/' . $this->path . '.phtml');
+		require('../app/views/templates/part/' . $this->path . '.phtml');
 	}
 }
diff --git a/app/models/DB.php b/library/DB.php
similarity index 100%
rename from app/models/DB.php
rename to library/DB.php
diff --git a/library/Template.php b/library/Template.php
index 390a35f..65ce1c0 100644
--- a/library/Template.php
+++ b/library/Template.php
@@ -26,8 +26,8 @@ class Template{
 
 	function render() {
 		extract($this->assignedValues);
-		if (!empty('../app/controls/' . $this->path . '.php') && file_exists('../app/controls/' . $this->path . '.php')) {
-			include('../app/controls/' . $this->path . '.php');
+		if (!empty('../app/controllers/' . $this->path . 'Controller.php') && file_exists('../app/controllers/' . $this->path . 'Controller.php')) {
+			include('../app/controllers/' . $this->path . 'Controller.php');
 		}
 		require_once('../app/views/templates/' . $this->path . '.phtml');
 	}