diff --git a/Qt/qwt b/Qt/qwt
deleted file mode 160000
index aab5a99..0000000
--- a/Qt/qwt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aab5a9927cc2fc2b865ef64a8e3d8c1f7f86fd04
diff --git a/README.md b/README.md
deleted file mode 100644
index 0830ade..0000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# uni_sim_server_cpp
diff --git a/Qt/CMakeLists.txt b/client/CMakeLists.txt
similarity index 100%
rename from Qt/CMakeLists.txt
rename to client/CMakeLists.txt
diff --git a/Qt/IterableEnum.hpp b/client/IterableEnum.hpp
similarity index 100%
rename from Qt/IterableEnum.hpp
rename to client/IterableEnum.hpp
diff --git a/Qt/better_radiobutton.cpp b/client/better_radiobutton.cpp
similarity index 100%
rename from Qt/better_radiobutton.cpp
rename to client/better_radiobutton.cpp
diff --git a/Qt/better_radiobutton.h b/client/better_radiobutton.h
similarity index 100%
rename from Qt/better_radiobutton.h
rename to client/better_radiobutton.h
diff --git a/Qt/can_transceive.cpp b/client/can_transceive.cpp
similarity index 100%
rename from Qt/can_transceive.cpp
rename to client/can_transceive.cpp
diff --git a/Qt/can_transceive.h b/client/can_transceive.h
similarity index 100%
rename from Qt/can_transceive.h
rename to client/can_transceive.h
diff --git a/Qt/can_transceive.ui b/client/can_transceive.ui
similarity index 100%
rename from Qt/can_transceive.ui
rename to client/can_transceive.ui
diff --git a/Qt/helpers.cpp b/client/helpers.cpp
similarity index 100%
rename from Qt/helpers.cpp
rename to client/helpers.cpp
diff --git a/Qt/helpers.h b/client/helpers.h
similarity index 100%
rename from Qt/helpers.h
rename to client/helpers.h
diff --git a/Qt/hex_spinbox.cpp b/client/hex_spinbox.cpp
similarity index 100%
rename from Qt/hex_spinbox.cpp
rename to client/hex_spinbox.cpp
diff --git a/Qt/hex_spinbox.h b/client/hex_spinbox.h
similarity index 100%
rename from Qt/hex_spinbox.h
rename to client/hex_spinbox.h
diff --git a/Qt/led.cpp b/client/led.cpp
similarity index 100%
rename from Qt/led.cpp
rename to client/led.cpp
diff --git a/Qt/led.h b/client/led.h
similarity index 100%
rename from Qt/led.h
rename to client/led.h
diff --git a/Qt/main.cpp b/client/main.cpp
similarity index 100%
rename from Qt/main.cpp
rename to client/main.cpp
diff --git a/Qt/mainwindow.cpp b/client/mainwindow.cpp
similarity index 100%
rename from Qt/mainwindow.cpp
rename to client/mainwindow.cpp
diff --git a/Qt/mainwindow.h b/client/mainwindow.h
similarity index 100%
rename from Qt/mainwindow.h
rename to client/mainwindow.h
diff --git a/Qt/mainwindow.ui b/client/mainwindow.ui
similarity index 100%
rename from Qt/mainwindow.ui
rename to client/mainwindow.ui
diff --git a/Qt/networkerror.cpp b/client/networkerror.cpp
similarity index 100%
rename from Qt/networkerror.cpp
rename to client/networkerror.cpp
diff --git a/Qt/networkerror.h b/client/networkerror.h
similarity index 100%
rename from Qt/networkerror.h
rename to client/networkerror.h
diff --git a/Qt/networkerror.ui b/client/networkerror.ui
similarity index 100%
rename from Qt/networkerror.ui
rename to client/networkerror.ui
diff --git a/Qt/simulator_base.cpp b/client/simulator_base.cpp
similarity index 100%
rename from Qt/simulator_base.cpp
rename to client/simulator_base.cpp
diff --git a/Qt/simulator_base.h b/client/simulator_base.h
similarity index 100%
rename from Qt/simulator_base.h
rename to client/simulator_base.h
diff --git a/Qt/simulators/sim-can_debugger.cpp b/client/simulators/sim-can_debugger.cpp
similarity index 100%
rename from Qt/simulators/sim-can_debugger.cpp
rename to client/simulators/sim-can_debugger.cpp
diff --git a/Qt/simulators/sim-can_debugger.h b/client/simulators/sim-can_debugger.h
similarity index 100%
rename from Qt/simulators/sim-can_debugger.h
rename to client/simulators/sim-can_debugger.h
diff --git a/Qt/simulators/sim-can_debugger.ui b/client/simulators/sim-can_debugger.ui
similarity index 100%
rename from Qt/simulators/sim-can_debugger.ui
rename to client/simulators/sim-can_debugger.ui
diff --git a/Qt/simulators/sim-test.cpp b/client/simulators/sim-test.cpp
similarity index 100%
rename from Qt/simulators/sim-test.cpp
rename to client/simulators/sim-test.cpp
diff --git a/Qt/simulators/sim-test.h b/client/simulators/sim-test.h
similarity index 100%
rename from Qt/simulators/sim-test.h
rename to client/simulators/sim-test.h
diff --git a/Qt/simulators/sim-test.ui b/client/simulators/sim-test.ui
similarity index 100%
rename from Qt/simulators/sim-test.ui
rename to client/simulators/sim-test.ui
diff --git a/Qt/web_socket_wrapper.cpp b/client/web_socket_wrapper.cpp
similarity index 100%
rename from Qt/web_socket_wrapper.cpp
rename to client/web_socket_wrapper.cpp
diff --git a/Qt/web_socket_wrapper.h b/client/web_socket_wrapper.h
similarity index 100%
rename from Qt/web_socket_wrapper.h
rename to client/web_socket_wrapper.h