diff --git a/GUIdataBaseLMS/mainwindow.cpp b/GUIdataBaseLMS/mainwindow.cpp
index 1fc47e1..e5e3cdb 100644
--- a/GUIdataBaseLMS/mainwindow.cpp
+++ b/GUIdataBaseLMS/mainwindow.cpp
@@ -2,7 +2,7 @@
 #include <QMessageBox>
 
 #include "mainwindow.h"
-#include "./ui_mainwindow.h"
+#include "ui_mainwindow.h"
 
 
 MainWindow::MainWindow(QWidget *parent)
diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt
index 161ff10..64f40fb 100644
--- a/InstructorsAndTrainees/CMakeLists.txt
+++ b/InstructorsAndTrainees/CMakeLists.txt
@@ -11,16 +11,16 @@ add_library(InstructorsAndTrainees SHARED
   instructorsandtraineeswidget.h
   instructorsandtraineeswidget.ui
 
-  dialogsettings.cpp
-  dialogsettings.h
-  dialogsettings.ui
-
   commonview.cpp
-  commonview.h  
+  commonview.h
 
-  specialmessagebox.cpp
-  specialmessagebox.h
-  specialmessagebox.ui
+  settings/dialogsettings.cpp
+  settings/dialogsettings.h
+  settings/dialogsettings.ui
+
+  specialmessagebox/specialmessagebox.cpp
+  specialmessagebox/specialmessagebox.h
+  specialmessagebox/specialmessagebox.ui
 
   authorization/dialogauthorization.cpp
   authorization/dialogauthorization.h
@@ -136,10 +136,11 @@ target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/instructors)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/trainees)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/tasks)
-target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/docTasks)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/connectorToServer)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/connectorToServer/Core)
 target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/messanger)
+target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/settings)
+target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/specialmessagebox)
 
 target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY)
 
diff --git a/InstructorsAndTrainees/dialogsettings.cpp b/InstructorsAndTrainees/settings/dialogsettings.cpp
similarity index 100%
rename from InstructorsAndTrainees/dialogsettings.cpp
rename to InstructorsAndTrainees/settings/dialogsettings.cpp
diff --git a/InstructorsAndTrainees/dialogsettings.h b/InstructorsAndTrainees/settings/dialogsettings.h
similarity index 100%
rename from InstructorsAndTrainees/dialogsettings.h
rename to InstructorsAndTrainees/settings/dialogsettings.h
diff --git a/InstructorsAndTrainees/dialogsettings.ui b/InstructorsAndTrainees/settings/dialogsettings.ui
similarity index 100%
rename from InstructorsAndTrainees/dialogsettings.ui
rename to InstructorsAndTrainees/settings/dialogsettings.ui
diff --git a/InstructorsAndTrainees/specialmessagebox.cpp b/InstructorsAndTrainees/specialmessagebox/specialmessagebox.cpp
similarity index 100%
rename from InstructorsAndTrainees/specialmessagebox.cpp
rename to InstructorsAndTrainees/specialmessagebox/specialmessagebox.cpp
diff --git a/InstructorsAndTrainees/specialmessagebox.h b/InstructorsAndTrainees/specialmessagebox/specialmessagebox.h
similarity index 100%
rename from InstructorsAndTrainees/specialmessagebox.h
rename to InstructorsAndTrainees/specialmessagebox/specialmessagebox.h
diff --git a/InstructorsAndTrainees/specialmessagebox.ui b/InstructorsAndTrainees/specialmessagebox/specialmessagebox.ui
similarity index 100%
rename from InstructorsAndTrainees/specialmessagebox.ui
rename to InstructorsAndTrainees/specialmessagebox/specialmessagebox.ui
diff --git a/ServerLMS/CMakeLists.txt b/ServerLMS/CMakeLists.txt
index fd2b7c0..d27b788 100644
--- a/ServerLMS/CMakeLists.txt
+++ b/ServerLMS/CMakeLists.txt
@@ -9,16 +9,16 @@ add_library(ServerLMS SHARED
   serverlmswidget.ui
   metatypes.cpp
   metatypes.h
-  dialogsettingstray.cpp
-  dialogsettingstray.h
-  dialogsettingstray.ui
-  dialogcheckdb.cpp
-  dialogcheckdb.h
-  dialogcheckdb.ui
-  clienthandler.cpp
-  clienthandler.h
-  multithreadserver.cpp
-  multithreadserver.h
+  settings/dialogsettingstray.cpp
+  settings/dialogsettingstray.h
+  settings/dialogsettingstray.ui
+  settings/dialogcheckdb.cpp
+  settings/dialogcheckdb.h
+  settings/dialogcheckdb.ui
+  clienthandler/clienthandler.cpp
+  clienthandler/clienthandler.h
+  multithreadserver/multithreadserver.cpp
+  multithreadserver/multithreadserver.h
   Data/typesDataServerClient.h
   Data/Client.h
   Data/PacketType.h
@@ -52,8 +52,8 @@ add_library(ServerLMS SHARED
   Systems/chatsystem.h
   Systems/fasthashcalculator.cpp
   Systems/fasthashcalculator.h  
-  providerdblms.cpp
-  providerdblms.h
+  providerdblms/providerdblms.cpp
+  providerdblms/providerdblms.h
   ServerLMS.qrc
 )
 
@@ -63,6 +63,11 @@ target_link_libraries(ServerLMS PRIVATE Qt5::Concurrent)
 target_link_libraries(ServerLMS PRIVATE Qt5::Sql)
 target_link_libraries(ServerLMS PRIVATE Qt5::Xml)
 
+target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/clienthandler)
+target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/multithreadserver)
+target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/providerdblms)
+target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/settings)
+
 target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS)
 if(PROJECT_TYPE_DEBUG)
     target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS)
diff --git a/ServerLMS/clienthandler.cpp b/ServerLMS/clienthandler/clienthandler.cpp
similarity index 100%
rename from ServerLMS/clienthandler.cpp
rename to ServerLMS/clienthandler/clienthandler.cpp
diff --git a/ServerLMS/clienthandler.h b/ServerLMS/clienthandler/clienthandler.h
similarity index 100%
rename from ServerLMS/clienthandler.h
rename to ServerLMS/clienthandler/clienthandler.h
diff --git a/ServerLMS/multithreadserver.cpp b/ServerLMS/multithreadserver/multithreadserver.cpp
similarity index 100%
rename from ServerLMS/multithreadserver.cpp
rename to ServerLMS/multithreadserver/multithreadserver.cpp
diff --git a/ServerLMS/multithreadserver.h b/ServerLMS/multithreadserver/multithreadserver.h
similarity index 100%
rename from ServerLMS/multithreadserver.h
rename to ServerLMS/multithreadserver/multithreadserver.h
diff --git a/ServerLMS/providerdblms.cpp b/ServerLMS/providerdblms/providerdblms.cpp
similarity index 100%
rename from ServerLMS/providerdblms.cpp
rename to ServerLMS/providerdblms/providerdblms.cpp
diff --git a/ServerLMS/providerdblms.h b/ServerLMS/providerdblms/providerdblms.h
similarity index 100%
rename from ServerLMS/providerdblms.h
rename to ServerLMS/providerdblms/providerdblms.h
diff --git a/ServerLMS/dialogcheckdb.cpp b/ServerLMS/settings/dialogcheckdb.cpp
similarity index 100%
rename from ServerLMS/dialogcheckdb.cpp
rename to ServerLMS/settings/dialogcheckdb.cpp
diff --git a/ServerLMS/dialogcheckdb.h b/ServerLMS/settings/dialogcheckdb.h
similarity index 100%
rename from ServerLMS/dialogcheckdb.h
rename to ServerLMS/settings/dialogcheckdb.h
diff --git a/ServerLMS/dialogcheckdb.ui b/ServerLMS/settings/dialogcheckdb.ui
similarity index 100%
rename from ServerLMS/dialogcheckdb.ui
rename to ServerLMS/settings/dialogcheckdb.ui
diff --git a/ServerLMS/dialogsettingstray.cpp b/ServerLMS/settings/dialogsettingstray.cpp
similarity index 100%
rename from ServerLMS/dialogsettingstray.cpp
rename to ServerLMS/settings/dialogsettingstray.cpp
diff --git a/ServerLMS/dialogsettingstray.h b/ServerLMS/settings/dialogsettingstray.h
similarity index 100%
rename from ServerLMS/dialogsettingstray.h
rename to ServerLMS/settings/dialogsettingstray.h
diff --git a/ServerLMS/dialogsettingstray.ui b/ServerLMS/settings/dialogsettingstray.ui
similarity index 100%
rename from ServerLMS/dialogsettingstray.ui
rename to ServerLMS/settings/dialogsettingstray.ui
diff --git a/TrayServerLMS/CMakeLists.txt b/TrayServerLMS/CMakeLists.txt
index 2a7f05f..de8f42c 100644
--- a/TrayServerLMS/CMakeLists.txt
+++ b/TrayServerLMS/CMakeLists.txt
@@ -24,6 +24,9 @@ endif()
 target_link_libraries(TrayServerLMS PRIVATE libDataBaseLMS.dll)
 
 target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS)
+target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS/clienthandler)
+target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS/multithreadserver)
+target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS/providerdblms)
 if(PROJECT_TYPE_DEBUG)
     target_link_directories(TrayServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/ServerLMS)
 else()