diff --git a/CMakeLists.txt b/CMakeLists.txt
index fea0c1f..2c4f120 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16)
 project(DRAWer_2_0 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -29,34 +29,37 @@ PUBLIC
 target_compile_features(${PlaneGCS_project_name} PUBLIC cxx_std_20)
 
 # DRAWer 2_0
-set(PROJECT_SOURCES
-    main.cpp
-    DRAWer_2_0.ui
-    DRAWer_2_0.cpp
-    Canvas.cpp
-)
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets)
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-find_package(Qt${QT_VERSION_MAJOR}
-    COMPONENTS
-        Core
-        Gui
-        Widgets
-)
 qt_standard_project_setup()
-qt_add_executable(${PROJECT_NAME} ${PROJECT_SOURCES})
 
-set_target_properties(${PROJECT_NAME}
-    PROPERTIES
-        WIN32_EXECUTABLE TRUE
+qt_add_executable(${PROJECT_NAME}
+    src/main.cpp
+    src/DRAWer_2_0.cpp
+    src/DRAWer_2_0.ui
+    src/Canvas.cpp
+    include/DRAWer_2_0.h
+    include/Canvas.h
+)
+
+# Добавляем путь к src/ для поиска .ui файла (обходит AutoUic ошибку)
+set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src)
+
+target_include_directories(${PROJECT_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/GCS
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    WIN32_EXECUTABLE TRUE
 )
 
 target_link_libraries(${PROJECT_NAME}
-    PUBLIC
-        Qt::Core
-        Qt::Gui
-        Qt::Widgets
     PRIVATE
+        Qt${QT_VERSION_MAJOR}::Core
+        Qt${QT_VERSION_MAJOR}::Gui
+        Qt${QT_VERSION_MAJOR}::Widgets
         ${PlaneGCS_project_name}
-)
-
+)
\ No newline at end of file
diff --git a/Canvas.h b/include/Canvas.h
similarity index 100%
rename from Canvas.h
rename to include/Canvas.h
diff --git a/DRAWer_2_0.h b/include/DRAWer_2_0.h
similarity index 100%
rename from DRAWer_2_0.h
rename to include/DRAWer_2_0.h
diff --git a/System.h b/include/System.h
similarity index 100%
rename from System.h
rename to include/System.h
diff --git a/Canvas.cpp b/src/Canvas.cpp
similarity index 100%
rename from Canvas.cpp
rename to src/Canvas.cpp
diff --git a/DRAWer_2_0.cpp b/src/DRAWer_2_0.cpp
similarity index 100%
rename from DRAWer_2_0.cpp
rename to src/DRAWer_2_0.cpp
diff --git a/DRAWer_2_0.ui b/src/DRAWer_2_0.ui
similarity index 100%
rename from DRAWer_2_0.ui
rename to src/DRAWer_2_0.ui
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp