diff --git a/app/Routes.php b/app/Routes.php
index de8b2e8..28fa286 100644
--- a/app/Routes.php
+++ b/app/Routes.php
@@ -14,8 +14,11 @@ $router->any('/automation', 'Automation');
 $router->any('/setting', 'Setting');
 $router->any('/ajax', 'Ajax');
 
-$router->post('/api/devices', 'DevicesApi@getAllDevices');
 $router->post('/api/login', 'AuthApi@login');
+$router->post('/api/logout', 'AuthApi@logout');
+
+$router->post('/api/devices', 'DevicesApi@default');
+$router->post('/api/rooms', 'RoomsApi@default');
 
 $router->get('/api/HA/auth', 'GoogleHomeApi@autorize');
 $router->any('/api/HA', 'GoogleHomeApi@response');
diff --git a/app/api/DevicesApi.php b/app/api/DevicesApi.php
index 856acb5..daa8ece 100644
--- a/app/api/DevicesApi.php
+++ b/app/api/DevicesApi.php
@@ -2,7 +2,7 @@
 
 class DevicesApi extends ApiController{
 
-	public function getAllDevices(){
+	public function default(){
 		$this->requireAuth();
 		$response = [];
 
diff --git a/app/api/RoomsApi.php b/app/api/RoomsApi.php
new file mode 100644
index 0000000..36a0912
--- /dev/null
+++ b/app/api/RoomsApi.php
@@ -0,0 +1,13 @@
+<?php
+
+class RoomsApi extends ApiController{
+
+	public function default(){
+		$this->requireAuth();
+		$response = [];
+
+		// TODO: process the request
+
+		$this->response($response);
+	}
+}
diff --git a/app/models/AuthManager.php b/app/models/managers/AuthManager.php
similarity index 100%
rename from app/models/AuthManager.php
rename to app/models/managers/AuthManager.php
diff --git a/app/models/AutomationManager.php b/app/models/managers/AutomationManager.php
similarity index 100%
rename from app/models/AutomationManager.php
rename to app/models/managers/AutomationManager.php
diff --git a/app/models/ChartManager.php b/app/models/managers/ChartManager.php
similarity index 100%
rename from app/models/ChartManager.php
rename to app/models/managers/ChartManager.php
diff --git a/app/models/DashboardManager.php b/app/models/managers/DashboardManager.php
similarity index 100%
rename from app/models/DashboardManager.php
rename to app/models/managers/DashboardManager.php
diff --git a/app/models/DeviceManager.php b/app/models/managers/DeviceManager.php
similarity index 100%
rename from app/models/DeviceManager.php
rename to app/models/managers/DeviceManager.php
diff --git a/app/models/FallbackManager.php b/app/models/managers/FallbackManager.php
similarity index 100%
rename from app/models/FallbackManager.php
rename to app/models/managers/FallbackManager.php
diff --git a/app/models/LanguageManager.php b/app/models/managers/LanguageManager.php
similarity index 100%
rename from app/models/LanguageManager.php
rename to app/models/managers/LanguageManager.php
diff --git a/app/models/LogManager.php b/app/models/managers/LogManager.php
similarity index 100%
rename from app/models/LogManager.php
rename to app/models/managers/LogManager.php
diff --git a/app/models/NetworkManager.php b/app/models/managers/NetworkManager.php
similarity index 100%
rename from app/models/NetworkManager.php
rename to app/models/managers/NetworkManager.php
diff --git a/app/models/NotificationManager.php b/app/models/managers/NotificationManager.php
similarity index 100%
rename from app/models/NotificationManager.php
rename to app/models/managers/NotificationManager.php
diff --git a/app/models/RecordManager.php b/app/models/managers/RecordManager.php
similarity index 100%
rename from app/models/RecordManager.php
rename to app/models/managers/RecordManager.php
diff --git a/app/models/RoomManager.php b/app/models/managers/RoomManager.php
similarity index 100%
rename from app/models/RoomManager.php
rename to app/models/managers/RoomManager.php
diff --git a/app/models/SceneManager.php b/app/models/managers/SceneManager.php
similarity index 100%
rename from app/models/SceneManager.php
rename to app/models/managers/SceneManager.php
diff --git a/app/models/SubDeviceManager.php b/app/models/managers/SubDeviceManager.php
similarity index 100%
rename from app/models/SubDeviceManager.php
rename to app/models/managers/SubDeviceManager.php
diff --git a/app/models/UserManager.php b/app/models/managers/UserManager.php
similarity index 100%
rename from app/models/UserManager.php
rename to app/models/managers/UserManager.php
diff --git a/app/models/Utilities.php b/app/models/managers/Utilities.php
similarity index 100%
rename from app/models/Utilities.php
rename to app/models/managers/Utilities.php
diff --git a/app/models/Form.php b/library/Form.php
similarity index 100%
rename from app/models/Form.php
rename to library/Form.php