diff --git a/apps/notes_tk/CMakeLists.txt b/apps/notes_tk/CMakeLists.txt
index c290c63..4d45299 100644
--- a/apps/notes_tk/CMakeLists.txt
+++ b/apps/notes_tk/CMakeLists.txt
@@ -61,7 +61,7 @@ target_include_directories(${APP_NAME} PUBLIC
     "${CMAKE_CURRENT_SOURCE_DIR}/canvas"
     "${CMAKE_CURRENT_SOURCE_DIR}/mesh_viewer"
                               )
-target_link_libraries(${APP_NAME} PUBLIC client windows console core network database geometry audio web)
+target_link_libraries(${APP_NAME} PUBLIC ui_controls client windows console core network database geometry audio web)
 set_property(TARGET ${APP_NAME} PROPERTY FOLDER apps)
 endif()
 
diff --git a/apps/notes_tk/NotesTk.cpp b/apps/notes_tk/NotesTk.cpp
index 701e0cd..d230835 100644
--- a/apps/notes_tk/NotesTk.cpp
+++ b/apps/notes_tk/NotesTk.cpp
@@ -59,13 +59,13 @@ void NotesTk::initializeViews()
     mesh->setName("MeshViewer");
     tabbedPanel->addPanel(std::move(mesh), "Mesh Viewer");
 
-    auto topBar = TopBar::Create();
+    //auto topBar = TopBar::Create();
     //auto statusBar = StatusBar::Create();
 
-    auto horizontal_spacer = HorizontalSpacer::Create();
-    horizontal_spacer->addWidgetWithScale(std::move(topBar), 1);
-    horizontal_spacer->addWidgetWithScale(std::move(tabbedPanel), 20);
+    //auto horizontal_spacer = HorizontalSpacer::Create();
+    //horizontal_spacer->addWidgetWithScale(std::move(topBar), 1);
+    //horizontal_spacer->addWidgetWithScale(std::move(tabbedPanel), 20);
     //horizontal_spacer->addWidgetWithScale(std::move(statusBar), 1);
 
-    mainWindow->setWidget(std::move(horizontal_spacer));
+    mainWindow->setWidget(std::move(tabbedPanel));
 }
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6149231..59c8ec8 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(circuits)
 add_subdirectory(math)
+add_subdirectory(music)
 add_subdirectory(machine_learning)
 add_subdirectory(physics_simulation)
 add_subdirectory(quantum_computing)
diff --git a/plugins/music/CMakeLists.txt b/plugins/music/CMakeLists.txt
new file mode 100644
index 0000000..47f2510
--- /dev/null
+++ b/plugins/music/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/plugins/music/src/CMakeLists.txt b/plugins/music/src/CMakeLists.txt
new file mode 100644
index 0000000..544961c
--- /dev/null
+++ b/plugins/music/src/CMakeLists.txt
@@ -0,0 +1,36 @@
+set(PLUGIN_NAME music)
+
+list(APPEND HEADERS 
+    midi/reader/MidiReader.h
+    midi/MidiTrack.h
+    midi/MidiDocument.h
+    midi/MidiElements.h
+    midi/MidiEvent.h
+    midi/MetaMidiEvent.h
+    midi/MidiChannelEvent.h
+	)
+
+list(APPEND LIB_INCLUDES 
+    midi/reader/MidiReader.cpp
+    midi/reader/MidiTimeAdapter.cpp
+    midi/reader/MidiMetaEventAdapter.cpp
+    midi/reader/MidiChannelEventAdapter.cpp
+    midi/MidiTrack.cpp
+    midi/MidiDocument.cpp
+    midi/MidiEvent.cpp
+    midi/MetaMidiEvent.cpp
+    midi/MidiChannelEvent.cpp
+	)
+   
+add_library(${PLUGIN_NAME} SHARED ${LIB_INCLUDES} ${HEADERS})
+
+target_include_directories(${PLUGIN_NAME} PUBLIC 
+							${CMAKE_CURRENT_SOURCE_DIR}
+							${CMAKE_CURRENT_SOURCE_DIR}/midi
+							${CMAKE_CURRENT_SOURCE_DIR}/midi/reader
+	)
+
+
+target_link_libraries(${PLUGIN_NAME} PUBLIC core audio)
+set_property(TARGET ${PLUGIN_NAME} PROPERTY FOLDER plugins)
+set_target_properties( ${PLUGIN_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )  
\ No newline at end of file
diff --git a/src/audio/midi/MetaMidiEvent.cpp b/plugins/music/src/midi/MetaMidiEvent.cpp
similarity index 100%
rename from src/audio/midi/MetaMidiEvent.cpp
rename to plugins/music/src/midi/MetaMidiEvent.cpp
diff --git a/src/audio/midi/MetaMidiEvent.h b/plugins/music/src/midi/MetaMidiEvent.h
similarity index 100%
rename from src/audio/midi/MetaMidiEvent.h
rename to plugins/music/src/midi/MetaMidiEvent.h
diff --git a/src/audio/midi/MidiChannelEvent.cpp b/plugins/music/src/midi/MidiChannelEvent.cpp
similarity index 100%
rename from src/audio/midi/MidiChannelEvent.cpp
rename to plugins/music/src/midi/MidiChannelEvent.cpp
diff --git a/src/audio/midi/MidiChannelEvent.h b/plugins/music/src/midi/MidiChannelEvent.h
similarity index 100%
rename from src/audio/midi/MidiChannelEvent.h
rename to plugins/music/src/midi/MidiChannelEvent.h
diff --git a/src/audio/midi/MidiDocument.cpp b/plugins/music/src/midi/MidiDocument.cpp
similarity index 100%
rename from src/audio/midi/MidiDocument.cpp
rename to plugins/music/src/midi/MidiDocument.cpp
diff --git a/src/audio/midi/MidiDocument.h b/plugins/music/src/midi/MidiDocument.h
similarity index 100%
rename from src/audio/midi/MidiDocument.h
rename to plugins/music/src/midi/MidiDocument.h
diff --git a/src/audio/midi/MidiElements.h b/plugins/music/src/midi/MidiElements.h
similarity index 100%
rename from src/audio/midi/MidiElements.h
rename to plugins/music/src/midi/MidiElements.h
diff --git a/src/audio/midi/MidiEvent.cpp b/plugins/music/src/midi/MidiEvent.cpp
similarity index 100%
rename from src/audio/midi/MidiEvent.cpp
rename to plugins/music/src/midi/MidiEvent.cpp
diff --git a/src/audio/midi/MidiEvent.h b/plugins/music/src/midi/MidiEvent.h
similarity index 100%
rename from src/audio/midi/MidiEvent.h
rename to plugins/music/src/midi/MidiEvent.h
diff --git a/src/audio/midi/MidiTrack.cpp b/plugins/music/src/midi/MidiTrack.cpp
similarity index 100%
rename from src/audio/midi/MidiTrack.cpp
rename to plugins/music/src/midi/MidiTrack.cpp
diff --git a/src/audio/midi/MidiTrack.h b/plugins/music/src/midi/MidiTrack.h
similarity index 100%
rename from src/audio/midi/MidiTrack.h
rename to plugins/music/src/midi/MidiTrack.h
diff --git a/src/audio/midi/reader/MidiChannelEventAdapter.cpp b/plugins/music/src/midi/reader/MidiChannelEventAdapter.cpp
similarity index 100%
rename from src/audio/midi/reader/MidiChannelEventAdapter.cpp
rename to plugins/music/src/midi/reader/MidiChannelEventAdapter.cpp
diff --git a/src/audio/midi/reader/MidiChannelEventAdapter.h b/plugins/music/src/midi/reader/MidiChannelEventAdapter.h
similarity index 100%
rename from src/audio/midi/reader/MidiChannelEventAdapter.h
rename to plugins/music/src/midi/reader/MidiChannelEventAdapter.h
diff --git a/src/audio/midi/reader/MidiMetaEventAdapter.cpp b/plugins/music/src/midi/reader/MidiMetaEventAdapter.cpp
similarity index 100%
rename from src/audio/midi/reader/MidiMetaEventAdapter.cpp
rename to plugins/music/src/midi/reader/MidiMetaEventAdapter.cpp
diff --git a/src/audio/midi/reader/MidiMetaEventAdapter.h b/plugins/music/src/midi/reader/MidiMetaEventAdapter.h
similarity index 100%
rename from src/audio/midi/reader/MidiMetaEventAdapter.h
rename to plugins/music/src/midi/reader/MidiMetaEventAdapter.h
diff --git a/src/audio/midi/reader/MidiReader.cpp b/plugins/music/src/midi/reader/MidiReader.cpp
similarity index 100%
rename from src/audio/midi/reader/MidiReader.cpp
rename to plugins/music/src/midi/reader/MidiReader.cpp
diff --git a/src/audio/midi/reader/MidiReader.h b/plugins/music/src/midi/reader/MidiReader.h
similarity index 100%
rename from src/audio/midi/reader/MidiReader.h
rename to plugins/music/src/midi/reader/MidiReader.h
diff --git a/src/audio/midi/reader/MidiTimeAdapter.cpp b/plugins/music/src/midi/reader/MidiTimeAdapter.cpp
similarity index 100%
rename from src/audio/midi/reader/MidiTimeAdapter.cpp
rename to plugins/music/src/midi/reader/MidiTimeAdapter.cpp
diff --git a/src/audio/midi/reader/MidiTimeAdapter.h b/plugins/music/src/midi/reader/MidiTimeAdapter.h
similarity index 100%
rename from src/audio/midi/reader/MidiTimeAdapter.h
rename to plugins/music/src/midi/reader/MidiTimeAdapter.h
diff --git a/plugins/music/test/CMakeLists.txt b/plugins/music/test/CMakeLists.txt
new file mode 100644
index 0000000..9cd3d99
--- /dev/null
+++ b/plugins/music/test/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+list(APPEND UNIT_TEST_FILES
+	TestMidiReader.cpp
+)
+
+add_executable(music_unit_tests ${CMAKE_SOURCE_DIR}/test/test_runner.cpp ${UNIT_TEST_FILES})
+target_link_libraries(music_unit_tests PUBLIC test_utils music)
+set_property(TARGET music_unit_tests PROPERTY FOLDER plugins)
\ No newline at end of file
diff --git a/test/audio/unit/TestMidiReader.cpp b/plugins/music/test/TestMidiReader.cpp
similarity index 100%
rename from test/audio/unit/TestMidiReader.cpp
rename to plugins/music/test/TestMidiReader.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79e3ef6..bc9ba8a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,19 +1,7 @@
-add_subdirectory(core)
-add_subdirectory(compiler)
-add_subdirectory(compression)
-add_subdirectory(database)
-add_subdirectory(network)
-add_subdirectory(geometry)
-add_subdirectory(mesh)
-add_subdirectory(audio)
-add_subdirectory(fonts)
-add_subdirectory(image)
+add_subdirectory(base)
 add_subdirectory(console)
-add_subdirectory(client)
-add_subdirectory(graphics)
+add_subdirectory(media)
 add_subdirectory(publishing)
-add_subdirectory(video)
-add_subdirectory(windows)
+add_subdirectory(rendering)
+add_subdirectory(ui)
 add_subdirectory(web)
-add_subdirectory(ui_elements)
-add_subdirectory(visual_elements)
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
new file mode 100644
index 0000000..4e4caef
--- /dev/null
+++ b/src/base/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_subdirectory(compiler)
+add_subdirectory(compression)
+add_subdirectory(core)
+add_subdirectory(database)
+add_subdirectory(geometry)
+add_subdirectory(network)
diff --git a/src/compiler/CMakeLists.txt b/src/base/compiler/CMakeLists.txt
similarity index 79%
rename from src/compiler/CMakeLists.txt
rename to src/base/compiler/CMakeLists.txt
index bfcca80..c56514a 100644
--- a/src/compiler/CMakeLists.txt
+++ b/src/base/compiler/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MODULE_NAME compiler)
 
-list(APPEND TARGET_HEADERS 
+list(APPEND HEADERS 
     Lexer.h
     template_engine/TemplatingEngine.h
     template_engine/TemplateFile.h
@@ -8,7 +8,7 @@ list(APPEND TARGET_HEADERS
     template_engine/TemplateElements.h
     )
 
-list(APPEND TARGET_SOURCES 
+list(APPEND SOURCES 
     Lexer.cpp
     template_engine/TemplatingEngine.cpp
     template_engine/TemplateFile.cpp
@@ -16,7 +16,7 @@ list(APPEND TARGET_SOURCES
     template_engine/TemplateElements.cpp
     )
 
-add_library(${MODULE_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
+add_library(${MODULE_NAME} SHARED ${HEADERS} ${SOURCES})
 
 target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}
@@ -25,4 +25,4 @@ target_include_directories(${MODULE_NAME} PUBLIC
 target_link_libraries( ${MODULE_NAME} PUBLIC core)
 
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)
diff --git a/src/compiler/Lexer.cpp b/src/base/compiler/Lexer.cpp
similarity index 100%
rename from src/compiler/Lexer.cpp
rename to src/base/compiler/Lexer.cpp
diff --git a/src/compiler/Lexer.h b/src/base/compiler/Lexer.h
similarity index 100%
rename from src/compiler/Lexer.h
rename to src/base/compiler/Lexer.h
diff --git a/src/compiler/template_engine/TemplateElements.cpp b/src/base/compiler/template_engine/TemplateElements.cpp
similarity index 100%
rename from src/compiler/template_engine/TemplateElements.cpp
rename to src/base/compiler/template_engine/TemplateElements.cpp
diff --git a/src/compiler/template_engine/TemplateElements.h b/src/base/compiler/template_engine/TemplateElements.h
similarity index 100%
rename from src/compiler/template_engine/TemplateElements.h
rename to src/base/compiler/template_engine/TemplateElements.h
diff --git a/src/compiler/template_engine/TemplateFile.cpp b/src/base/compiler/template_engine/TemplateFile.cpp
similarity index 100%
rename from src/compiler/template_engine/TemplateFile.cpp
rename to src/base/compiler/template_engine/TemplateFile.cpp
diff --git a/src/compiler/template_engine/TemplateFile.h b/src/base/compiler/template_engine/TemplateFile.h
similarity index 100%
rename from src/compiler/template_engine/TemplateFile.h
rename to src/base/compiler/template_engine/TemplateFile.h
diff --git a/src/compiler/template_engine/TemplateNode.cpp b/src/base/compiler/template_engine/TemplateNode.cpp
similarity index 100%
rename from src/compiler/template_engine/TemplateNode.cpp
rename to src/base/compiler/template_engine/TemplateNode.cpp
diff --git a/src/compiler/template_engine/TemplateNode.h b/src/base/compiler/template_engine/TemplateNode.h
similarity index 100%
rename from src/compiler/template_engine/TemplateNode.h
rename to src/base/compiler/template_engine/TemplateNode.h
diff --git a/src/compiler/template_engine/TemplateSubstitutionContext.h b/src/base/compiler/template_engine/TemplateSubstitutionContext.h
similarity index 100%
rename from src/compiler/template_engine/TemplateSubstitutionContext.h
rename to src/base/compiler/template_engine/TemplateSubstitutionContext.h
diff --git a/src/compiler/template_engine/TemplatingEngine.cpp b/src/base/compiler/template_engine/TemplatingEngine.cpp
similarity index 100%
rename from src/compiler/template_engine/TemplatingEngine.cpp
rename to src/base/compiler/template_engine/TemplatingEngine.cpp
diff --git a/src/compiler/template_engine/TemplatingEngine.h b/src/base/compiler/template_engine/TemplatingEngine.h
similarity index 100%
rename from src/compiler/template_engine/TemplatingEngine.h
rename to src/base/compiler/template_engine/TemplatingEngine.h
diff --git a/src/compression/AbstractEncoder.h b/src/base/compression/AbstractEncoder.h
similarity index 100%
rename from src/compression/AbstractEncoder.h
rename to src/base/compression/AbstractEncoder.h
diff --git a/src/compression/Adler32Checksum.h b/src/base/compression/Adler32Checksum.h
similarity index 100%
rename from src/compression/Adler32Checksum.h
rename to src/base/compression/Adler32Checksum.h
diff --git a/src/compression/CMakeLists.txt b/src/base/compression/CMakeLists.txt
similarity index 62%
rename from src/compression/CMakeLists.txt
rename to src/base/compression/CMakeLists.txt
index e4f8954..6eff2f6 100644
--- a/src/compression/CMakeLists.txt
+++ b/src/base/compression/CMakeLists.txt
@@ -1,5 +1,6 @@
+set(MODULE_NAME compression)
 
-list(APPEND compression_LIB_INCLUDES 
+list(APPEND SOURCES 
     StreamCompressor.cpp
     huffman/HuffmanEncoder.cpp
     huffman/HuffmanStream.cpp
@@ -13,14 +14,14 @@ list(APPEND compression_LIB_INCLUDES
     CyclicRedundancyChecker.cpp
     )
 
-add_library(compression SHARED ${compression_LIB_INCLUDES})
+add_library(${MODULE_NAME} SHARED ${SOURCES})
 
-target_include_directories(compression PUBLIC
+target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}
                           ${CMAKE_CURRENT_SOURCE_DIR}/deflate
                           ${CMAKE_CURRENT_SOURCE_DIR}/huffman
                           )
                           
-target_link_libraries(compression PUBLIC core)
-set_property(TARGET compression PROPERTY FOLDER src)
-set_target_properties( compression PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
+target_link_libraries(${MODULE_NAME} PUBLIC core)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)
+set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
diff --git a/src/compression/CyclicRedundancyChecker.cpp b/src/base/compression/CyclicRedundancyChecker.cpp
similarity index 100%
rename from src/compression/CyclicRedundancyChecker.cpp
rename to src/base/compression/CyclicRedundancyChecker.cpp
diff --git a/src/compression/CyclicRedundancyChecker.h b/src/base/compression/CyclicRedundancyChecker.h
similarity index 100%
rename from src/compression/CyclicRedundancyChecker.h
rename to src/base/compression/CyclicRedundancyChecker.h
diff --git a/src/compression/Lz77Encoder.cpp b/src/base/compression/Lz77Encoder.cpp
similarity index 100%
rename from src/compression/Lz77Encoder.cpp
rename to src/base/compression/Lz77Encoder.cpp
diff --git a/src/compression/Lz77Encoder.h b/src/base/compression/Lz77Encoder.h
similarity index 100%
rename from src/compression/Lz77Encoder.h
rename to src/base/compression/Lz77Encoder.h
diff --git a/src/compression/RunLengthEncoder.cpp b/src/base/compression/RunLengthEncoder.cpp
similarity index 100%
rename from src/compression/RunLengthEncoder.cpp
rename to src/base/compression/RunLengthEncoder.cpp
diff --git a/src/compression/RunLengthEncoder.h b/src/base/compression/RunLengthEncoder.h
similarity index 100%
rename from src/compression/RunLengthEncoder.h
rename to src/base/compression/RunLengthEncoder.h
diff --git a/src/compression/StreamCompressor.cpp b/src/base/compression/StreamCompressor.cpp
similarity index 100%
rename from src/compression/StreamCompressor.cpp
rename to src/base/compression/StreamCompressor.cpp
diff --git a/src/compression/StreamCompressor.h b/src/base/compression/StreamCompressor.h
similarity index 100%
rename from src/compression/StreamCompressor.h
rename to src/base/compression/StreamCompressor.h
diff --git a/src/compression/ZlibEncoder.cpp b/src/base/compression/ZlibEncoder.cpp
similarity index 100%
rename from src/compression/ZlibEncoder.cpp
rename to src/base/compression/ZlibEncoder.cpp
diff --git a/src/compression/ZlibEncoder.h b/src/base/compression/ZlibEncoder.h
similarity index 100%
rename from src/compression/ZlibEncoder.h
rename to src/base/compression/ZlibEncoder.h
diff --git a/src/compression/deflate/DeflateBlock.cpp b/src/base/compression/deflate/DeflateBlock.cpp
similarity index 100%
rename from src/compression/deflate/DeflateBlock.cpp
rename to src/base/compression/deflate/DeflateBlock.cpp
diff --git a/src/compression/deflate/DeflateBlock.h b/src/base/compression/deflate/DeflateBlock.h
similarity index 100%
rename from src/compression/deflate/DeflateBlock.h
rename to src/base/compression/deflate/DeflateBlock.h
diff --git a/src/compression/deflate/DeflateElements.h b/src/base/compression/deflate/DeflateElements.h
similarity index 100%
rename from src/compression/deflate/DeflateElements.h
rename to src/base/compression/deflate/DeflateElements.h
diff --git a/src/compression/deflate/DeflateEncoder.cpp b/src/base/compression/deflate/DeflateEncoder.cpp
similarity index 100%
rename from src/compression/deflate/DeflateEncoder.cpp
rename to src/base/compression/deflate/DeflateEncoder.cpp
diff --git a/src/compression/deflate/DeflateEncoder.h b/src/base/compression/deflate/DeflateEncoder.h
similarity index 100%
rename from src/compression/deflate/DeflateEncoder.h
rename to src/base/compression/deflate/DeflateEncoder.h
diff --git a/src/compression/huffman/HuffmanCodeLengthTable.cpp b/src/base/compression/huffman/HuffmanCodeLengthTable.cpp
similarity index 100%
rename from src/compression/huffman/HuffmanCodeLengthTable.cpp
rename to src/base/compression/huffman/HuffmanCodeLengthTable.cpp
diff --git a/src/compression/huffman/HuffmanCodeLengthTable.h b/src/base/compression/huffman/HuffmanCodeLengthTable.h
similarity index 100%
rename from src/compression/huffman/HuffmanCodeLengthTable.h
rename to src/base/compression/huffman/HuffmanCodeLengthTable.h
diff --git a/src/compression/huffman/HuffmanEncoder.cpp b/src/base/compression/huffman/HuffmanEncoder.cpp
similarity index 100%
rename from src/compression/huffman/HuffmanEncoder.cpp
rename to src/base/compression/huffman/HuffmanEncoder.cpp
diff --git a/src/compression/huffman/HuffmanEncoder.h b/src/base/compression/huffman/HuffmanEncoder.h
similarity index 100%
rename from src/compression/huffman/HuffmanEncoder.h
rename to src/base/compression/huffman/HuffmanEncoder.h
diff --git a/src/compression/huffman/HuffmanFixedCodes.h b/src/base/compression/huffman/HuffmanFixedCodes.h
similarity index 100%
rename from src/compression/huffman/HuffmanFixedCodes.h
rename to src/base/compression/huffman/HuffmanFixedCodes.h
diff --git a/src/compression/huffman/HuffmanStream.cpp b/src/base/compression/huffman/HuffmanStream.cpp
similarity index 100%
rename from src/compression/huffman/HuffmanStream.cpp
rename to src/base/compression/huffman/HuffmanStream.cpp
diff --git a/src/compression/huffman/HuffmanStream.h b/src/base/compression/huffman/HuffmanStream.h
similarity index 100%
rename from src/compression/huffman/HuffmanStream.h
rename to src/base/compression/huffman/HuffmanStream.h
diff --git a/src/compression/huffman/HuffmanTree.cpp b/src/base/compression/huffman/HuffmanTree.cpp
similarity index 100%
rename from src/compression/huffman/HuffmanTree.cpp
rename to src/base/compression/huffman/HuffmanTree.cpp
diff --git a/src/compression/huffman/HuffmanTree.h b/src/base/compression/huffman/HuffmanTree.h
similarity index 100%
rename from src/compression/huffman/HuffmanTree.h
rename to src/base/compression/huffman/HuffmanTree.h
diff --git a/src/core/AbstractApp.h b/src/base/core/AbstractApp.h
similarity index 100%
rename from src/core/AbstractApp.h
rename to src/base/core/AbstractApp.h
diff --git a/src/core/AbstractNamedItem.h b/src/base/core/AbstractNamedItem.h
similarity index 100%
rename from src/core/AbstractNamedItem.h
rename to src/base/core/AbstractNamedItem.h
diff --git a/src/core/AbstractWebApp.h b/src/base/core/AbstractWebApp.h
similarity index 100%
rename from src/core/AbstractWebApp.h
rename to src/base/core/AbstractWebApp.h
diff --git a/src/core/CMakeLists.txt b/src/base/core/CMakeLists.txt
similarity index 93%
rename from src/core/CMakeLists.txt
rename to src/base/core/CMakeLists.txt
index 601588a..6bca68d 100644
--- a/src/core/CMakeLists.txt
+++ b/src/base/core/CMakeLists.txt
@@ -26,7 +26,7 @@ list(APPEND HEADERS
 	Win32BaseIncludes.h
 )   
 
-list(APPEND LIB_INCLUDES 
+list(APPEND SOURCES 
     Event.cpp
     Dictionary.cpp
     Color.cpp
@@ -53,7 +53,7 @@ list(APPEND LIB_INCLUDES
     http/HttpRequest.cpp
     serializers/TomlReader.cpp)
 
-add_library(${MODULE_NAME} SHARED ${LIB_INCLUDES} ${HEADERS})
+add_library(${MODULE_NAME} SHARED ${SOURCES} ${HEADERS})
 
 target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}
@@ -67,4 +67,4 @@ target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}/serializers
                           )
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
\ No newline at end of file
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)
\ No newline at end of file
diff --git a/src/core/Color.cpp b/src/base/core/Color.cpp
similarity index 100%
rename from src/core/Color.cpp
rename to src/base/core/Color.cpp
diff --git a/src/core/Color.h b/src/base/core/Color.h
similarity index 100%
rename from src/core/Color.h
rename to src/base/core/Color.h
diff --git a/src/core/CommandLineArgs.cpp b/src/base/core/CommandLineArgs.cpp
similarity index 100%
rename from src/core/CommandLineArgs.cpp
rename to src/base/core/CommandLineArgs.cpp
diff --git a/src/core/CommandLineArgs.h b/src/base/core/CommandLineArgs.h
similarity index 100%
rename from src/core/CommandLineArgs.h
rename to src/base/core/CommandLineArgs.h
diff --git a/src/core/Dictionary.cpp b/src/base/core/Dictionary.cpp
similarity index 100%
rename from src/core/Dictionary.cpp
rename to src/base/core/Dictionary.cpp
diff --git a/src/core/Dictionary.h b/src/base/core/Dictionary.h
similarity index 100%
rename from src/core/Dictionary.h
rename to src/base/core/Dictionary.h
diff --git a/src/core/Event.cpp b/src/base/core/Event.cpp
similarity index 100%
rename from src/core/Event.cpp
rename to src/base/core/Event.cpp
diff --git a/src/core/Event.h b/src/base/core/Event.h
similarity index 100%
rename from src/core/Event.h
rename to src/base/core/Event.h
diff --git a/src/core/RandomUtils.cpp b/src/base/core/RandomUtils.cpp
similarity index 100%
rename from src/core/RandomUtils.cpp
rename to src/base/core/RandomUtils.cpp
diff --git a/src/core/RandomUtils.h b/src/base/core/RandomUtils.h
similarity index 100%
rename from src/core/RandomUtils.h
rename to src/base/core/RandomUtils.h
diff --git a/src/core/Win32BaseIncludes.h b/src/base/core/Win32BaseIncludes.h
similarity index 100%
rename from src/core/Win32BaseIncludes.h
rename to src/base/core/Win32BaseIncludes.h
diff --git a/src/core/data_structures/CircleBuffer.h b/src/base/core/data_structures/CircleBuffer.h
similarity index 100%
rename from src/core/data_structures/CircleBuffer.h
rename to src/base/core/data_structures/CircleBuffer.h
diff --git a/src/core/data_structures/List.h b/src/base/core/data_structures/List.h
similarity index 100%
rename from src/core/data_structures/List.h
rename to src/base/core/data_structures/List.h
diff --git a/src/core/data_structures/RawTree.cpp b/src/base/core/data_structures/RawTree.cpp
similarity index 100%
rename from src/core/data_structures/RawTree.cpp
rename to src/base/core/data_structures/RawTree.cpp
diff --git a/src/core/data_structures/RawTree.h b/src/base/core/data_structures/RawTree.h
similarity index 100%
rename from src/core/data_structures/RawTree.h
rename to src/base/core/data_structures/RawTree.h
diff --git a/src/core/data_structures/Tree.cpp b/src/base/core/data_structures/Tree.cpp
similarity index 100%
rename from src/core/data_structures/Tree.cpp
rename to src/base/core/data_structures/Tree.cpp
diff --git a/src/core/data_structures/Tree.h b/src/base/core/data_structures/Tree.h
similarity index 100%
rename from src/core/data_structures/Tree.h
rename to src/base/core/data_structures/Tree.h
diff --git a/src/core/encoding/ByteUtils.cpp b/src/base/core/encoding/ByteUtils.cpp
similarity index 100%
rename from src/core/encoding/ByteUtils.cpp
rename to src/base/core/encoding/ByteUtils.cpp
diff --git a/src/core/encoding/ByteUtils.h b/src/base/core/encoding/ByteUtils.h
similarity index 100%
rename from src/core/encoding/ByteUtils.h
rename to src/base/core/encoding/ByteUtils.h
diff --git a/src/core/encoding/StringUtils.cpp b/src/base/core/encoding/StringUtils.cpp
similarity index 100%
rename from src/core/encoding/StringUtils.cpp
rename to src/base/core/encoding/StringUtils.cpp
diff --git a/src/core/encoding/StringUtils.h b/src/base/core/encoding/StringUtils.h
similarity index 100%
rename from src/core/encoding/StringUtils.h
rename to src/base/core/encoding/StringUtils.h
diff --git a/src/core/encoding/UnicodeUtils.cpp b/src/base/core/encoding/UnicodeUtils.cpp
similarity index 100%
rename from src/core/encoding/UnicodeUtils.cpp
rename to src/base/core/encoding/UnicodeUtils.cpp
diff --git a/src/core/encoding/UnicodeUtils.h b/src/base/core/encoding/UnicodeUtils.h
similarity index 100%
rename from src/core/encoding/UnicodeUtils.h
rename to src/base/core/encoding/UnicodeUtils.h
diff --git a/src/core/file_utilities/Directory.cpp b/src/base/core/file_utilities/Directory.cpp
similarity index 100%
rename from src/core/file_utilities/Directory.cpp
rename to src/base/core/file_utilities/Directory.cpp
diff --git a/src/core/file_utilities/Directory.h b/src/base/core/file_utilities/Directory.h
similarity index 100%
rename from src/core/file_utilities/Directory.h
rename to src/base/core/file_utilities/Directory.h
diff --git a/src/core/file_utilities/File.cpp b/src/base/core/file_utilities/File.cpp
similarity index 100%
rename from src/core/file_utilities/File.cpp
rename to src/base/core/file_utilities/File.cpp
diff --git a/src/core/file_utilities/File.h b/src/base/core/file_utilities/File.h
similarity index 100%
rename from src/core/file_utilities/File.h
rename to src/base/core/file_utilities/File.h
diff --git a/src/core/file_utilities/FileFormats.cpp b/src/base/core/file_utilities/FileFormats.cpp
similarity index 100%
rename from src/core/file_utilities/FileFormats.cpp
rename to src/base/core/file_utilities/FileFormats.cpp
diff --git a/src/core/file_utilities/FileFormats.h b/src/base/core/file_utilities/FileFormats.h
similarity index 100%
rename from src/core/file_utilities/FileFormats.h
rename to src/base/core/file_utilities/FileFormats.h
diff --git a/src/core/file_utilities/PathUtils.cpp b/src/base/core/file_utilities/PathUtils.cpp
similarity index 100%
rename from src/core/file_utilities/PathUtils.cpp
rename to src/base/core/file_utilities/PathUtils.cpp
diff --git a/src/core/file_utilities/PathUtils.h b/src/base/core/file_utilities/PathUtils.h
similarity index 100%
rename from src/core/file_utilities/PathUtils.h
rename to src/base/core/file_utilities/PathUtils.h
diff --git a/src/core/http/HttpHeader.cpp b/src/base/core/http/HttpHeader.cpp
similarity index 100%
rename from src/core/http/HttpHeader.cpp
rename to src/base/core/http/HttpHeader.cpp
diff --git a/src/core/http/HttpHeader.h b/src/base/core/http/HttpHeader.h
similarity index 100%
rename from src/core/http/HttpHeader.h
rename to src/base/core/http/HttpHeader.h
diff --git a/src/core/http/HttpRequest.cpp b/src/base/core/http/HttpRequest.cpp
similarity index 100%
rename from src/core/http/HttpRequest.cpp
rename to src/base/core/http/HttpRequest.cpp
diff --git a/src/core/http/HttpRequest.h b/src/base/core/http/HttpRequest.h
similarity index 100%
rename from src/core/http/HttpRequest.h
rename to src/base/core/http/HttpRequest.h
diff --git a/src/core/http/HttpResponse.cpp b/src/base/core/http/HttpResponse.cpp
similarity index 100%
rename from src/core/http/HttpResponse.cpp
rename to src/base/core/http/HttpResponse.cpp
diff --git a/src/core/http/HttpResponse.h b/src/base/core/http/HttpResponse.h
similarity index 100%
rename from src/core/http/HttpResponse.h
rename to src/base/core/http/HttpResponse.h
diff --git a/src/core/loggers/FileLogger.cpp b/src/base/core/loggers/FileLogger.cpp
similarity index 100%
rename from src/core/loggers/FileLogger.cpp
rename to src/base/core/loggers/FileLogger.cpp
diff --git a/src/core/loggers/FileLogger.h b/src/base/core/loggers/FileLogger.h
similarity index 100%
rename from src/core/loggers/FileLogger.h
rename to src/base/core/loggers/FileLogger.h
diff --git a/src/core/memory/SharedMemory.cpp b/src/base/core/memory/SharedMemory.cpp
similarity index 100%
rename from src/core/memory/SharedMemory.cpp
rename to src/base/core/memory/SharedMemory.cpp
diff --git a/src/core/memory/SharedMemory.h b/src/base/core/memory/SharedMemory.h
similarity index 100%
rename from src/core/memory/SharedMemory.h
rename to src/base/core/memory/SharedMemory.h
diff --git a/src/core/serializers/TomlReader.cpp b/src/base/core/serializers/TomlReader.cpp
similarity index 100%
rename from src/core/serializers/TomlReader.cpp
rename to src/base/core/serializers/TomlReader.cpp
diff --git a/src/core/serializers/TomlReader.h b/src/base/core/serializers/TomlReader.h
similarity index 100%
rename from src/core/serializers/TomlReader.h
rename to src/base/core/serializers/TomlReader.h
diff --git a/src/core/streams/AbstractChecksumCalculator.h b/src/base/core/streams/AbstractChecksumCalculator.h
similarity index 100%
rename from src/core/streams/AbstractChecksumCalculator.h
rename to src/base/core/streams/AbstractChecksumCalculator.h
diff --git a/src/core/streams/BinaryStream.cpp b/src/base/core/streams/BinaryStream.cpp
similarity index 100%
rename from src/core/streams/BinaryStream.cpp
rename to src/base/core/streams/BinaryStream.cpp
diff --git a/src/core/streams/BinaryStream.h b/src/base/core/streams/BinaryStream.h
similarity index 100%
rename from src/core/streams/BinaryStream.h
rename to src/base/core/streams/BinaryStream.h
diff --git a/src/core/streams/BitStream.cpp b/src/base/core/streams/BitStream.cpp
similarity index 100%
rename from src/core/streams/BitStream.cpp
rename to src/base/core/streams/BitStream.cpp
diff --git a/src/core/streams/BitStream.h b/src/base/core/streams/BitStream.h
similarity index 100%
rename from src/core/streams/BitStream.h
rename to src/base/core/streams/BitStream.h
diff --git a/src/core/streams/BufferBitStream.cpp b/src/base/core/streams/BufferBitStream.cpp
similarity index 100%
rename from src/core/streams/BufferBitStream.cpp
rename to src/base/core/streams/BufferBitStream.cpp
diff --git a/src/core/streams/BufferBitStream.h b/src/base/core/streams/BufferBitStream.h
similarity index 100%
rename from src/core/streams/BufferBitStream.h
rename to src/base/core/streams/BufferBitStream.h
diff --git a/src/core/streams/InputBitStream.cpp b/src/base/core/streams/InputBitStream.cpp
similarity index 100%
rename from src/core/streams/InputBitStream.cpp
rename to src/base/core/streams/InputBitStream.cpp
diff --git a/src/core/streams/InputBitStream.h b/src/base/core/streams/InputBitStream.h
similarity index 100%
rename from src/core/streams/InputBitStream.h
rename to src/base/core/streams/InputBitStream.h
diff --git a/src/core/streams/OutputBitStream.cpp b/src/base/core/streams/OutputBitStream.cpp
similarity index 100%
rename from src/core/streams/OutputBitStream.cpp
rename to src/base/core/streams/OutputBitStream.cpp
diff --git a/src/core/streams/OutputBitStream.h b/src/base/core/streams/OutputBitStream.h
similarity index 100%
rename from src/core/streams/OutputBitStream.h
rename to src/base/core/streams/OutputBitStream.h
diff --git a/src/database/CMakeLists.txt b/src/base/database/CMakeLists.txt
similarity index 85%
rename from src/database/CMakeLists.txt
rename to src/base/database/CMakeLists.txt
index 3aad33d..a541729 100644
--- a/src/database/CMakeLists.txt
+++ b/src/base/database/CMakeLists.txt
@@ -9,13 +9,13 @@ list(APPEND HEADERS
     database_interfaces/SqliteInterface.h
 	${SQLite3_SOURCE_FILE})
 
-list(APPEND LIB_INCLUDES 
+list(APPEND SOURCES 
     Database.cpp
     DatabaseManager.cpp
     database_interfaces/SqliteInterface.cpp
 	${SQLite3_SOURCE_FILE})
 
-add_library(${MODULE_NAME} SHARED ${LIB_INCLUDES} ${HEADERS})
+add_library(${MODULE_NAME} SHARED ${SOURCES} ${HEADERS})
 
 target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}
@@ -24,5 +24,5 @@ target_include_directories(${MODULE_NAME} PUBLIC
                           )
                           
 target_link_libraries(${MODULE_NAME} core)
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
diff --git a/src/database/Database.cpp b/src/base/database/Database.cpp
similarity index 100%
rename from src/database/Database.cpp
rename to src/base/database/Database.cpp
diff --git a/src/database/Database.h b/src/base/database/Database.h
similarity index 100%
rename from src/database/Database.h
rename to src/base/database/Database.h
diff --git a/src/database/DatabaseManager.cpp b/src/base/database/DatabaseManager.cpp
similarity index 100%
rename from src/database/DatabaseManager.cpp
rename to src/base/database/DatabaseManager.cpp
diff --git a/src/database/DatabaseManager.h b/src/base/database/DatabaseManager.h
similarity index 100%
rename from src/database/DatabaseManager.h
rename to src/base/database/DatabaseManager.h
diff --git a/src/database/database_interfaces/SqliteInterface.cpp b/src/base/database/database_interfaces/SqliteInterface.cpp
similarity index 100%
rename from src/database/database_interfaces/SqliteInterface.cpp
rename to src/base/database/database_interfaces/SqliteInterface.cpp
diff --git a/src/database/database_interfaces/SqliteInterface.h b/src/base/database/database_interfaces/SqliteInterface.h
similarity index 100%
rename from src/database/database_interfaces/SqliteInterface.h
rename to src/base/database/database_interfaces/SqliteInterface.h
diff --git a/src/geometry/AbstractGeometricItem.h b/src/base/geometry/AbstractGeometricItem.h
similarity index 100%
rename from src/geometry/AbstractGeometricItem.h
rename to src/base/geometry/AbstractGeometricItem.h
diff --git a/src/geometry/Bounds.h b/src/base/geometry/Bounds.h
similarity index 100%
rename from src/geometry/Bounds.h
rename to src/base/geometry/Bounds.h
diff --git a/src/geometry/CMakeLists.txt b/src/base/geometry/CMakeLists.txt
similarity index 90%
rename from src/geometry/CMakeLists.txt
rename to src/base/geometry/CMakeLists.txt
index a0c05d5..2402c98 100644
--- a/src/geometry/CMakeLists.txt
+++ b/src/base/geometry/CMakeLists.txt
@@ -24,7 +24,7 @@ list(APPEND HEADERS
         primitives/Triangle.h
 )
 
-list(APPEND LIB_INCLUDES 
+list(APPEND SOURCES 
         Transform.cpp
 		grid/AbstractGrid.cpp
 		math/Linalg.cpp
@@ -44,7 +44,7 @@ list(APPEND LIB_INCLUDES
         primitives/Triangle.cpp		
 	)
         
-add_library(${MODULE_NAME} SHARED ${LIB_INCLUDES} ${HEADERS})
+add_library(${MODULE_NAME} SHARED ${SOURCES} ${HEADERS})
 
 target_include_directories(${MODULE_NAME} PUBLIC 
 	${CMAKE_CURRENT_SOURCE_DIR}
@@ -57,4 +57,4 @@ target_include_directories(${MODULE_NAME} PUBLIC
 
 target_link_libraries( ${MODULE_NAME} PUBLIC core)
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )                          
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)
diff --git a/src/geometry/Transform.cpp b/src/base/geometry/Transform.cpp
similarity index 100%
rename from src/geometry/Transform.cpp
rename to src/base/geometry/Transform.cpp
diff --git a/src/geometry/Transform.h b/src/base/geometry/Transform.h
similarity index 100%
rename from src/geometry/Transform.h
rename to src/base/geometry/Transform.h
diff --git a/src/geometry/grid/AbstractGrid.cpp b/src/base/geometry/grid/AbstractGrid.cpp
similarity index 100%
rename from src/geometry/grid/AbstractGrid.cpp
rename to src/base/geometry/grid/AbstractGrid.cpp
diff --git a/src/geometry/grid/AbstractGrid.h b/src/base/geometry/grid/AbstractGrid.h
similarity index 100%
rename from src/geometry/grid/AbstractGrid.h
rename to src/base/geometry/grid/AbstractGrid.h
diff --git a/src/geometry/grid/Grid.h b/src/base/geometry/grid/Grid.h
similarity index 100%
rename from src/geometry/grid/Grid.h
rename to src/base/geometry/grid/Grid.h
diff --git a/src/geometry/grid/SparseGrid.h b/src/base/geometry/grid/SparseGrid.h
similarity index 100%
rename from src/geometry/grid/SparseGrid.h
rename to src/base/geometry/grid/SparseGrid.h
diff --git a/src/geometry/grid/TypedGrid.h b/src/base/geometry/grid/TypedGrid.h
similarity index 100%
rename from src/geometry/grid/TypedGrid.h
rename to src/base/geometry/grid/TypedGrid.h
diff --git a/src/geometry/math/Linalg.cpp b/src/base/geometry/math/Linalg.cpp
similarity index 100%
rename from src/geometry/math/Linalg.cpp
rename to src/base/geometry/math/Linalg.cpp
diff --git a/src/geometry/math/Linalg.h b/src/base/geometry/math/Linalg.h
similarity index 100%
rename from src/geometry/math/Linalg.h
rename to src/base/geometry/math/Linalg.h
diff --git a/src/geometry/math/Matrix.cpp b/src/base/geometry/math/Matrix.cpp
similarity index 100%
rename from src/geometry/math/Matrix.cpp
rename to src/base/geometry/math/Matrix.cpp
diff --git a/src/geometry/math/Matrix.h b/src/base/geometry/math/Matrix.h
similarity index 100%
rename from src/geometry/math/Matrix.h
rename to src/base/geometry/math/Matrix.h
diff --git a/src/geometry/math/Vector.cpp b/src/base/geometry/math/Vector.cpp
similarity index 100%
rename from src/geometry/math/Vector.cpp
rename to src/base/geometry/math/Vector.cpp
diff --git a/src/geometry/math/Vector.h b/src/base/geometry/math/Vector.h
similarity index 100%
rename from src/geometry/math/Vector.h
rename to src/base/geometry/math/Vector.h
diff --git a/src/geometry/path/Curve.cpp b/src/base/geometry/path/Curve.cpp
similarity index 100%
rename from src/geometry/path/Curve.cpp
rename to src/base/geometry/path/Curve.cpp
diff --git a/src/geometry/path/Curve.h b/src/base/geometry/path/Curve.h
similarity index 100%
rename from src/geometry/path/Curve.h
rename to src/base/geometry/path/Curve.h
diff --git a/src/geometry/path/Line.cpp b/src/base/geometry/path/Line.cpp
similarity index 100%
rename from src/geometry/path/Line.cpp
rename to src/base/geometry/path/Line.cpp
diff --git a/src/geometry/path/Line.h b/src/base/geometry/path/Line.h
similarity index 100%
rename from src/geometry/path/Line.h
rename to src/base/geometry/path/Line.h
diff --git a/src/geometry/path/LineSegment.cpp b/src/base/geometry/path/LineSegment.cpp
similarity index 100%
rename from src/geometry/path/LineSegment.cpp
rename to src/base/geometry/path/LineSegment.cpp
diff --git a/src/geometry/path/LineSegment.h b/src/base/geometry/path/LineSegment.h
similarity index 100%
rename from src/geometry/path/LineSegment.h
rename to src/base/geometry/path/LineSegment.h
diff --git a/src/geometry/path/Path.cpp b/src/base/geometry/path/Path.cpp
similarity index 100%
rename from src/geometry/path/Path.cpp
rename to src/base/geometry/path/Path.cpp
diff --git a/src/geometry/path/Path.h b/src/base/geometry/path/Path.h
similarity index 100%
rename from src/geometry/path/Path.h
rename to src/base/geometry/path/Path.h
diff --git a/src/geometry/path/PathElement.cpp b/src/base/geometry/path/PathElement.cpp
similarity index 100%
rename from src/geometry/path/PathElement.cpp
rename to src/base/geometry/path/PathElement.cpp
diff --git a/src/geometry/path/PathElement.h b/src/base/geometry/path/PathElement.h
similarity index 100%
rename from src/geometry/path/PathElement.h
rename to src/base/geometry/path/PathElement.h
diff --git a/src/geometry/points/DiscretePoint.cpp b/src/base/geometry/points/DiscretePoint.cpp
similarity index 100%
rename from src/geometry/points/DiscretePoint.cpp
rename to src/base/geometry/points/DiscretePoint.cpp
diff --git a/src/geometry/points/DiscretePoint.h b/src/base/geometry/points/DiscretePoint.h
similarity index 100%
rename from src/geometry/points/DiscretePoint.h
rename to src/base/geometry/points/DiscretePoint.h
diff --git a/src/geometry/points/Point.cpp b/src/base/geometry/points/Point.cpp
similarity index 100%
rename from src/geometry/points/Point.cpp
rename to src/base/geometry/points/Point.cpp
diff --git a/src/geometry/points/Point.h b/src/base/geometry/points/Point.h
similarity index 100%
rename from src/geometry/points/Point.h
rename to src/base/geometry/points/Point.h
diff --git a/src/geometry/points/PointCollection.cpp b/src/base/geometry/points/PointCollection.cpp
similarity index 100%
rename from src/geometry/points/PointCollection.cpp
rename to src/base/geometry/points/PointCollection.cpp
diff --git a/src/geometry/points/PointCollection.h b/src/base/geometry/points/PointCollection.h
similarity index 100%
rename from src/geometry/points/PointCollection.h
rename to src/base/geometry/points/PointCollection.h
diff --git a/src/geometry/primitives/Circle.cpp b/src/base/geometry/primitives/Circle.cpp
similarity index 100%
rename from src/geometry/primitives/Circle.cpp
rename to src/base/geometry/primitives/Circle.cpp
diff --git a/src/geometry/primitives/Circle.h b/src/base/geometry/primitives/Circle.h
similarity index 100%
rename from src/geometry/primitives/Circle.h
rename to src/base/geometry/primitives/Circle.h
diff --git a/src/geometry/primitives/Quad.cpp b/src/base/geometry/primitives/Quad.cpp
similarity index 100%
rename from src/geometry/primitives/Quad.cpp
rename to src/base/geometry/primitives/Quad.cpp
diff --git a/src/geometry/primitives/Quad.h b/src/base/geometry/primitives/Quad.h
similarity index 100%
rename from src/geometry/primitives/Quad.h
rename to src/base/geometry/primitives/Quad.h
diff --git a/src/geometry/primitives/Rectangle.cpp b/src/base/geometry/primitives/Rectangle.cpp
similarity index 100%
rename from src/geometry/primitives/Rectangle.cpp
rename to src/base/geometry/primitives/Rectangle.cpp
diff --git a/src/geometry/primitives/Rectangle.h b/src/base/geometry/primitives/Rectangle.h
similarity index 100%
rename from src/geometry/primitives/Rectangle.h
rename to src/base/geometry/primitives/Rectangle.h
diff --git a/src/geometry/primitives/Triangle.cpp b/src/base/geometry/primitives/Triangle.cpp
similarity index 100%
rename from src/geometry/primitives/Triangle.cpp
rename to src/base/geometry/primitives/Triangle.cpp
diff --git a/src/geometry/primitives/Triangle.h b/src/base/geometry/primitives/Triangle.h
similarity index 100%
rename from src/geometry/primitives/Triangle.h
rename to src/base/geometry/primitives/Triangle.h
diff --git a/src/network/CMakeLists.txt b/src/base/network/CMakeLists.txt
similarity index 70%
rename from src/network/CMakeLists.txt
rename to src/base/network/CMakeLists.txt
index 60bdfe6..6450b3c 100644
--- a/src/network/CMakeLists.txt
+++ b/src/base/network/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(MODULE_NAME network)
+
 set(platform_INCLUDES)
 set(platform_LIBS)
 
@@ -20,7 +22,7 @@ list(APPEND platform_INCLUDES
     list(APPEND platform_LIBS Httpapi.lib)
 endif()
 
-list(APPEND network_HEADERS 
+list(APPEND HEADERS 
     NetworkManager.h
     sockets/Socket.h
     sockets/SocketInterface.h
@@ -28,21 +30,21 @@ list(APPEND network_HEADERS
     web/HttpMessageHandler.h
     )
 
-list(APPEND network_LIB_INCLUDES 
+list(APPEND SOURCES 
     NetworkManager.cpp
     sockets/Socket.cpp
     web/HttpMessageHandler.cpp
     )
 
-add_library(network SHARED ${network_LIB_INCLUDES} ${platform_INCLUDES} ${network_HEADERS})
+add_library(${MODULE_NAME} SHARED ${SOURCES} ${platform_INCLUDES} ${HEADERS})
 
-target_include_directories(network PUBLIC
+target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}
                           ${CMAKE_CURRENT_SOURCE_DIR}/sockets
                           ${CMAKE_CURRENT_SOURCE_DIR}/web
 						  ${CMAKE_CURRENT_SOURCE_DIR}/server/win32
                           )
-set_target_properties( network PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )                          
-target_link_libraries( network PUBLIC core ${platform_LIBS})
+set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )                          
+target_link_libraries( ${MODULE_NAME} PUBLIC core ${platform_LIBS})
 
-set_property(TARGET network PROPERTY FOLDER src)
\ No newline at end of file
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)
\ No newline at end of file
diff --git a/src/network/NetworkManager.cpp b/src/base/network/NetworkManager.cpp
similarity index 100%
rename from src/network/NetworkManager.cpp
rename to src/base/network/NetworkManager.cpp
diff --git a/src/network/NetworkManager.h b/src/base/network/NetworkManager.h
similarity index 100%
rename from src/network/NetworkManager.h
rename to src/base/network/NetworkManager.h
diff --git a/src/network/server/win32/Win32Buffer.cpp b/src/base/network/server/win32/Win32Buffer.cpp
similarity index 100%
rename from src/network/server/win32/Win32Buffer.cpp
rename to src/base/network/server/win32/Win32Buffer.cpp
diff --git a/src/network/server/win32/Win32Buffer.h b/src/base/network/server/win32/Win32Buffer.h
similarity index 100%
rename from src/network/server/win32/Win32Buffer.h
rename to src/base/network/server/win32/Win32Buffer.h
diff --git a/src/network/server/win32/Win32TempFile.cpp b/src/base/network/server/win32/Win32TempFile.cpp
similarity index 100%
rename from src/network/server/win32/Win32TempFile.cpp
rename to src/base/network/server/win32/Win32TempFile.cpp
diff --git a/src/network/server/win32/Win32TempFile.h b/src/base/network/server/win32/Win32TempFile.h
similarity index 100%
rename from src/network/server/win32/Win32TempFile.h
rename to src/base/network/server/win32/Win32TempFile.h
diff --git a/src/network/server/win32/Win32WebRequest.cpp b/src/base/network/server/win32/Win32WebRequest.cpp
similarity index 100%
rename from src/network/server/win32/Win32WebRequest.cpp
rename to src/base/network/server/win32/Win32WebRequest.cpp
diff --git a/src/network/server/win32/Win32WebRequest.h b/src/base/network/server/win32/Win32WebRequest.h
similarity index 100%
rename from src/network/server/win32/Win32WebRequest.h
rename to src/base/network/server/win32/Win32WebRequest.h
diff --git a/src/network/server/win32/Win32WebResponse.cpp b/src/base/network/server/win32/Win32WebResponse.cpp
similarity index 100%
rename from src/network/server/win32/Win32WebResponse.cpp
rename to src/base/network/server/win32/Win32WebResponse.cpp
diff --git a/src/network/server/win32/Win32WebResponse.h b/src/base/network/server/win32/Win32WebResponse.h
similarity index 100%
rename from src/network/server/win32/Win32WebResponse.h
rename to src/base/network/server/win32/Win32WebResponse.h
diff --git a/src/network/server/win32/Win32WebServer.cpp b/src/base/network/server/win32/Win32WebServer.cpp
similarity index 100%
rename from src/network/server/win32/Win32WebServer.cpp
rename to src/base/network/server/win32/Win32WebServer.cpp
diff --git a/src/network/server/win32/Win32WebServer.h b/src/base/network/server/win32/Win32WebServer.h
similarity index 100%
rename from src/network/server/win32/Win32WebServer.h
rename to src/base/network/server/win32/Win32WebServer.h
diff --git a/src/network/sockets/ISocketMessageHandler.h b/src/base/network/sockets/ISocketMessageHandler.h
similarity index 100%
rename from src/network/sockets/ISocketMessageHandler.h
rename to src/base/network/sockets/ISocketMessageHandler.h
diff --git a/src/network/sockets/Socket.cpp b/src/base/network/sockets/Socket.cpp
similarity index 100%
rename from src/network/sockets/Socket.cpp
rename to src/base/network/sockets/Socket.cpp
diff --git a/src/network/sockets/Socket.h b/src/base/network/sockets/Socket.h
similarity index 100%
rename from src/network/sockets/Socket.h
rename to src/base/network/sockets/Socket.h
diff --git a/src/network/sockets/SocketInterface.h b/src/base/network/sockets/SocketInterface.h
similarity index 100%
rename from src/network/sockets/SocketInterface.h
rename to src/base/network/sockets/SocketInterface.h
diff --git a/src/network/sockets/UnixSocketInterface.cpp b/src/base/network/sockets/UnixSocketInterface.cpp
similarity index 100%
rename from src/network/sockets/UnixSocketInterface.cpp
rename to src/base/network/sockets/UnixSocketInterface.cpp
diff --git a/src/network/sockets/UnixSocketInterface.h b/src/base/network/sockets/UnixSocketInterface.h
similarity index 100%
rename from src/network/sockets/UnixSocketInterface.h
rename to src/base/network/sockets/UnixSocketInterface.h
diff --git a/src/network/web/HttpMessageHandler.cpp b/src/base/network/web/HttpMessageHandler.cpp
similarity index 100%
rename from src/network/web/HttpMessageHandler.cpp
rename to src/base/network/web/HttpMessageHandler.cpp
diff --git a/src/network/web/HttpMessageHandler.h b/src/base/network/web/HttpMessageHandler.h
similarity index 100%
rename from src/network/web/HttpMessageHandler.h
rename to src/base/network/web/HttpMessageHandler.h
diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt
index e7556b0..a127f1a 100644
--- a/src/console/CMakeLists.txt
+++ b/src/console/CMakeLists.txt
@@ -1,16 +1,20 @@
-list(APPEND console_HEADERS 
+set(MODULE_NAME console)
+
+list(APPEND HEADERS 
 	MainApplication.h
 	BasicWebApp.h)
 
-list(APPEND console_LIB_INCLUDES
+list(APPEND SOURCES
 	BasicWebApp.cpp
 	MainApplication.cpp)
 
-add_library(console SHARED ${console_LIB_INCLUDES} ${console_HEADERS})
+add_library(${MODULE_NAME} SHARED ${SOURCES} ${HEADERS})
 
-target_include_directories(console PUBLIC
-                          "${CMAKE_CURRENT_SOURCE_DIR}"
+target_include_directories(${MODULE_NAME} PUBLIC
+                          ${CMAKE_CURRENT_SOURCE_DIR}
                           )
-set_property(TARGET console PROPERTY FOLDER src)
-target_link_libraries(console PUBLIC core audio network database web graphics publishing)
-set_target_properties( console PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
\ No newline at end of file
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+target_link_libraries(${MODULE_NAME} PUBLIC core audio network database web graphics publishing)
+set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
\ No newline at end of file
diff --git a/src/console/MainApplication.cpp b/src/console/MainApplication.cpp
index e3cfb40..ca3f465 100644
--- a/src/console/MainApplication.cpp
+++ b/src/console/MainApplication.cpp
@@ -1,6 +1,5 @@
 #include "MainApplication.h"
 #include "FileLogger.h"
-#include "MidiReader.h"
 #include "File.h"
 #include "DocumentConverter.h"
 #include "DrawingSurface.h"
diff --git a/src/media/CMakeLists.txt b/src/media/CMakeLists.txt
new file mode 100644
index 0000000..5a5b96e
--- /dev/null
+++ b/src/media/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(audio)
+add_subdirectory(image)
+add_subdirectory(video)
diff --git a/src/audio/AudioDevice.cpp b/src/media/audio/AudioDevice.cpp
similarity index 100%
rename from src/audio/AudioDevice.cpp
rename to src/media/audio/AudioDevice.cpp
diff --git a/src/audio/AudioDevice.h b/src/media/audio/AudioDevice.h
similarity index 100%
rename from src/audio/AudioDevice.h
rename to src/media/audio/AudioDevice.h
diff --git a/src/audio/AudioManager.cpp b/src/media/audio/AudioManager.cpp
similarity index 100%
rename from src/audio/AudioManager.cpp
rename to src/media/audio/AudioManager.cpp
diff --git a/src/audio/AudioManager.h b/src/media/audio/AudioManager.h
similarity index 100%
rename from src/audio/AudioManager.h
rename to src/media/audio/AudioManager.h
diff --git a/src/audio/AudioSample.cpp b/src/media/audio/AudioSample.cpp
similarity index 100%
rename from src/audio/AudioSample.cpp
rename to src/media/audio/AudioSample.cpp
diff --git a/src/audio/AudioSample.h b/src/media/audio/AudioSample.h
similarity index 100%
rename from src/audio/AudioSample.h
rename to src/media/audio/AudioSample.h
diff --git a/src/audio/AudioSynth.cpp b/src/media/audio/AudioSynth.cpp
similarity index 100%
rename from src/audio/AudioSynth.cpp
rename to src/media/audio/AudioSynth.cpp
diff --git a/src/audio/AudioSynth.h b/src/media/audio/AudioSynth.h
similarity index 100%
rename from src/audio/AudioSynth.h
rename to src/media/audio/AudioSynth.h
diff --git a/src/audio/AudioTrack.cpp b/src/media/audio/AudioTrack.cpp
similarity index 100%
rename from src/audio/AudioTrack.cpp
rename to src/media/audio/AudioTrack.cpp
diff --git a/src/audio/AudioTrack.h b/src/media/audio/AudioTrack.h
similarity index 100%
rename from src/audio/AudioTrack.h
rename to src/media/audio/AudioTrack.h
diff --git a/src/audio/AudioWriter.cpp b/src/media/audio/AudioWriter.cpp
similarity index 100%
rename from src/audio/AudioWriter.cpp
rename to src/media/audio/AudioWriter.cpp
diff --git a/src/audio/AudioWriter.h b/src/media/audio/AudioWriter.h
similarity index 100%
rename from src/audio/AudioWriter.h
rename to src/media/audio/AudioWriter.h
diff --git a/src/audio/CMakeLists.txt b/src/media/audio/CMakeLists.txt
similarity index 62%
rename from src/audio/CMakeLists.txt
rename to src/media/audio/CMakeLists.txt
index 90c2362..b7520aa 100644
--- a/src/audio/CMakeLists.txt
+++ b/src/media/audio/CMakeLists.txt
@@ -32,7 +32,7 @@ else()
     )
 endif (UNIX)
 
-list(APPEND TARGET_HEADERS 
+list(APPEND HEADERS 
     AudioDevice.h
     AudioManager.h
     AudioTrack.h
@@ -40,42 +40,25 @@ list(APPEND TARGET_HEADERS
     AudioSynth.h
     AudioWriter.h
     audio_interfaces/IAudioInterface.h
-    midi/reader/MidiReader.h
-    midi/MidiTrack.h
-    midi/MidiDocument.h
-    midi/MidiElements.h
-    midi/MidiEvent.h
-    midi/MetaMidiEvent.h
-    midi/MidiChannelEvent.h
     ${PLATFORM_HEADERS})
 
-list(APPEND TARGET_SOURCES 
+list(APPEND SOURCES 
     AudioDevice.cpp
     AudioManager.cpp
     AudioSample.cpp
     AudioSynth.cpp
     AudioTrack.cpp
     AudioWriter.cpp
-    midi/reader/MidiReader.cpp
-    midi/reader/MidiTimeAdapter.cpp
-    midi/reader/MidiMetaEventAdapter.cpp
-    midi/reader/MidiChannelEventAdapter.cpp
-    midi/MidiTrack.cpp
-    midi/MidiDocument.cpp
-    midi/MidiEvent.cpp
-    midi/MetaMidiEvent.cpp
-    midi/MidiChannelEvent.cpp
     ${PLATFORM_SOURCES})
 
-add_library(${MODULE_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES})
+add_library(${MODULE_NAME} SHARED ${HEADERS} ${SOURCES})
 target_include_directories(${MODULE_NAME} PUBLIC
-                          "${CMAKE_CURRENT_SOURCE_DIR}"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/audio_interfaces"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/midi"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/midi/reader"
+                          ${CMAKE_CURRENT_SOURCE_DIR}
+                          ${CMAKE_CURRENT_SOURCE_DIR}/audio_interfaces
                           )
                           
 target_compile_definitions(${MODULE_NAME} PRIVATE ${DEFINES})
 target_link_libraries(${MODULE_NAME} PUBLIC core ${PLATFORM_LIBS})
 set_target_properties(${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
\ No newline at end of file
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/media)
\ No newline at end of file
diff --git a/src/audio/audio_interfaces/AlsaInterface.cpp b/src/media/audio/audio_interfaces/AlsaInterface.cpp
similarity index 100%
rename from src/audio/audio_interfaces/AlsaInterface.cpp
rename to src/media/audio/audio_interfaces/AlsaInterface.cpp
diff --git a/src/audio/audio_interfaces/AlsaInterface.h b/src/media/audio/audio_interfaces/AlsaInterface.h
similarity index 100%
rename from src/audio/audio_interfaces/AlsaInterface.h
rename to src/media/audio/audio_interfaces/AlsaInterface.h
diff --git a/src/audio/audio_interfaces/IAudioInterface.h b/src/media/audio/audio_interfaces/IAudioInterface.h
similarity index 100%
rename from src/audio/audio_interfaces/IAudioInterface.h
rename to src/media/audio/audio_interfaces/IAudioInterface.h
diff --git a/src/audio/audio_interfaces/NullAudioInterface.cpp b/src/media/audio/audio_interfaces/NullAudioInterface.cpp
similarity index 100%
rename from src/audio/audio_interfaces/NullAudioInterface.cpp
rename to src/media/audio/audio_interfaces/NullAudioInterface.cpp
diff --git a/src/audio/audio_interfaces/NullAudioInterface.h b/src/media/audio/audio_interfaces/NullAudioInterface.h
similarity index 100%
rename from src/audio/audio_interfaces/NullAudioInterface.h
rename to src/media/audio/audio_interfaces/NullAudioInterface.h
diff --git a/src/audio/audio_interfaces/WasapiInterface.cpp b/src/media/audio/audio_interfaces/WasapiInterface.cpp
similarity index 100%
rename from src/audio/audio_interfaces/WasapiInterface.cpp
rename to src/media/audio/audio_interfaces/WasapiInterface.cpp
diff --git a/src/audio/audio_interfaces/WasapiInterface.h b/src/media/audio/audio_interfaces/WasapiInterface.h
similarity index 100%
rename from src/audio/audio_interfaces/WasapiInterface.h
rename to src/media/audio/audio_interfaces/WasapiInterface.h
diff --git a/src/image/CMakeLists.txt b/src/media/image/CMakeLists.txt
similarity index 94%
rename from src/image/CMakeLists.txt
rename to src/media/image/CMakeLists.txt
index f6fabc1..ec4f824 100644
--- a/src/image/CMakeLists.txt
+++ b/src/media/image/CMakeLists.txt
@@ -50,4 +50,4 @@ set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
 
 target_link_libraries( ${MODULE_NAME} PUBLIC ${image_LIBS})
 
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/media)
diff --git a/src/image/IImageWriter.h b/src/media/image/IImageWriter.h
similarity index 100%
rename from src/image/IImageWriter.h
rename to src/media/image/IImageWriter.h
diff --git a/src/image/Image.cpp b/src/media/image/Image.cpp
similarity index 100%
rename from src/image/Image.cpp
rename to src/media/image/Image.cpp
diff --git a/src/image/Image.h b/src/media/image/Image.h
similarity index 100%
rename from src/image/Image.h
rename to src/media/image/Image.h
diff --git a/src/image/ImageBitStream.cpp b/src/media/image/ImageBitStream.cpp
similarity index 100%
rename from src/image/ImageBitStream.cpp
rename to src/media/image/ImageBitStream.cpp
diff --git a/src/image/ImageBitStream.h b/src/media/image/ImageBitStream.h
similarity index 100%
rename from src/image/ImageBitStream.h
rename to src/media/image/ImageBitStream.h
diff --git a/src/image/ImagePrimitives.h b/src/media/image/ImagePrimitives.h
similarity index 100%
rename from src/image/ImagePrimitives.h
rename to src/media/image/ImagePrimitives.h
diff --git a/src/image/PlatformImage.cpp b/src/media/image/PlatformImage.cpp
similarity index 100%
rename from src/image/PlatformImage.cpp
rename to src/media/image/PlatformImage.cpp
diff --git a/src/image/PlatformImage.h b/src/media/image/PlatformImage.h
similarity index 100%
rename from src/image/PlatformImage.h
rename to src/media/image/PlatformImage.h
diff --git a/src/image/PlatformImageWriter.h b/src/media/image/PlatformImageWriter.h
similarity index 100%
rename from src/image/PlatformImageWriter.h
rename to src/media/image/PlatformImageWriter.h
diff --git a/src/image/png/BasicPngWriter.cpp b/src/media/image/png/BasicPngWriter.cpp
similarity index 100%
rename from src/image/png/BasicPngWriter.cpp
rename to src/media/image/png/BasicPngWriter.cpp
diff --git a/src/image/png/BasicPngWriter.h b/src/media/image/png/BasicPngWriter.h
similarity index 100%
rename from src/image/png/BasicPngWriter.h
rename to src/media/image/png/BasicPngWriter.h
diff --git a/src/image/png/PngFilter.h b/src/media/image/png/PngFilter.h
similarity index 100%
rename from src/image/png/PngFilter.h
rename to src/media/image/png/PngFilter.h
diff --git a/src/image/png/PngHeader.cpp b/src/media/image/png/PngHeader.cpp
similarity index 100%
rename from src/image/png/PngHeader.cpp
rename to src/media/image/png/PngHeader.cpp
diff --git a/src/image/png/PngHeader.h b/src/media/image/png/PngHeader.h
similarity index 100%
rename from src/image/png/PngHeader.h
rename to src/media/image/png/PngHeader.h
diff --git a/src/image/png/PngInfo.cpp b/src/media/image/png/PngInfo.cpp
similarity index 100%
rename from src/image/png/PngInfo.cpp
rename to src/media/image/png/PngInfo.cpp
diff --git a/src/image/png/PngInfo.h b/src/media/image/png/PngInfo.h
similarity index 100%
rename from src/image/png/PngInfo.h
rename to src/media/image/png/PngInfo.h
diff --git a/src/image/png/PngReader.cpp b/src/media/image/png/PngReader.cpp
similarity index 100%
rename from src/image/png/PngReader.cpp
rename to src/media/image/png/PngReader.cpp
diff --git a/src/image/png/PngReader.h b/src/media/image/png/PngReader.h
similarity index 100%
rename from src/image/png/PngReader.h
rename to src/media/image/png/PngReader.h
diff --git a/src/image/png/PngWriter.cpp b/src/media/image/png/PngWriter.cpp
similarity index 100%
rename from src/image/png/PngWriter.cpp
rename to src/media/image/png/PngWriter.cpp
diff --git a/src/image/png/PngWriter.h b/src/media/image/png/PngWriter.h
similarity index 100%
rename from src/image/png/PngWriter.h
rename to src/media/image/png/PngWriter.h
diff --git a/src/image/win32/Win32WicImage.cpp b/src/media/image/win32/Win32WicImage.cpp
similarity index 100%
rename from src/image/win32/Win32WicImage.cpp
rename to src/media/image/win32/Win32WicImage.cpp
diff --git a/src/image/win32/Win32WicImage.h b/src/media/image/win32/Win32WicImage.h
similarity index 100%
rename from src/image/win32/Win32WicImage.h
rename to src/media/image/win32/Win32WicImage.h
diff --git a/src/image/win32/Win32WicImageWriter.cpp b/src/media/image/win32/Win32WicImageWriter.cpp
similarity index 100%
rename from src/image/win32/Win32WicImageWriter.cpp
rename to src/media/image/win32/Win32WicImageWriter.cpp
diff --git a/src/image/win32/Win32WicImageWriter.h b/src/media/image/win32/Win32WicImageWriter.h
similarity index 100%
rename from src/image/win32/Win32WicImageWriter.h
rename to src/media/image/win32/Win32WicImageWriter.h
diff --git a/src/image/win32/Win32WicInterface.cpp b/src/media/image/win32/Win32WicInterface.cpp
similarity index 100%
rename from src/image/win32/Win32WicInterface.cpp
rename to src/media/image/win32/Win32WicInterface.cpp
diff --git a/src/image/win32/Win32WicInterface.h b/src/media/image/win32/Win32WicInterface.h
similarity index 100%
rename from src/image/win32/Win32WicInterface.h
rename to src/media/image/win32/Win32WicInterface.h
diff --git a/src/video/BasicVideoConverter.cpp b/src/media/video/BasicVideoConverter.cpp
similarity index 100%
rename from src/video/BasicVideoConverter.cpp
rename to src/media/video/BasicVideoConverter.cpp
diff --git a/src/video/BasicVideoConverter.h b/src/media/video/BasicVideoConverter.h
similarity index 100%
rename from src/video/BasicVideoConverter.h
rename to src/media/video/BasicVideoConverter.h
diff --git a/src/video/CMakeLists.txt b/src/media/video/CMakeLists.txt
similarity index 96%
rename from src/video/CMakeLists.txt
rename to src/media/video/CMakeLists.txt
index 4d7769f..6311377 100644
--- a/src/video/CMakeLists.txt
+++ b/src/media/video/CMakeLists.txt
@@ -53,4 +53,4 @@ list(APPEND video_LIBS image)
 
 target_link_libraries( video PUBLIC ${video_LIBS})
 
-set_property(TARGET video PROPERTY FOLDER src)
+set_property(TARGET video PROPERTY FOLDER src/media)
diff --git a/src/video/FfmegInterface.cpp b/src/media/video/FfmegInterface.cpp
similarity index 100%
rename from src/video/FfmegInterface.cpp
rename to src/media/video/FfmegInterface.cpp
diff --git a/src/video/FfmpegInterface.h b/src/media/video/FfmpegInterface.h
similarity index 100%
rename from src/video/FfmpegInterface.h
rename to src/media/video/FfmpegInterface.h
diff --git a/src/video/IVideoConverter.h b/src/media/video/IVideoConverter.h
similarity index 100%
rename from src/video/IVideoConverter.h
rename to src/media/video/IVideoConverter.h
diff --git a/src/video/Video.cpp b/src/media/video/Video.cpp
similarity index 100%
rename from src/video/Video.cpp
rename to src/media/video/Video.cpp
diff --git a/src/video/Video.h b/src/media/video/Video.h
similarity index 100%
rename from src/video/Video.h
rename to src/media/video/Video.h
diff --git a/src/rendering/CMakeLists.txt b/src/rendering/CMakeLists.txt
new file mode 100644
index 0000000..046142d
--- /dev/null
+++ b/src/rendering/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(fonts)
+add_subdirectory(graphics)
+add_subdirectory(mesh)
+add_subdirectory(visual_elements)
diff --git a/src/fonts/BasicFontEngine.cpp b/src/rendering/fonts/BasicFontEngine.cpp
similarity index 100%
rename from src/fonts/BasicFontEngine.cpp
rename to src/rendering/fonts/BasicFontEngine.cpp
diff --git a/src/fonts/BasicFontEngine.h b/src/rendering/fonts/BasicFontEngine.h
similarity index 100%
rename from src/fonts/BasicFontEngine.h
rename to src/rendering/fonts/BasicFontEngine.h
diff --git a/src/fonts/CMakeLists.txt b/src/rendering/fonts/CMakeLists.txt
similarity index 94%
rename from src/fonts/CMakeLists.txt
rename to src/rendering/fonts/CMakeLists.txt
index ea5cba2..42e84de 100644
--- a/src/fonts/CMakeLists.txt
+++ b/src/rendering/fonts/CMakeLists.txt
@@ -56,5 +56,5 @@ target_include_directories(${MODULE_NAME} PUBLIC
 target_link_libraries(${MODULE_NAME} PUBLIC core geometry image ${LIB_DEPENDS})
 
 target_compile_definitions(${MODULE_NAME} PRIVATE ${DEFINES})
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/rendering)
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
\ No newline at end of file
diff --git a/src/fonts/FontGlyph.cpp b/src/rendering/fonts/FontGlyph.cpp
similarity index 100%
rename from src/fonts/FontGlyph.cpp
rename to src/rendering/fonts/FontGlyph.cpp
diff --git a/src/fonts/FontGlyph.h b/src/rendering/fonts/FontGlyph.h
similarity index 100%
rename from src/fonts/FontGlyph.h
rename to src/rendering/fonts/FontGlyph.h
diff --git a/src/fonts/FontItem.cpp b/src/rendering/fonts/FontItem.cpp
similarity index 100%
rename from src/fonts/FontItem.cpp
rename to src/rendering/fonts/FontItem.cpp
diff --git a/src/fonts/FontItem.h b/src/rendering/fonts/FontItem.h
similarity index 100%
rename from src/fonts/FontItem.h
rename to src/rendering/fonts/FontItem.h
diff --git a/src/fonts/FontReader.cpp b/src/rendering/fonts/FontReader.cpp
similarity index 100%
rename from src/fonts/FontReader.cpp
rename to src/rendering/fonts/FontReader.cpp
diff --git a/src/fonts/FontReader.h b/src/rendering/fonts/FontReader.h
similarity index 100%
rename from src/fonts/FontReader.h
rename to src/rendering/fonts/FontReader.h
diff --git a/src/fonts/FontsManager.cpp b/src/rendering/fonts/FontsManager.cpp
similarity index 100%
rename from src/fonts/FontsManager.cpp
rename to src/rendering/fonts/FontsManager.cpp
diff --git a/src/fonts/FontsManager.h b/src/rendering/fonts/FontsManager.h
similarity index 100%
rename from src/fonts/FontsManager.h
rename to src/rendering/fonts/FontsManager.h
diff --git a/src/fonts/FreeTypeFontEngine.cpp b/src/rendering/fonts/FreeTypeFontEngine.cpp
similarity index 100%
rename from src/fonts/FreeTypeFontEngine.cpp
rename to src/rendering/fonts/FreeTypeFontEngine.cpp
diff --git a/src/fonts/FreeTypeFontEngine.h b/src/rendering/fonts/FreeTypeFontEngine.h
similarity index 100%
rename from src/fonts/FreeTypeFontEngine.h
rename to src/rendering/fonts/FreeTypeFontEngine.h
diff --git a/src/fonts/IFont.h b/src/rendering/fonts/IFont.h
similarity index 100%
rename from src/fonts/IFont.h
rename to src/rendering/fonts/IFont.h
diff --git a/src/fonts/IFontEngine.h b/src/rendering/fonts/IFontEngine.h
similarity index 100%
rename from src/fonts/IFontEngine.h
rename to src/rendering/fonts/IFontEngine.h
diff --git a/src/fonts/TrueTypeFont.cpp b/src/rendering/fonts/TrueTypeFont.cpp
similarity index 100%
rename from src/fonts/TrueTypeFont.cpp
rename to src/rendering/fonts/TrueTypeFont.cpp
diff --git a/src/fonts/TrueTypeFont.h b/src/rendering/fonts/TrueTypeFont.h
similarity index 100%
rename from src/fonts/TrueTypeFont.h
rename to src/rendering/fonts/TrueTypeFont.h
diff --git a/src/fonts/directx/DirectWriteFontEngine.cpp b/src/rendering/fonts/directx/DirectWriteFontEngine.cpp
similarity index 100%
rename from src/fonts/directx/DirectWriteFontEngine.cpp
rename to src/rendering/fonts/directx/DirectWriteFontEngine.cpp
diff --git a/src/fonts/directx/DirectWriteFontEngine.h b/src/rendering/fonts/directx/DirectWriteFontEngine.h
similarity index 100%
rename from src/fonts/directx/DirectWriteFontEngine.h
rename to src/rendering/fonts/directx/DirectWriteFontEngine.h
diff --git a/src/fonts/directx/DirectWriteHelpers.cpp b/src/rendering/fonts/directx/DirectWriteHelpers.cpp
similarity index 100%
rename from src/fonts/directx/DirectWriteHelpers.cpp
rename to src/rendering/fonts/directx/DirectWriteHelpers.cpp
diff --git a/src/fonts/directx/DirectWriteHelpers.h b/src/rendering/fonts/directx/DirectWriteHelpers.h
similarity index 100%
rename from src/fonts/directx/DirectWriteHelpers.h
rename to src/rendering/fonts/directx/DirectWriteHelpers.h
diff --git a/src/graphics/AbstractPainter.h b/src/rendering/graphics/AbstractPainter.h
similarity index 100%
rename from src/graphics/AbstractPainter.h
rename to src/rendering/graphics/AbstractPainter.h
diff --git a/src/graphics/CMakeLists.txt b/src/rendering/graphics/CMakeLists.txt
similarity index 96%
rename from src/graphics/CMakeLists.txt
rename to src/rendering/graphics/CMakeLists.txt
index 79a582f..b36a977 100644
--- a/src/graphics/CMakeLists.txt
+++ b/src/rendering/graphics/CMakeLists.txt
@@ -85,5 +85,5 @@ target_include_directories(${MODULE_NAME} PUBLIC
 target_compile_definitions(${MODULE_NAME} PRIVATE ${DEFINES})
 target_link_libraries(${MODULE_NAME} PUBLIC geometry mesh fonts image visual_elements ${platform_LIBS})
 
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/rendering)
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
\ No newline at end of file
diff --git a/src/graphics/DrawingContext.cpp b/src/rendering/graphics/DrawingContext.cpp
similarity index 100%
rename from src/graphics/DrawingContext.cpp
rename to src/rendering/graphics/DrawingContext.cpp
diff --git a/src/graphics/DrawingContext.h b/src/rendering/graphics/DrawingContext.h
similarity index 100%
rename from src/graphics/DrawingContext.h
rename to src/rendering/graphics/DrawingContext.h
diff --git a/src/graphics/DrawingSurface.cpp b/src/rendering/graphics/DrawingSurface.cpp
similarity index 100%
rename from src/graphics/DrawingSurface.cpp
rename to src/rendering/graphics/DrawingSurface.cpp
diff --git a/src/graphics/DrawingSurface.h b/src/rendering/graphics/DrawingSurface.h
similarity index 100%
rename from src/graphics/DrawingSurface.h
rename to src/rendering/graphics/DrawingSurface.h
diff --git a/src/graphics/PainterFactory.cpp b/src/rendering/graphics/PainterFactory.cpp
similarity index 100%
rename from src/graphics/PainterFactory.cpp
rename to src/rendering/graphics/PainterFactory.cpp
diff --git a/src/graphics/PainterFactory.h b/src/rendering/graphics/PainterFactory.h
similarity index 100%
rename from src/graphics/PainterFactory.h
rename to src/rendering/graphics/PainterFactory.h
diff --git a/src/graphics/RasterPainter.cpp b/src/rendering/graphics/RasterPainter.cpp
similarity index 100%
rename from src/graphics/RasterPainter.cpp
rename to src/rendering/graphics/RasterPainter.cpp
diff --git a/src/graphics/RasterPainter.h b/src/rendering/graphics/RasterPainter.h
similarity index 100%
rename from src/graphics/RasterPainter.h
rename to src/rendering/graphics/RasterPainter.h
diff --git a/src/graphics/directx/DirectX2dInterface.cpp b/src/rendering/graphics/directx/DirectX2dInterface.cpp
similarity index 100%
rename from src/graphics/directx/DirectX2dInterface.cpp
rename to src/rendering/graphics/directx/DirectX2dInterface.cpp
diff --git a/src/graphics/directx/DirectX2dInterface.h b/src/rendering/graphics/directx/DirectX2dInterface.h
similarity index 100%
rename from src/graphics/directx/DirectX2dInterface.h
rename to src/rendering/graphics/directx/DirectX2dInterface.h
diff --git a/src/graphics/directx/DirectX2dPainter.cpp b/src/rendering/graphics/directx/DirectX2dPainter.cpp
similarity index 100%
rename from src/graphics/directx/DirectX2dPainter.cpp
rename to src/rendering/graphics/directx/DirectX2dPainter.cpp
diff --git a/src/graphics/directx/DirectX2dPainter.h b/src/rendering/graphics/directx/DirectX2dPainter.h
similarity index 100%
rename from src/graphics/directx/DirectX2dPainter.h
rename to src/rendering/graphics/directx/DirectX2dPainter.h
diff --git a/src/graphics/directx/DirectXInterface.cpp b/src/rendering/graphics/directx/DirectXInterface.cpp
similarity index 100%
rename from src/graphics/directx/DirectXInterface.cpp
rename to src/rendering/graphics/directx/DirectXInterface.cpp
diff --git a/src/graphics/directx/DirectXInterface.h b/src/rendering/graphics/directx/DirectXInterface.h
similarity index 100%
rename from src/graphics/directx/DirectXInterface.h
rename to src/rendering/graphics/directx/DirectXInterface.h
diff --git a/src/graphics/directx/DirectXMesh.cpp b/src/rendering/graphics/directx/DirectXMesh.cpp
similarity index 100%
rename from src/graphics/directx/DirectXMesh.cpp
rename to src/rendering/graphics/directx/DirectXMesh.cpp
diff --git a/src/graphics/directx/DirectXMesh.h b/src/rendering/graphics/directx/DirectXMesh.h
similarity index 100%
rename from src/graphics/directx/DirectXMesh.h
rename to src/rendering/graphics/directx/DirectXMesh.h
diff --git a/src/graphics/directx/DirectXMeshPainter.cpp b/src/rendering/graphics/directx/DirectXMeshPainter.cpp
similarity index 100%
rename from src/graphics/directx/DirectXMeshPainter.cpp
rename to src/rendering/graphics/directx/DirectXMeshPainter.cpp
diff --git a/src/graphics/directx/DirectXMeshPainter.h b/src/rendering/graphics/directx/DirectXMeshPainter.h
similarity index 100%
rename from src/graphics/directx/DirectXMeshPainter.h
rename to src/rendering/graphics/directx/DirectXMeshPainter.h
diff --git a/src/graphics/directx/DirectXPainter.cpp b/src/rendering/graphics/directx/DirectXPainter.cpp
similarity index 100%
rename from src/graphics/directx/DirectXPainter.cpp
rename to src/rendering/graphics/directx/DirectXPainter.cpp
diff --git a/src/graphics/directx/DirectXPainter.h b/src/rendering/graphics/directx/DirectXPainter.h
similarity index 100%
rename from src/graphics/directx/DirectXPainter.h
rename to src/rendering/graphics/directx/DirectXPainter.h
diff --git a/src/graphics/directx/DirectXShaderProgram.cpp b/src/rendering/graphics/directx/DirectXShaderProgram.cpp
similarity index 100%
rename from src/graphics/directx/DirectXShaderProgram.cpp
rename to src/rendering/graphics/directx/DirectXShaderProgram.cpp
diff --git a/src/graphics/directx/DirectXShaderProgram.h b/src/rendering/graphics/directx/DirectXShaderProgram.h
similarity index 100%
rename from src/graphics/directx/DirectXShaderProgram.h
rename to src/rendering/graphics/directx/DirectXShaderProgram.h
diff --git a/src/graphics/directx/DirectXTextPainter.cpp b/src/rendering/graphics/directx/DirectXTextPainter.cpp
similarity index 100%
rename from src/graphics/directx/DirectXTextPainter.cpp
rename to src/rendering/graphics/directx/DirectXTextPainter.cpp
diff --git a/src/graphics/directx/DirectXTextPainter.h b/src/rendering/graphics/directx/DirectXTextPainter.h
similarity index 100%
rename from src/graphics/directx/DirectXTextPainter.h
rename to src/rendering/graphics/directx/DirectXTextPainter.h
diff --git a/src/graphics/directx/shaders.hlsl b/src/rendering/graphics/directx/shaders.hlsl
similarity index 100%
rename from src/graphics/directx/shaders.hlsl
rename to src/rendering/graphics/directx/shaders.hlsl
diff --git a/src/graphics/opengl/OpenGlFontTexture.cpp b/src/rendering/graphics/opengl/OpenGlFontTexture.cpp
similarity index 100%
rename from src/graphics/opengl/OpenGlFontTexture.cpp
rename to src/rendering/graphics/opengl/OpenGlFontTexture.cpp
diff --git a/src/graphics/opengl/OpenGlFontTexture.h b/src/rendering/graphics/opengl/OpenGlFontTexture.h
similarity index 100%
rename from src/graphics/opengl/OpenGlFontTexture.h
rename to src/rendering/graphics/opengl/OpenGlFontTexture.h
diff --git a/src/graphics/opengl/OpenGlMeshPainter.cpp b/src/rendering/graphics/opengl/OpenGlMeshPainter.cpp
similarity index 100%
rename from src/graphics/opengl/OpenGlMeshPainter.cpp
rename to src/rendering/graphics/opengl/OpenGlMeshPainter.cpp
diff --git a/src/graphics/opengl/OpenGlMeshPainter.h b/src/rendering/graphics/opengl/OpenGlMeshPainter.h
similarity index 100%
rename from src/graphics/opengl/OpenGlMeshPainter.h
rename to src/rendering/graphics/opengl/OpenGlMeshPainter.h
diff --git a/src/graphics/opengl/OpenGlPainter.cpp b/src/rendering/graphics/opengl/OpenGlPainter.cpp
similarity index 100%
rename from src/graphics/opengl/OpenGlPainter.cpp
rename to src/rendering/graphics/opengl/OpenGlPainter.cpp
diff --git a/src/graphics/opengl/OpenGlPainter.h b/src/rendering/graphics/opengl/OpenGlPainter.h
similarity index 100%
rename from src/graphics/opengl/OpenGlPainter.h
rename to src/rendering/graphics/opengl/OpenGlPainter.h
diff --git a/src/graphics/opengl/OpenGlShaderProgram.cpp b/src/rendering/graphics/opengl/OpenGlShaderProgram.cpp
similarity index 100%
rename from src/graphics/opengl/OpenGlShaderProgram.cpp
rename to src/rendering/graphics/opengl/OpenGlShaderProgram.cpp
diff --git a/src/graphics/opengl/OpenGlShaderProgram.h b/src/rendering/graphics/opengl/OpenGlShaderProgram.h
similarity index 100%
rename from src/graphics/opengl/OpenGlShaderProgram.h
rename to src/rendering/graphics/opengl/OpenGlShaderProgram.h
diff --git a/src/graphics/opengl/OpenGlTextPainter.cpp b/src/rendering/graphics/opengl/OpenGlTextPainter.cpp
similarity index 100%
rename from src/graphics/opengl/OpenGlTextPainter.cpp
rename to src/rendering/graphics/opengl/OpenGlTextPainter.cpp
diff --git a/src/graphics/opengl/OpenGlTextPainter.h b/src/rendering/graphics/opengl/OpenGlTextPainter.h
similarity index 100%
rename from src/graphics/opengl/OpenGlTextPainter.h
rename to src/rendering/graphics/opengl/OpenGlTextPainter.h
diff --git a/src/graphics/opengl/shaders/default.frag b/src/rendering/graphics/opengl/shaders/default.frag
similarity index 100%
rename from src/graphics/opengl/shaders/default.frag
rename to src/rendering/graphics/opengl/shaders/default.frag
diff --git a/src/graphics/opengl/shaders/default.vert b/src/rendering/graphics/opengl/shaders/default.vert
similarity index 100%
rename from src/graphics/opengl/shaders/default.vert
rename to src/rendering/graphics/opengl/shaders/default.vert
diff --git a/src/graphics/opengl/shaders/text.frag b/src/rendering/graphics/opengl/shaders/text.frag
similarity index 100%
rename from src/graphics/opengl/shaders/text.frag
rename to src/rendering/graphics/opengl/shaders/text.frag
diff --git a/src/graphics/opengl/shaders/text.vert b/src/rendering/graphics/opengl/shaders/text.vert
similarity index 100%
rename from src/graphics/opengl/shaders/text.vert
rename to src/rendering/graphics/opengl/shaders/text.vert
diff --git a/src/mesh/AbstractFace.cpp b/src/rendering/mesh/AbstractFace.cpp
similarity index 100%
rename from src/mesh/AbstractFace.cpp
rename to src/rendering/mesh/AbstractFace.cpp
diff --git a/src/mesh/AbstractFace.h b/src/rendering/mesh/AbstractFace.h
similarity index 100%
rename from src/mesh/AbstractFace.h
rename to src/rendering/mesh/AbstractFace.h
diff --git a/src/mesh/AbstractMesh.cpp b/src/rendering/mesh/AbstractMesh.cpp
similarity index 100%
rename from src/mesh/AbstractMesh.cpp
rename to src/rendering/mesh/AbstractMesh.cpp
diff --git a/src/mesh/AbstractMesh.h b/src/rendering/mesh/AbstractMesh.h
similarity index 100%
rename from src/mesh/AbstractMesh.h
rename to src/rendering/mesh/AbstractMesh.h
diff --git a/src/mesh/CMakeLists.txt b/src/rendering/mesh/CMakeLists.txt
similarity index 93%
rename from src/mesh/CMakeLists.txt
rename to src/rendering/mesh/CMakeLists.txt
index ec50b46..a340366 100644
--- a/src/mesh/CMakeLists.txt
+++ b/src/rendering/mesh/CMakeLists.txt
@@ -35,4 +35,4 @@ target_link_libraries(mesh core geometry)
 target_include_directories(mesh PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/")
 
 set_target_properties( mesh PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )                          
-set_property(TARGET mesh PROPERTY FOLDER src)
+set_property(TARGET mesh PROPERTY FOLDER src/rendering)
diff --git a/src/mesh/Edge.cpp b/src/rendering/mesh/Edge.cpp
similarity index 100%
rename from src/mesh/Edge.cpp
rename to src/rendering/mesh/Edge.cpp
diff --git a/src/mesh/Edge.h b/src/rendering/mesh/Edge.h
similarity index 100%
rename from src/mesh/Edge.h
rename to src/rendering/mesh/Edge.h
diff --git a/src/mesh/FaceMesh.cpp b/src/rendering/mesh/FaceMesh.cpp
similarity index 100%
rename from src/mesh/FaceMesh.cpp
rename to src/rendering/mesh/FaceMesh.cpp
diff --git a/src/mesh/FaceMesh.h b/src/rendering/mesh/FaceMesh.h
similarity index 100%
rename from src/mesh/FaceMesh.h
rename to src/rendering/mesh/FaceMesh.h
diff --git a/src/mesh/LineMesh.cpp b/src/rendering/mesh/LineMesh.cpp
similarity index 100%
rename from src/mesh/LineMesh.cpp
rename to src/rendering/mesh/LineMesh.cpp
diff --git a/src/mesh/LineMesh.h b/src/rendering/mesh/LineMesh.h
similarity index 100%
rename from src/mesh/LineMesh.h
rename to src/rendering/mesh/LineMesh.h
diff --git a/src/mesh/MeshBuilder.cpp b/src/rendering/mesh/MeshBuilder.cpp
similarity index 100%
rename from src/mesh/MeshBuilder.cpp
rename to src/rendering/mesh/MeshBuilder.cpp
diff --git a/src/mesh/MeshBuilder.h b/src/rendering/mesh/MeshBuilder.h
similarity index 100%
rename from src/mesh/MeshBuilder.h
rename to src/rendering/mesh/MeshBuilder.h
diff --git a/src/mesh/MeshObjWriter.cpp b/src/rendering/mesh/MeshObjWriter.cpp
similarity index 100%
rename from src/mesh/MeshObjWriter.cpp
rename to src/rendering/mesh/MeshObjWriter.cpp
diff --git a/src/mesh/MeshObjWriter.h b/src/rendering/mesh/MeshObjWriter.h
similarity index 100%
rename from src/mesh/MeshObjWriter.h
rename to src/rendering/mesh/MeshObjWriter.h
diff --git a/src/mesh/MeshPrimitives.cpp b/src/rendering/mesh/MeshPrimitives.cpp
similarity index 100%
rename from src/mesh/MeshPrimitives.cpp
rename to src/rendering/mesh/MeshPrimitives.cpp
diff --git a/src/mesh/MeshPrimitives.h b/src/rendering/mesh/MeshPrimitives.h
similarity index 100%
rename from src/mesh/MeshPrimitives.h
rename to src/rendering/mesh/MeshPrimitives.h
diff --git a/src/mesh/Node.cpp b/src/rendering/mesh/Node.cpp
similarity index 100%
rename from src/mesh/Node.cpp
rename to src/rendering/mesh/Node.cpp
diff --git a/src/mesh/Node.h b/src/rendering/mesh/Node.h
similarity index 100%
rename from src/mesh/Node.h
rename to src/rendering/mesh/Node.h
diff --git a/src/mesh/QuadFace.cpp b/src/rendering/mesh/QuadFace.cpp
similarity index 100%
rename from src/mesh/QuadFace.cpp
rename to src/rendering/mesh/QuadFace.cpp
diff --git a/src/mesh/QuadFace.h b/src/rendering/mesh/QuadFace.h
similarity index 100%
rename from src/mesh/QuadFace.h
rename to src/rendering/mesh/QuadFace.h
diff --git a/src/mesh/QuadMesh.cpp b/src/rendering/mesh/QuadMesh.cpp
similarity index 100%
rename from src/mesh/QuadMesh.cpp
rename to src/rendering/mesh/QuadMesh.cpp
diff --git a/src/mesh/QuadMesh.h b/src/rendering/mesh/QuadMesh.h
similarity index 100%
rename from src/mesh/QuadMesh.h
rename to src/rendering/mesh/QuadMesh.h
diff --git a/src/mesh/TriFace.cpp b/src/rendering/mesh/TriFace.cpp
similarity index 100%
rename from src/mesh/TriFace.cpp
rename to src/rendering/mesh/TriFace.cpp
diff --git a/src/mesh/TriFace.h b/src/rendering/mesh/TriFace.h
similarity index 100%
rename from src/mesh/TriFace.h
rename to src/rendering/mesh/TriFace.h
diff --git a/src/mesh/TriMesh.cpp b/src/rendering/mesh/TriMesh.cpp
similarity index 100%
rename from src/mesh/TriMesh.cpp
rename to src/rendering/mesh/TriMesh.cpp
diff --git a/src/mesh/TriMesh.h b/src/rendering/mesh/TriMesh.h
similarity index 100%
rename from src/mesh/TriMesh.h
rename to src/rendering/mesh/TriMesh.h
diff --git a/src/visual_elements/CMakeLists.txt b/src/rendering/visual_elements/CMakeLists.txt
similarity index 95%
rename from src/visual_elements/CMakeLists.txt
rename to src/rendering/visual_elements/CMakeLists.txt
index d0633f3..15b5a6c 100644
--- a/src/visual_elements/CMakeLists.txt
+++ b/src/rendering/visual_elements/CMakeLists.txt
@@ -42,5 +42,5 @@ target_include_directories(${MODULE_NAME} PUBLIC
 
 target_link_libraries(${MODULE_NAME} PUBLIC core geometry fonts mesh image)
 
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/rendering)
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
diff --git a/src/visual_elements/TextData.h b/src/rendering/visual_elements/TextData.h
similarity index 100%
rename from src/visual_elements/TextData.h
rename to src/rendering/visual_elements/TextData.h
diff --git a/src/visual_elements/Texture.cpp b/src/rendering/visual_elements/Texture.cpp
similarity index 100%
rename from src/visual_elements/Texture.cpp
rename to src/rendering/visual_elements/Texture.cpp
diff --git a/src/visual_elements/Texture.h b/src/rendering/visual_elements/Texture.h
similarity index 100%
rename from src/visual_elements/Texture.h
rename to src/rendering/visual_elements/Texture.h
diff --git a/src/visual_elements/basic_shapes/CircleNode.cpp b/src/rendering/visual_elements/basic_shapes/CircleNode.cpp
similarity index 100%
rename from src/visual_elements/basic_shapes/CircleNode.cpp
rename to src/rendering/visual_elements/basic_shapes/CircleNode.cpp
diff --git a/src/visual_elements/basic_shapes/CircleNode.h b/src/rendering/visual_elements/basic_shapes/CircleNode.h
similarity index 100%
rename from src/visual_elements/basic_shapes/CircleNode.h
rename to src/rendering/visual_elements/basic_shapes/CircleNode.h
diff --git a/src/visual_elements/basic_shapes/LineNode.cpp b/src/rendering/visual_elements/basic_shapes/LineNode.cpp
similarity index 100%
rename from src/visual_elements/basic_shapes/LineNode.cpp
rename to src/rendering/visual_elements/basic_shapes/LineNode.cpp
diff --git a/src/visual_elements/basic_shapes/LineNode.h b/src/rendering/visual_elements/basic_shapes/LineNode.h
similarity index 100%
rename from src/visual_elements/basic_shapes/LineNode.h
rename to src/rendering/visual_elements/basic_shapes/LineNode.h
diff --git a/src/visual_elements/basic_shapes/RectangleNode.cpp b/src/rendering/visual_elements/basic_shapes/RectangleNode.cpp
similarity index 100%
rename from src/visual_elements/basic_shapes/RectangleNode.cpp
rename to src/rendering/visual_elements/basic_shapes/RectangleNode.cpp
diff --git a/src/visual_elements/basic_shapes/RectangleNode.h b/src/rendering/visual_elements/basic_shapes/RectangleNode.h
similarity index 100%
rename from src/visual_elements/basic_shapes/RectangleNode.h
rename to src/rendering/visual_elements/basic_shapes/RectangleNode.h
diff --git a/src/visual_elements/nodes/AbstractVisualNode.cpp b/src/rendering/visual_elements/nodes/AbstractVisualNode.cpp
similarity index 100%
rename from src/visual_elements/nodes/AbstractVisualNode.cpp
rename to src/rendering/visual_elements/nodes/AbstractVisualNode.cpp
diff --git a/src/visual_elements/nodes/AbstractVisualNode.h b/src/rendering/visual_elements/nodes/AbstractVisualNode.h
similarity index 100%
rename from src/visual_elements/nodes/AbstractVisualNode.h
rename to src/rendering/visual_elements/nodes/AbstractVisualNode.h
diff --git a/src/visual_elements/nodes/GeometryNode.cpp b/src/rendering/visual_elements/nodes/GeometryNode.cpp
similarity index 100%
rename from src/visual_elements/nodes/GeometryNode.cpp
rename to src/rendering/visual_elements/nodes/GeometryNode.cpp
diff --git a/src/visual_elements/nodes/GeometryNode.h b/src/rendering/visual_elements/nodes/GeometryNode.h
similarity index 100%
rename from src/visual_elements/nodes/GeometryNode.h
rename to src/rendering/visual_elements/nodes/GeometryNode.h
diff --git a/src/visual_elements/nodes/GridNode.cpp b/src/rendering/visual_elements/nodes/GridNode.cpp
similarity index 100%
rename from src/visual_elements/nodes/GridNode.cpp
rename to src/rendering/visual_elements/nodes/GridNode.cpp
diff --git a/src/visual_elements/nodes/GridNode.h b/src/rendering/visual_elements/nodes/GridNode.h
similarity index 100%
rename from src/visual_elements/nodes/GridNode.h
rename to src/rendering/visual_elements/nodes/GridNode.h
diff --git a/src/visual_elements/nodes/MaterialNode.cpp b/src/rendering/visual_elements/nodes/MaterialNode.cpp
similarity index 100%
rename from src/visual_elements/nodes/MaterialNode.cpp
rename to src/rendering/visual_elements/nodes/MaterialNode.cpp
diff --git a/src/visual_elements/nodes/MaterialNode.h b/src/rendering/visual_elements/nodes/MaterialNode.h
similarity index 100%
rename from src/visual_elements/nodes/MaterialNode.h
rename to src/rendering/visual_elements/nodes/MaterialNode.h
diff --git a/src/visual_elements/nodes/MeshNode.cpp b/src/rendering/visual_elements/nodes/MeshNode.cpp
similarity index 100%
rename from src/visual_elements/nodes/MeshNode.cpp
rename to src/rendering/visual_elements/nodes/MeshNode.cpp
diff --git a/src/visual_elements/nodes/MeshNode.h b/src/rendering/visual_elements/nodes/MeshNode.h
similarity index 100%
rename from src/visual_elements/nodes/MeshNode.h
rename to src/rendering/visual_elements/nodes/MeshNode.h
diff --git a/src/visual_elements/nodes/RootNode.h b/src/rendering/visual_elements/nodes/RootNode.h
similarity index 100%
rename from src/visual_elements/nodes/RootNode.h
rename to src/rendering/visual_elements/nodes/RootNode.h
diff --git a/src/visual_elements/nodes/TextNode.cpp b/src/rendering/visual_elements/nodes/TextNode.cpp
similarity index 100%
rename from src/visual_elements/nodes/TextNode.cpp
rename to src/rendering/visual_elements/nodes/TextNode.cpp
diff --git a/src/visual_elements/nodes/TextNode.h b/src/rendering/visual_elements/nodes/TextNode.h
similarity index 100%
rename from src/visual_elements/nodes/TextNode.h
rename to src/rendering/visual_elements/nodes/TextNode.h
diff --git a/src/visual_elements/nodes/TransformNode.h b/src/rendering/visual_elements/nodes/TransformNode.h
similarity index 100%
rename from src/visual_elements/nodes/TransformNode.h
rename to src/rendering/visual_elements/nodes/TransformNode.h
diff --git a/src/visual_elements/scene/Scene.cpp b/src/rendering/visual_elements/scene/Scene.cpp
similarity index 100%
rename from src/visual_elements/scene/Scene.cpp
rename to src/rendering/visual_elements/scene/Scene.cpp
diff --git a/src/visual_elements/scene/Scene.h b/src/rendering/visual_elements/scene/Scene.h
similarity index 100%
rename from src/visual_elements/scene/Scene.h
rename to src/rendering/visual_elements/scene/Scene.h
diff --git a/src/visual_elements/scene/SceneInfo.h b/src/rendering/visual_elements/scene/SceneInfo.h
similarity index 100%
rename from src/visual_elements/scene/SceneInfo.h
rename to src/rendering/visual_elements/scene/SceneInfo.h
diff --git a/src/visual_elements/scene/SceneItem.cpp b/src/rendering/visual_elements/scene/SceneItem.cpp
similarity index 100%
rename from src/visual_elements/scene/SceneItem.cpp
rename to src/rendering/visual_elements/scene/SceneItem.cpp
diff --git a/src/visual_elements/scene/SceneItem.h b/src/rendering/visual_elements/scene/SceneItem.h
similarity index 100%
rename from src/visual_elements/scene/SceneItem.h
rename to src/rendering/visual_elements/scene/SceneItem.h
diff --git a/src/visual_elements/scene/SceneModel.cpp b/src/rendering/visual_elements/scene/SceneModel.cpp
similarity index 100%
rename from src/visual_elements/scene/SceneModel.cpp
rename to src/rendering/visual_elements/scene/SceneModel.cpp
diff --git a/src/visual_elements/scene/SceneModel.h b/src/rendering/visual_elements/scene/SceneModel.h
similarity index 100%
rename from src/visual_elements/scene/SceneModel.h
rename to src/rendering/visual_elements/scene/SceneModel.h
diff --git a/src/visual_elements/scene/SceneText.cpp b/src/rendering/visual_elements/scene/SceneText.cpp
similarity index 100%
rename from src/visual_elements/scene/SceneText.cpp
rename to src/rendering/visual_elements/scene/SceneText.cpp
diff --git a/src/visual_elements/scene/SceneText.h b/src/rendering/visual_elements/scene/SceneText.h
similarity index 100%
rename from src/visual_elements/scene/SceneText.h
rename to src/rendering/visual_elements/scene/SceneText.h
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
new file mode 100644
index 0000000..59915a1
--- /dev/null
+++ b/src/ui/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(client)
+add_subdirectory(ui_controls)
+add_subdirectory(ui_elements)
+add_subdirectory(windows)
diff --git a/src/client/CMakeLists.txt b/src/ui/client/CMakeLists.txt
similarity index 85%
rename from src/client/CMakeLists.txt
rename to src/ui/client/CMakeLists.txt
index 979f54a..cf87429 100644
--- a/src/client/CMakeLists.txt
+++ b/src/ui/client/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND TARGET_SOURCES
 
 add_library(${MODULE_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
 
-target_link_libraries(${MODULE_NAME} ui_elements windows core console database geometry)
+target_link_libraries(${MODULE_NAME} ui_controls windows core console database geometry)
 
 target_include_directories(${MODULE_NAME} PUBLIC
                             ${CMAKE_CURRENT_SOURCE_DIR}
@@ -25,5 +25,5 @@ target_include_directories(${MODULE_NAME} PUBLIC
                             ${CMAKE_CURRENT_SOURCE_DIR}/image_editor
                             ${CMAKE_CURRENT_SOURCE_DIR}/web_client
                           )
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/ui)
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
\ No newline at end of file
diff --git a/src/client/GuiApplication.cpp b/src/ui/client/GuiApplication.cpp
similarity index 100%
rename from src/client/GuiApplication.cpp
rename to src/ui/client/GuiApplication.cpp
diff --git a/src/client/GuiApplication.h b/src/ui/client/GuiApplication.h
similarity index 100%
rename from src/client/GuiApplication.h
rename to src/ui/client/GuiApplication.h
diff --git a/src/client/StatusBar.cpp b/src/ui/client/StatusBar.cpp
similarity index 100%
rename from src/client/StatusBar.cpp
rename to src/ui/client/StatusBar.cpp
diff --git a/src/client/StatusBar.h b/src/ui/client/StatusBar.h
similarity index 100%
rename from src/client/StatusBar.h
rename to src/ui/client/StatusBar.h
diff --git a/src/client/TabbedPanelWidget.cpp b/src/ui/client/TabbedPanelWidget.cpp
similarity index 100%
rename from src/client/TabbedPanelWidget.cpp
rename to src/ui/client/TabbedPanelWidget.cpp
diff --git a/src/client/TabbedPanelWidget.h b/src/ui/client/TabbedPanelWidget.h
similarity index 100%
rename from src/client/TabbedPanelWidget.h
rename to src/ui/client/TabbedPanelWidget.h
diff --git a/src/client/TopBar.cpp b/src/ui/client/TopBar.cpp
similarity index 100%
rename from src/client/TopBar.cpp
rename to src/ui/client/TopBar.cpp
diff --git a/src/client/TopBar.h b/src/ui/client/TopBar.h
similarity index 100%
rename from src/client/TopBar.h
rename to src/ui/client/TopBar.h
diff --git a/src/client/TopBarMenu.cpp b/src/ui/client/TopBarMenu.cpp
similarity index 100%
rename from src/client/TopBarMenu.cpp
rename to src/ui/client/TopBarMenu.cpp
diff --git a/src/client/TopBarMenu.h b/src/ui/client/TopBarMenu.h
similarity index 100%
rename from src/client/TopBarMenu.h
rename to src/ui/client/TopBarMenu.h
diff --git a/src/ui_elements/widgets/Button.cpp b/src/ui/ui_controls/Button.cpp
similarity index 100%
rename from src/ui_elements/widgets/Button.cpp
rename to src/ui/ui_controls/Button.cpp
diff --git a/src/ui_elements/widgets/Button.h b/src/ui/ui_controls/Button.h
similarity index 100%
rename from src/ui_elements/widgets/Button.h
rename to src/ui/ui_controls/Button.h
diff --git a/src/ui_elements/widgets/ButtonGroup.cpp b/src/ui/ui_controls/ButtonGroup.cpp
similarity index 100%
rename from src/ui_elements/widgets/ButtonGroup.cpp
rename to src/ui/ui_controls/ButtonGroup.cpp
diff --git a/src/ui_elements/widgets/ButtonGroup.h b/src/ui/ui_controls/ButtonGroup.h
similarity index 100%
rename from src/ui_elements/widgets/ButtonGroup.h
rename to src/ui/ui_controls/ButtonGroup.h
diff --git a/src/ui/ui_controls/CMakeLists.txt b/src/ui/ui_controls/CMakeLists.txt
new file mode 100644
index 0000000..f507345
--- /dev/null
+++ b/src/ui/ui_controls/CMakeLists.txt
@@ -0,0 +1,32 @@
+set(MODULE_NAME ui_controls)
+
+list(APPEND HEADERS
+        Button.h
+        ButtonGroup.h
+        Label.h
+        HorizontalSpacer.h
+        VerticalSpacer.h
+        StackWidget.h
+		TextBox.h
+)
+
+list(APPEND LIB_INCLUDES
+        Button.cpp
+        ButtonGroup.cpp
+        Label.cpp
+        HorizontalSpacer.cpp
+        VerticalSpacer.cpp
+        StackWidget.cpp
+        TextBox.cpp
+)
+
+add_library(${MODULE_NAME} SHARED ${LIB_INCLUDES} ${HEADERS})
+
+target_include_directories(${MODULE_NAME} PUBLIC
+                          ${CMAKE_CURRENT_SOURCE_DIR}/                      
+                          )
+target_link_libraries(${MODULE_NAME} PUBLIC ui_elements)
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/ui)
+
+set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
\ No newline at end of file
diff --git a/src/ui_elements/widgets/HorizontalSpacer.cpp b/src/ui/ui_controls/HorizontalSpacer.cpp
similarity index 100%
rename from src/ui_elements/widgets/HorizontalSpacer.cpp
rename to src/ui/ui_controls/HorizontalSpacer.cpp
diff --git a/src/ui_elements/widgets/HorizontalSpacer.h b/src/ui/ui_controls/HorizontalSpacer.h
similarity index 100%
rename from src/ui_elements/widgets/HorizontalSpacer.h
rename to src/ui/ui_controls/HorizontalSpacer.h
diff --git a/src/ui_elements/widgets/Label.cpp b/src/ui/ui_controls/Label.cpp
similarity index 100%
rename from src/ui_elements/widgets/Label.cpp
rename to src/ui/ui_controls/Label.cpp
diff --git a/src/ui_elements/widgets/Label.h b/src/ui/ui_controls/Label.h
similarity index 100%
rename from src/ui_elements/widgets/Label.h
rename to src/ui/ui_controls/Label.h
diff --git a/src/ui_elements/widgets/StackWidget.cpp b/src/ui/ui_controls/StackWidget.cpp
similarity index 100%
rename from src/ui_elements/widgets/StackWidget.cpp
rename to src/ui/ui_controls/StackWidget.cpp
diff --git a/src/ui_elements/widgets/StackWidget.h b/src/ui/ui_controls/StackWidget.h
similarity index 100%
rename from src/ui_elements/widgets/StackWidget.h
rename to src/ui/ui_controls/StackWidget.h
diff --git a/src/ui_elements/widgets/TextBox.cpp b/src/ui/ui_controls/TextBox.cpp
similarity index 100%
rename from src/ui_elements/widgets/TextBox.cpp
rename to src/ui/ui_controls/TextBox.cpp
diff --git a/src/ui_elements/widgets/TextBox.h b/src/ui/ui_controls/TextBox.h
similarity index 100%
rename from src/ui_elements/widgets/TextBox.h
rename to src/ui/ui_controls/TextBox.h
diff --git a/src/ui_elements/widgets/VerticalSpacer.cpp b/src/ui/ui_controls/VerticalSpacer.cpp
similarity index 100%
rename from src/ui_elements/widgets/VerticalSpacer.cpp
rename to src/ui/ui_controls/VerticalSpacer.cpp
diff --git a/src/ui_elements/widgets/VerticalSpacer.h b/src/ui/ui_controls/VerticalSpacer.h
similarity index 100%
rename from src/ui_elements/widgets/VerticalSpacer.h
rename to src/ui/ui_controls/VerticalSpacer.h
diff --git a/src/ui/ui_elements/CMakeLists.txt b/src/ui/ui_elements/CMakeLists.txt
new file mode 100644
index 0000000..10d7bae
--- /dev/null
+++ b/src/ui/ui_elements/CMakeLists.txt
@@ -0,0 +1,43 @@
+set(MODULE_NAME ui_elements)
+
+list(APPEND LIB_INCLUDES
+        desktop_elements/Keyboard.h
+        desktop_elements/Keyboard.cpp
+        desktop_elements/IPlatformScreen.h
+        desktop_elements/Screen.h
+        desktop_elements/Screen.cpp
+        desktop_elements/IPlatformWindow.h
+        desktop_elements/Window.h
+        desktop_elements/Window.cpp
+        ui_events/KeyboardEvent.h
+        ui_events/KeyboardEvent.cpp
+        ui_events/MouseEvent.h
+        ui_events/MouseEvent.cpp
+        ui_events/UiEvent.h
+        ui_events/UiEvent.cpp
+        ui_events/PaintEvent.h
+        ui_events/PaintEvent.cpp
+        ui_events/ResizeEvent.h
+        ui_events/ResizeEvent.cpp
+        widgets/Widget.h
+        widgets/Widget.cpp
+		widgets/WidgetState.h
+        widgets/WidgetState.cpp
+		style/Theme.h
+        style/Theme.cpp
+)
+
+add_library(${MODULE_NAME} SHARED ${LIB_INCLUDES})
+
+target_include_directories(${MODULE_NAME} PUBLIC
+                          ${CMAKE_CURRENT_SOURCE_DIR}/
+                          ${CMAKE_CURRENT_SOURCE_DIR}/widgets
+                          ${CMAKE_CURRENT_SOURCE_DIR}/style
+                          ${CMAKE_CURRENT_SOURCE_DIR}/ui_events
+                          ${CMAKE_CURRENT_SOURCE_DIR}/desktop_elements                       
+                          )
+target_link_libraries(${MODULE_NAME} PUBLIC core geometry graphics visual_elements image)
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/ui)
+
+set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
\ No newline at end of file
diff --git a/src/ui_elements/desktop_elements/DisplayState.h b/src/ui/ui_elements/desktop_elements/DisplayState.h
similarity index 100%
rename from src/ui_elements/desktop_elements/DisplayState.h
rename to src/ui/ui_elements/desktop_elements/DisplayState.h
diff --git a/src/ui_elements/desktop_elements/IPlatformScreen.h b/src/ui/ui_elements/desktop_elements/IPlatformScreen.h
similarity index 100%
rename from src/ui_elements/desktop_elements/IPlatformScreen.h
rename to src/ui/ui_elements/desktop_elements/IPlatformScreen.h
diff --git a/src/ui_elements/desktop_elements/IPlatformWindow.h b/src/ui/ui_elements/desktop_elements/IPlatformWindow.h
similarity index 100%
rename from src/ui_elements/desktop_elements/IPlatformWindow.h
rename to src/ui/ui_elements/desktop_elements/IPlatformWindow.h
diff --git a/src/ui_elements/desktop_elements/Keyboard.cpp b/src/ui/ui_elements/desktop_elements/Keyboard.cpp
similarity index 100%
rename from src/ui_elements/desktop_elements/Keyboard.cpp
rename to src/ui/ui_elements/desktop_elements/Keyboard.cpp
diff --git a/src/ui_elements/desktop_elements/Keyboard.h b/src/ui/ui_elements/desktop_elements/Keyboard.h
similarity index 100%
rename from src/ui_elements/desktop_elements/Keyboard.h
rename to src/ui/ui_elements/desktop_elements/Keyboard.h
diff --git a/src/ui_elements/desktop_elements/Screen.cpp b/src/ui/ui_elements/desktop_elements/Screen.cpp
similarity index 100%
rename from src/ui_elements/desktop_elements/Screen.cpp
rename to src/ui/ui_elements/desktop_elements/Screen.cpp
diff --git a/src/ui_elements/desktop_elements/Screen.h b/src/ui/ui_elements/desktop_elements/Screen.h
similarity index 100%
rename from src/ui_elements/desktop_elements/Screen.h
rename to src/ui/ui_elements/desktop_elements/Screen.h
diff --git a/src/ui_elements/desktop_elements/Window.cpp b/src/ui/ui_elements/desktop_elements/Window.cpp
similarity index 100%
rename from src/ui_elements/desktop_elements/Window.cpp
rename to src/ui/ui_elements/desktop_elements/Window.cpp
diff --git a/src/ui_elements/desktop_elements/Window.h b/src/ui/ui_elements/desktop_elements/Window.h
similarity index 100%
rename from src/ui_elements/desktop_elements/Window.h
rename to src/ui/ui_elements/desktop_elements/Window.h
diff --git a/src/ui_elements/style/Theme.cpp b/src/ui/ui_elements/style/Theme.cpp
similarity index 100%
rename from src/ui_elements/style/Theme.cpp
rename to src/ui/ui_elements/style/Theme.cpp
diff --git a/src/ui_elements/style/Theme.h b/src/ui/ui_elements/style/Theme.h
similarity index 100%
rename from src/ui_elements/style/Theme.h
rename to src/ui/ui_elements/style/Theme.h
diff --git a/src/ui_elements/ui_events/KeyboardEvent.cpp b/src/ui/ui_elements/ui_events/KeyboardEvent.cpp
similarity index 100%
rename from src/ui_elements/ui_events/KeyboardEvent.cpp
rename to src/ui/ui_elements/ui_events/KeyboardEvent.cpp
diff --git a/src/ui_elements/ui_events/KeyboardEvent.h b/src/ui/ui_elements/ui_events/KeyboardEvent.h
similarity index 100%
rename from src/ui_elements/ui_events/KeyboardEvent.h
rename to src/ui/ui_elements/ui_events/KeyboardEvent.h
diff --git a/src/ui_elements/ui_events/MouseEvent.cpp b/src/ui/ui_elements/ui_events/MouseEvent.cpp
similarity index 100%
rename from src/ui_elements/ui_events/MouseEvent.cpp
rename to src/ui/ui_elements/ui_events/MouseEvent.cpp
diff --git a/src/ui_elements/ui_events/MouseEvent.h b/src/ui/ui_elements/ui_events/MouseEvent.h
similarity index 100%
rename from src/ui_elements/ui_events/MouseEvent.h
rename to src/ui/ui_elements/ui_events/MouseEvent.h
diff --git a/src/ui_elements/ui_events/PaintEvent.cpp b/src/ui/ui_elements/ui_events/PaintEvent.cpp
similarity index 100%
rename from src/ui_elements/ui_events/PaintEvent.cpp
rename to src/ui/ui_elements/ui_events/PaintEvent.cpp
diff --git a/src/ui_elements/ui_events/PaintEvent.h b/src/ui/ui_elements/ui_events/PaintEvent.h
similarity index 100%
rename from src/ui_elements/ui_events/PaintEvent.h
rename to src/ui/ui_elements/ui_events/PaintEvent.h
diff --git a/src/ui_elements/ui_events/ResizeEvent.cpp b/src/ui/ui_elements/ui_events/ResizeEvent.cpp
similarity index 100%
rename from src/ui_elements/ui_events/ResizeEvent.cpp
rename to src/ui/ui_elements/ui_events/ResizeEvent.cpp
diff --git a/src/ui_elements/ui_events/ResizeEvent.h b/src/ui/ui_elements/ui_events/ResizeEvent.h
similarity index 100%
rename from src/ui_elements/ui_events/ResizeEvent.h
rename to src/ui/ui_elements/ui_events/ResizeEvent.h
diff --git a/src/ui_elements/ui_events/UiEvent.cpp b/src/ui/ui_elements/ui_events/UiEvent.cpp
similarity index 100%
rename from src/ui_elements/ui_events/UiEvent.cpp
rename to src/ui/ui_elements/ui_events/UiEvent.cpp
diff --git a/src/ui_elements/ui_events/UiEvent.h b/src/ui/ui_elements/ui_events/UiEvent.h
similarity index 100%
rename from src/ui_elements/ui_events/UiEvent.h
rename to src/ui/ui_elements/ui_events/UiEvent.h
diff --git a/src/ui_elements/widgets/Widget.cpp b/src/ui/ui_elements/widgets/Widget.cpp
similarity index 100%
rename from src/ui_elements/widgets/Widget.cpp
rename to src/ui/ui_elements/widgets/Widget.cpp
diff --git a/src/ui_elements/widgets/Widget.h b/src/ui/ui_elements/widgets/Widget.h
similarity index 100%
rename from src/ui_elements/widgets/Widget.h
rename to src/ui/ui_elements/widgets/Widget.h
diff --git a/plugins/quantum_computing/test/TestBlochSphereNode.h b/src/ui/ui_elements/widgets/WidgetState.cpp
similarity index 100%
rename from plugins/quantum_computing/test/TestBlochSphereNode.h
rename to src/ui/ui_elements/widgets/WidgetState.cpp
diff --git a/src/windows/ui_interfaces/wayland/XdgInterface.cpp b/src/ui/ui_elements/widgets/WidgetState.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/XdgInterface.cpp
rename to src/ui/ui_elements/widgets/WidgetState.h
diff --git a/src/windows/AbstractDesktopApp.h b/src/ui/windows/AbstractDesktopApp.h
similarity index 100%
rename from src/windows/AbstractDesktopApp.h
rename to src/ui/windows/AbstractDesktopApp.h
diff --git a/src/windows/CMakeLists.txt b/src/ui/windows/CMakeLists.txt
similarity index 98%
rename from src/windows/CMakeLists.txt
rename to src/ui/windows/CMakeLists.txt
index c063a79..47a1d02 100644
--- a/src/windows/CMakeLists.txt
+++ b/src/ui/windows/CMakeLists.txt
@@ -108,5 +108,5 @@ target_compile_options(${MODULE_NAME} PRIVATE -Wno-attributes) # From xdg shell
 endif()
 target_link_libraries(${MODULE_NAME} PUBLIC ${platform_LIBS} core geometry graphics ui_elements)
 
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/ui)
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
diff --git a/src/windows/managers/DesktopManager.cpp b/src/ui/windows/managers/DesktopManager.cpp
similarity index 100%
rename from src/windows/managers/DesktopManager.cpp
rename to src/ui/windows/managers/DesktopManager.cpp
diff --git a/src/windows/managers/DesktopManager.h b/src/ui/windows/managers/DesktopManager.h
similarity index 100%
rename from src/windows/managers/DesktopManager.h
rename to src/ui/windows/managers/DesktopManager.h
diff --git a/src/windows/managers/EventManager.cpp b/src/ui/windows/managers/EventManager.cpp
similarity index 100%
rename from src/windows/managers/EventManager.cpp
rename to src/ui/windows/managers/EventManager.cpp
diff --git a/src/windows/managers/EventManager.h b/src/ui/windows/managers/EventManager.h
similarity index 100%
rename from src/windows/managers/EventManager.h
rename to src/ui/windows/managers/EventManager.h
diff --git a/src/windows/managers/WindowManager.cpp b/src/ui/windows/managers/WindowManager.cpp
similarity index 100%
rename from src/windows/managers/WindowManager.cpp
rename to src/ui/windows/managers/WindowManager.cpp
diff --git a/src/windows/managers/WindowManager.h b/src/ui/windows/managers/WindowManager.h
similarity index 100%
rename from src/windows/managers/WindowManager.h
rename to src/ui/windows/managers/WindowManager.h
diff --git a/src/windows/ui_interfaces/AbstractUiInterface.h b/src/ui/windows/ui_interfaces/AbstractUiInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/AbstractUiInterface.h
rename to src/ui/windows/ui_interfaces/AbstractUiInterface.h
diff --git a/src/windows/ui_interfaces/NullUiInterface.h b/src/ui/windows/ui_interfaces/NullUiInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/NullUiInterface.h
rename to src/ui/windows/ui_interfaces/NullUiInterface.h
diff --git a/src/windows/ui_interfaces/UiInterfaceFactory.cpp b/src/ui/windows/ui_interfaces/UiInterfaceFactory.cpp
similarity index 100%
rename from src/windows/ui_interfaces/UiInterfaceFactory.cpp
rename to src/ui/windows/ui_interfaces/UiInterfaceFactory.cpp
diff --git a/src/windows/ui_interfaces/UiInterfaceFactory.h b/src/ui/windows/ui_interfaces/UiInterfaceFactory.h
similarity index 100%
rename from src/windows/ui_interfaces/UiInterfaceFactory.h
rename to src/ui/windows/ui_interfaces/UiInterfaceFactory.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandBuffer.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandBuffer.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandBuffer.cpp
rename to src/ui/windows/ui_interfaces/wayland/WaylandBuffer.cpp
diff --git a/src/windows/ui_interfaces/wayland/WaylandBuffer.h b/src/ui/windows/ui_interfaces/wayland/WaylandBuffer.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandBuffer.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandBuffer.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandEglInterface.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandEglInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandEglInterface.cpp
rename to src/ui/windows/ui_interfaces/wayland/WaylandEglInterface.cpp
diff --git a/src/windows/ui_interfaces/wayland/WaylandEglInterface.h b/src/ui/windows/ui_interfaces/wayland/WaylandEglInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandEglInterface.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandEglInterface.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandEglWindowInterface.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandEglWindowInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandEglWindowInterface.cpp
rename to src/ui/windows/ui_interfaces/wayland/WaylandEglWindowInterface.cpp
diff --git a/src/windows/ui_interfaces/wayland/WaylandEglWindowInterface.h b/src/ui/windows/ui_interfaces/wayland/WaylandEglWindowInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandEglWindowInterface.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandEglWindowInterface.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandInterface.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandInterface.cpp
rename to src/ui/windows/ui_interfaces/wayland/WaylandInterface.cpp
diff --git a/src/windows/ui_interfaces/wayland/WaylandInterface.h b/src/ui/windows/ui_interfaces/wayland/WaylandInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandInterface.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandInterface.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandKeyboard.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandKeyboard.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandKeyboard.cpp
rename to src/ui/windows/ui_interfaces/wayland/WaylandKeyboard.cpp
diff --git a/src/windows/ui_interfaces/wayland/WaylandKeyboard.h b/src/ui/windows/ui_interfaces/wayland/WaylandKeyboard.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandKeyboard.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandKeyboard.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandPointerEvent.h b/src/ui/windows/ui_interfaces/wayland/WaylandPointerEvent.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandPointerEvent.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandPointerEvent.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandPointerInterface.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandPointerInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandPointerInterface.cpp
rename to src/ui/windows/ui_interfaces/wayland/WaylandPointerInterface.cpp
diff --git a/src/windows/ui_interfaces/wayland/WaylandPointerInterface.h b/src/ui/windows/ui_interfaces/wayland/WaylandPointerInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandPointerInterface.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandPointerInterface.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandSeatInterface.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandSeatInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandSeatInterface.cpp
rename to src/ui/windows/ui_interfaces/wayland/WaylandSeatInterface.cpp
diff --git a/src/windows/ui_interfaces/wayland/WaylandSeatInterface.h b/src/ui/windows/ui_interfaces/wayland/WaylandSeatInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandSeatInterface.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandSeatInterface.h
diff --git a/src/windows/ui_interfaces/wayland/WaylandSurface.cpp b/src/ui/windows/ui_interfaces/wayland/WaylandSurface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandSurface.cpp
rename to src/ui/windows/ui_interfaces/wayland/WaylandSurface.cpp
diff --git a/src/windows/ui_interfaces/wayland/WaylandSurface.h b/src/ui/windows/ui_interfaces/wayland/WaylandSurface.h
similarity index 100%
rename from src/windows/ui_interfaces/wayland/WaylandSurface.h
rename to src/ui/windows/ui_interfaces/wayland/WaylandSurface.h
diff --git a/src/windows/ui_interfaces/wayland/XdgInterface.h b/src/ui/windows/ui_interfaces/wayland/XdgInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/wayland/XdgInterface.h
rename to src/ui/windows/ui_interfaces/wayland/XdgInterface.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbImage.cpp b/src/ui/windows/ui_interfaces/wayland/XdgInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbImage.cpp
rename to src/ui/windows/ui_interfaces/wayland/XdgInterface.h
diff --git a/src/windows/ui_interfaces/win32/Win32UIInterface.cpp b/src/ui/windows/ui_interfaces/win32/Win32UIInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/win32/Win32UIInterface.cpp
rename to src/ui/windows/ui_interfaces/win32/Win32UIInterface.cpp
diff --git a/src/windows/ui_interfaces/win32/Win32UIInterface.h b/src/ui/windows/ui_interfaces/win32/Win32UIInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/win32/Win32UIInterface.h
rename to src/ui/windows/ui_interfaces/win32/Win32UIInterface.h
diff --git a/src/windows/ui_interfaces/win32/Win32Window.cpp b/src/ui/windows/ui_interfaces/win32/Win32Window.cpp
similarity index 100%
rename from src/windows/ui_interfaces/win32/Win32Window.cpp
rename to src/ui/windows/ui_interfaces/win32/Win32Window.cpp
diff --git a/src/windows/ui_interfaces/win32/Win32Window.h b/src/ui/windows/ui_interfaces/win32/Win32Window.h
similarity index 100%
rename from src/windows/ui_interfaces/win32/Win32Window.h
rename to src/ui/windows/ui_interfaces/win32/Win32Window.h
diff --git a/src/windows/ui_interfaces/win32/Win32WindowInterface.cpp b/src/ui/windows/ui_interfaces/win32/Win32WindowInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/win32/Win32WindowInterface.cpp
rename to src/ui/windows/ui_interfaces/win32/Win32WindowInterface.cpp
diff --git a/src/windows/ui_interfaces/win32/Win32WindowInterface.h b/src/ui/windows/ui_interfaces/win32/Win32WindowInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/win32/Win32WindowInterface.h
rename to src/ui/windows/ui_interfaces/win32/Win32WindowInterface.h
diff --git a/src/windows/ui_interfaces/win32/directx/DirectX2dIntegration.cpp b/src/ui/windows/ui_interfaces/win32/directx/DirectX2dIntegration.cpp
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/DirectX2dIntegration.cpp
rename to src/ui/windows/ui_interfaces/win32/directx/DirectX2dIntegration.cpp
diff --git a/src/windows/ui_interfaces/win32/directx/DirectX2dIntegration.h b/src/ui/windows/ui_interfaces/win32/directx/DirectX2dIntegration.h
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/DirectX2dIntegration.h
rename to src/ui/windows/ui_interfaces/win32/directx/DirectX2dIntegration.h
diff --git a/src/windows/ui_interfaces/win32/directx/DirectXBuffers.cpp b/src/ui/windows/ui_interfaces/win32/directx/DirectXBuffers.cpp
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/DirectXBuffers.cpp
rename to src/ui/windows/ui_interfaces/win32/directx/DirectXBuffers.cpp
diff --git a/src/windows/ui_interfaces/win32/directx/DirectXBuffers.h b/src/ui/windows/ui_interfaces/win32/directx/DirectXBuffers.h
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/DirectXBuffers.h
rename to src/ui/windows/ui_interfaces/win32/directx/DirectXBuffers.h
diff --git a/src/windows/ui_interfaces/win32/directx/DirectXCommandList.cpp b/src/ui/windows/ui_interfaces/win32/directx/DirectXCommandList.cpp
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/DirectXCommandList.cpp
rename to src/ui/windows/ui_interfaces/win32/directx/DirectXCommandList.cpp
diff --git a/src/windows/ui_interfaces/win32/directx/DirectXCommandList.h b/src/ui/windows/ui_interfaces/win32/directx/DirectXCommandList.h
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/DirectXCommandList.h
rename to src/ui/windows/ui_interfaces/win32/directx/DirectXCommandList.h
diff --git a/src/windows/ui_interfaces/win32/directx/DirectXDescriptors.cpp b/src/ui/windows/ui_interfaces/win32/directx/DirectXDescriptors.cpp
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/DirectXDescriptors.cpp
rename to src/ui/windows/ui_interfaces/win32/directx/DirectXDescriptors.cpp
diff --git a/src/windows/ui_interfaces/win32/directx/DirectXDescriptors.h b/src/ui/windows/ui_interfaces/win32/directx/DirectXDescriptors.h
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/DirectXDescriptors.h
rename to src/ui/windows/ui_interfaces/win32/directx/DirectXDescriptors.h
diff --git a/src/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.cpp b/src/ui/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.cpp
rename to src/ui/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.cpp
diff --git a/src/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.h b/src/ui/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.h
rename to src/ui/windows/ui_interfaces/win32/directx/Win32DxWindowInterface.h
diff --git a/src/windows/ui_interfaces/x11/XcbEventInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbEventInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbEventInterface.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbEventInterface.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbEventInterface.h b/src/ui/windows/ui_interfaces/x11/XcbEventInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbEventInterface.h
rename to src/ui/windows/ui_interfaces/x11/XcbEventInterface.h
diff --git a/src/windows/ui_interfaces/x11/XcbExtensionInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbExtensionInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbExtensionInterface.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbExtensionInterface.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbExtensionInterface.h b/src/ui/windows/ui_interfaces/x11/XcbExtensionInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbExtensionInterface.h
rename to src/ui/windows/ui_interfaces/x11/XcbExtensionInterface.h
diff --git a/src/windows/ui_interfaces/x11/XcbGlInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbGlInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbGlInterface.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbGlInterface.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbGlInterface.h b/src/ui/windows/ui_interfaces/x11/XcbGlInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbGlInterface.h
rename to src/ui/windows/ui_interfaces/x11/XcbGlInterface.h
diff --git a/src/windows/ui_interfaces/x11/XcbGlWindowInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbGlWindowInterface.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbGlWindowInterface.h b/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbGlWindowInterface.h
rename to src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.h
diff --git a/src/ui/windows/ui_interfaces/x11/XcbImage.cpp b/src/ui/windows/ui_interfaces/x11/XcbImage.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/src/windows/ui_interfaces/x11/XcbImage.h b/src/ui/windows/ui_interfaces/x11/XcbImage.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbImage.h
rename to src/ui/windows/ui_interfaces/x11/XcbImage.h
diff --git a/src/windows/ui_interfaces/x11/XcbInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbInterface.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbInterface.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbInterface.h b/src/ui/windows/ui_interfaces/x11/XcbInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbInterface.h
rename to src/ui/windows/ui_interfaces/x11/XcbInterface.h
diff --git a/src/windows/ui_interfaces/x11/XcbKeyboard.cpp b/src/ui/windows/ui_interfaces/x11/XcbKeyboard.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbKeyboard.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbKeyboard.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbKeyboard.h b/src/ui/windows/ui_interfaces/x11/XcbKeyboard.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbKeyboard.h
rename to src/ui/windows/ui_interfaces/x11/XcbKeyboard.h
diff --git a/src/windows/ui_interfaces/x11/XcbScreen.cpp b/src/ui/windows/ui_interfaces/x11/XcbScreen.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbScreen.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbScreen.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbScreen.h b/src/ui/windows/ui_interfaces/x11/XcbScreen.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbScreen.h
rename to src/ui/windows/ui_interfaces/x11/XcbScreen.h
diff --git a/src/windows/ui_interfaces/x11/XcbTextInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbTextInterface.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbTextInterface.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbTextInterface.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbTextInterface.h b/src/ui/windows/ui_interfaces/x11/XcbTextInterface.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbTextInterface.h
rename to src/ui/windows/ui_interfaces/x11/XcbTextInterface.h
diff --git a/src/windows/ui_interfaces/x11/XcbWindow.cpp b/src/ui/windows/ui_interfaces/x11/XcbWindow.cpp
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbWindow.cpp
rename to src/ui/windows/ui_interfaces/x11/XcbWindow.cpp
diff --git a/src/windows/ui_interfaces/x11/XcbWindow.h b/src/ui/windows/ui_interfaces/x11/XcbWindow.h
similarity index 100%
rename from src/windows/ui_interfaces/x11/XcbWindow.h
rename to src/ui/windows/ui_interfaces/x11/XcbWindow.h
diff --git a/src/ui_elements/CMakeLists.txt b/src/ui_elements/CMakeLists.txt
deleted file mode 100644
index ef6bbee..0000000
--- a/src/ui_elements/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-list(APPEND ui_elements_LIB_INCLUDES
-        desktop_elements/Keyboard.h
-        desktop_elements/Keyboard.cpp
-        desktop_elements/IPlatformScreen.h
-        desktop_elements/Screen.h
-        desktop_elements/Screen.cpp
-        desktop_elements/IPlatformWindow.h
-        desktop_elements/Window.h
-        desktop_elements/Window.cpp
-        ui_events/KeyboardEvent.h
-        ui_events/KeyboardEvent.cpp
-        ui_events/MouseEvent.h
-        ui_events/MouseEvent.cpp
-        ui_events/UiEvent.h
-        ui_events/UiEvent.cpp
-        ui_events/PaintEvent.h
-        ui_events/PaintEvent.cpp
-        ui_events/ResizeEvent.h
-        ui_events/ResizeEvent.cpp
-        widgets/Widget.h
-        widgets/Widget.cpp
-        widgets/Button.cpp
-        widgets/ButtonGroup.cpp
-        widgets/Label.cpp
-        widgets/HorizontalSpacer.cpp
-        widgets/VerticalSpacer.cpp
-        widgets/StackWidget.cpp
-        widgets/TextBox.cpp
-        style/Theme.cpp
-)
-
-add_library(ui_elements SHARED ${ui_elements_LIB_INCLUDES})
-
-target_include_directories(ui_elements PUBLIC
-                          "${CMAKE_CURRENT_SOURCE_DIR}/"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/widgets"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/style"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/widgets/elements"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/ui_events"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/desktop_elements"                          
-                          )
-target_link_libraries(ui_elements PUBLIC core geometry graphics visual_elements image)
-
-set_property(TARGET ui_elements PROPERTY FOLDER src)
-
-set_target_properties( ui_elements PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
\ No newline at end of file
diff --git a/test/audio/CMakeLists.txt b/test/audio/CMakeLists.txt
index 6015545..00c2696 100644
--- a/test/audio/CMakeLists.txt
+++ b/test/audio/CMakeLists.txt
@@ -2,7 +2,6 @@ set(MODULE_NAME audio)
 
 set(UNIT_TESTS
         ${MODULE_NAME}/unit/TestAudioWriter.cpp
-        ${MODULE_NAME}/unit/TestMidiReader.cpp
 )
 
 if(UNIX)