diff --git a/src/actuators.cpp b/src/core/actuators/actuators.cpp
similarity index 100%
rename from src/actuators.cpp
rename to src/core/actuators/actuators.cpp
diff --git a/src/actuators.h b/src/core/actuators/actuators.h
similarity index 100%
rename from src/actuators.h
rename to src/core/actuators/actuators.h
diff --git a/src/controller.cpp b/src/core/controller/controller.cpp
similarity index 94%
rename from src/controller.cpp
rename to src/core/controller/controller.cpp
index 08b9f36..d67db38 100644
--- a/src/controller.cpp
+++ b/src/core/controller/controller.cpp
@@ -1,7 +1,7 @@
 #include "controller.h"
-#include "actuators.h"
+#include "core/actuators/actuators.h"
 #include "config.h"
-#include "servo.h"
+#include "core/servo/servo.h"
 
 void controllerSetMode(RobotMode m) {
   robot.mode = m;
diff --git a/src/controller.h b/src/core/controller/controller.h
similarity index 86%
rename from src/controller.h
rename to src/core/controller/controller.h
index b5eb0e8..8effa60 100644
--- a/src/controller.h
+++ b/src/core/controller/controller.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Arduino.h>
-#include "robot_state.h"
+#include "core/robot_state/robot_state.h"
 
 void controllerSetMode(RobotMode m);
 bool controllerMove(const String& cmd);
diff --git a/src/ir_input.cpp b/src/core/deprecate/ir_input/ir_input.cpp
similarity index 100%
rename from src/ir_input.cpp
rename to src/core/deprecate/ir_input/ir_input.cpp
diff --git a/src/ir_input.h b/src/core/deprecate/ir_input/ir_input.h
similarity index 100%
rename from src/ir_input.h
rename to src/core/deprecate/ir_input/ir_input.h
diff --git a/src/lcd_status.cpp b/src/core/deprecate/lcd_status/lcd_status.cpp
similarity index 100%
rename from src/lcd_status.cpp
rename to src/core/deprecate/lcd_status/lcd_status.cpp
diff --git a/src/lcd_status.h b/src/core/deprecate/lcd_status/lcd_status.h
similarity index 100%
rename from src/lcd_status.h
rename to src/core/deprecate/lcd_status/lcd_status.h
diff --git a/src/face.cpp b/src/core/display/face/face.cpp
similarity index 100%
rename from src/face.cpp
rename to src/core/display/face/face.cpp
diff --git a/src/face.h b/src/core/display/face/face.h
similarity index 100%
rename from src/face.h
rename to src/core/display/face/face.h
diff --git a/src/robot_state.cpp b/src/core/robot_state/robot_state.cpp
similarity index 100%
rename from src/robot_state.cpp
rename to src/core/robot_state/robot_state.cpp
diff --git a/src/robot_state.h b/src/core/robot_state/robot_state.h
similarity index 100%
rename from src/robot_state.h
rename to src/core/robot_state/robot_state.h
diff --git a/src/servo.cpp b/src/core/servo/servo.cpp
similarity index 100%
rename from src/servo.cpp
rename to src/core/servo/servo.cpp
diff --git a/src/servo.h b/src/core/servo/servo.h
similarity index 100%
rename from src/servo.h
rename to src/core/servo/servo.h
diff --git a/src/ultrasonic.cpp b/src/core/ultrasonic/ultrasonic.cpp
similarity index 100%
rename from src/ultrasonic.cpp
rename to src/core/ultrasonic/ultrasonic.cpp
diff --git a/src/ultrasonic.h b/src/core/ultrasonic/ultrasonic.h
similarity index 100%
rename from src/ultrasonic.h
rename to src/core/ultrasonic/ultrasonic.h
diff --git a/src/main.cpp b/src/main.cpp
index 0b3feb7..15e1e3e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,16 +1,16 @@
 #include <Arduino.h>
 
-#include "lcd_status.h"
-#include "servo.h"
-#include "ultrasonic.h"
-#include "face.h"
-#include "robot_state.h"
+#include "core/deprecate/lcd_status/lcd_status.h"
+#include "core/servo/servo.h"
+#include "core/ultrasonic/ultrasonic.h"
+#include "core/display/face/face.h"
+#include "core/robot_state/robot_state.h"
 
-#include "actuators.h"
-#include "web_server.h"
-#include "ws_server.h"
-#include "controller.h"
-#include "ir_input.h"
+#include "core/actuators/actuators.h"
+#include "server/web_server.h"
+#include "server/ws_server.h"
+#include "core/controller/controller.h"
+// #include "core/deprecate/ir_input/ir_input.h"
 
 void setup() {
   Serial.begin(115200);
@@ -22,7 +22,7 @@ void setup() {
   actuatorsInit();
   webServerInit();
   wsInit();
-  irInit();
+  // irInit();
 
   robot.lastCmdMs = millis();
 }
@@ -31,5 +31,5 @@ void loop() {
   webServerLoop();
   wsLoop();
   controllerUpdate();
-  irPoll();
+  // irPoll();
 }
diff --git a/src/web_server.cpp b/src/server/web_server.cpp
similarity index 93%
rename from src/web_server.cpp
rename to src/server/web_server.cpp
index 56032ea..dd6bc99 100644
--- a/src/web_server.cpp
+++ b/src/server/web_server.cpp
@@ -3,10 +3,10 @@
 
 #include "config.h"
 #include "web_ui.h"
-#include "controller.h"
-#include "robot_state.h"
-#include "ultrasonic.h"
-#include "lcd_status.h"
+#include "core/controller/controller.h"
+#include "core/robot_state/robot_state.h"
+#include "core/ultrasonic/ultrasonic.h"
+#include "core/deprecate/lcd_status/lcd_status.h"
 
 static WebServer server(80);
 
diff --git a/src/web_server.h b/src/server/web_server.h
similarity index 100%
rename from src/web_server.h
rename to src/server/web_server.h
diff --git a/src/web_ui.cpp b/src/server/web_ui.cpp
similarity index 100%
rename from src/web_ui.cpp
rename to src/server/web_ui.cpp
diff --git a/src/web_ui.h b/src/server/web_ui.h
similarity index 100%
rename from src/web_ui.h
rename to src/server/web_ui.h
diff --git a/src/ws_server.cpp b/src/server/ws_server.cpp
similarity index 95%
rename from src/ws_server.cpp
rename to src/server/ws_server.cpp
index c72f41b..5767588 100644
--- a/src/ws_server.cpp
+++ b/src/server/ws_server.cpp
@@ -2,9 +2,9 @@
 #include <Arduino.h>
 
 #include "ws_server.h"
-#include "controller.h"
-#include "robot_state.h"
-#include "face.h"
+#include "core/controller/controller.h"
+#include "core/robot_state/robot_state.h"
+#include "core/display/face/face.h"
 
 static WebSocketsServer ws(81); // порт 81
 
diff --git a/src/ws_server.h b/src/server/ws_server.h
similarity index 100%
rename from src/ws_server.h
rename to src/server/ws_server.h