diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc80df3..9314e89 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,26 +60,26 @@ set(sources "src/main.cpp"
             "src/RichText/ParagraphStyleData.cpp"
             "src/DrawingProgram/DrawingProgramCache.cpp"
             "src/DrawingProgram/DrawingProgram.cpp"
-            "src/DrawingProgram/BrushTool.cpp"
-            "src/DrawingProgram/TextBoxTool.cpp"
-            "src/DrawingProgram/EraserTool.cpp"
-            "src/DrawingProgram/RectSelectTool.cpp"
-            "src/DrawingProgram/LassoSelectTool.cpp"
-            "src/DrawingProgram/RectDrawTool.cpp"
-            "src/DrawingProgram/EllipseDrawTool.cpp"
-            "src/DrawingProgram/EyeDropperTool.cpp"
-            "src/DrawingProgram/ScreenshotTool.cpp"
-            "src/DrawingProgram/EditTool.cpp"
-            "src/DrawingProgram/ZoomCanvasTool.cpp"
-            "src/DrawingProgram/PanCanvasTool.cpp"
-            "src/DrawingProgram/ImageEditTool.cpp"
-            "src/DrawingProgram/GridModifyTool.cpp"
             "src/DrawingProgram/DrawingProgramSelection.cpp"
-            "src/DrawingProgram/DrawingProgramEditToolBase.cpp"
-            "src/DrawingProgram/DrawingProgramToolBase.cpp"
-            "src/DrawingProgram/EllipseDrawEditTool.cpp"
-            "src/DrawingProgram/RectDrawEditTool.cpp"
-            "src/DrawingProgram/TextBoxEditTool.cpp"
+            "src/DrawingProgram/Tools/BrushTool.cpp"
+            "src/DrawingProgram/Tools/TextBoxTool.cpp"
+            "src/DrawingProgram/Tools/EraserTool.cpp"
+            "src/DrawingProgram/Tools/RectSelectTool.cpp"
+            "src/DrawingProgram/Tools/LassoSelectTool.cpp"
+            "src/DrawingProgram/Tools/RectDrawTool.cpp"
+            "src/DrawingProgram/Tools/EllipseDrawTool.cpp"
+            "src/DrawingProgram/Tools/EyeDropperTool.cpp"
+            "src/DrawingProgram/Tools/ScreenshotTool.cpp"
+            "src/DrawingProgram/Tools/EditTool.cpp"
+            "src/DrawingProgram/Tools/ZoomCanvasTool.cpp"
+            "src/DrawingProgram/Tools/PanCanvasTool.cpp"
+            "src/DrawingProgram/Tools/GridModifyTool.cpp"
+            "src/DrawingProgram/Tools/DrawingProgramToolBase.cpp"
+            "src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.cpp"
+            "src/DrawingProgram/Tools/EditTools/ImageEditTool.cpp"
+            "src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.cpp"
+            "src/DrawingProgram/Tools/EditTools/RectDrawEditTool.cpp"
+            "src/DrawingProgram/Tools/EditTools/TextBoxEditTool.cpp"
             "src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp"
             "src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp"
             "src/DrawingProgram/Layers/DrawingProgramLayerListItem.cpp"
diff --git a/src/DrawCamera.cpp b/src/DrawCamera.cpp
index 6849f14..1232cff 100755
--- a/src/DrawCamera.cpp
+++ b/src/DrawCamera.cpp
@@ -1,5 +1,5 @@
 #include "DrawCamera.hpp"
-#include "DrawingProgram/DrawingProgramToolBase.hpp"
+#include "DrawingProgram/Tools/DrawingProgramToolBase.hpp"
 #include "Helpers/FixedPoint.hpp"
 #include "MainProgram.hpp"
 #include "World.hpp"
diff --git a/src/DrawingProgram/DrawingProgram.cpp b/src/DrawingProgram/DrawingProgram.cpp
index 6a3feca..5b5095d 100644
--- a/src/DrawingProgram/DrawingProgram.cpp
+++ b/src/DrawingProgram/DrawingProgram.cpp
@@ -1,11 +1,11 @@
 #include "DrawingProgram.hpp"
-#include "DrawingProgramToolBase.hpp"
+#include "Tools/DrawingProgramToolBase.hpp"
 #include <include/core/SkPaint.h>
 #include <include/core/SkVertices.h>
 #include "../DrawCamera.hpp"
-#include "EllipseDrawTool.hpp"
-#include "EyeDropperTool.hpp"
-#include "GridModifyTool.hpp"
+#include "Tools/EllipseDrawTool.hpp"
+#include "Tools/EyeDropperTool.hpp"
+#include "Tools/GridModifyTool.hpp"
 #include "../InputManager.hpp"
 #include "../SharedTypes.hpp"
 #include <memory>
@@ -19,7 +19,7 @@
 #include <Helpers/FileDownloader.hpp>
 #include <Helpers/NetworkingObjects/NetObjID.hpp>
 #include <Helpers/StringHelpers.hpp>
-#include "LassoSelectTool.hpp"
+#include "Tools/LassoSelectTool.hpp"
 #include <Helpers/Logger.hpp>
 #include <Helpers/Parallel.hpp>
 #include <cereal/types/unordered_set.hpp>
@@ -28,7 +28,7 @@
 #include <chrono>
 #include "../CanvasComponents/ImageCanvasComponent.hpp"
 
-#include "EraserTool.hpp"
+#include "Tools/EraserTool.hpp"
 
 DrawingProgram::DrawingProgram(World& initWorld):
     world(initWorld),
diff --git a/src/DrawingProgram/DrawingProgram.hpp b/src/DrawingProgram/DrawingProgram.hpp
index bd39694..a16f8dd 100644
--- a/src/DrawingProgram/DrawingProgram.hpp
+++ b/src/DrawingProgram/DrawingProgram.hpp
@@ -1,10 +1,10 @@
 #pragma once
 #include "../DrawData.hpp"
 #include "DrawingProgramCache.hpp"
-#include "GridModifyTool.hpp"
+#include "Tools/GridModifyTool.hpp"
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>
-#include "PanCanvasTool.hpp"
-#include "ZoomCanvasTool.hpp"
+#include "Tools/PanCanvasTool.hpp"
+#include "Tools/ZoomCanvasTool.hpp"
 #include "cereal/archives/portable_binary.hpp"
 #include <include/core/SkCanvas.h>
 #include <include/core/SkPath.h>
@@ -13,7 +13,7 @@
 #include <Helpers/Hashes.hpp>
 #include <Helpers/Random.hpp>
 #include "DrawingProgramSelection.hpp"
-#include "DrawingProgramToolBase.hpp"
+#include "Tools/DrawingProgramToolBase.hpp"
 #include <Helpers/FileDownloader.hpp>
 #include <Helpers/NetworkingObjects/NetObjOrderedList.hpp>
 #include "Layers/DrawingProgramLayerManager.hpp"
diff --git a/src/DrawingProgram/DrawingProgramSelection.cpp b/src/DrawingProgram/DrawingProgramSelection.cpp
index 9c3c175..b90965e 100644
--- a/src/DrawingProgram/DrawingProgramSelection.cpp
+++ b/src/DrawingProgram/DrawingProgramSelection.cpp
@@ -2,7 +2,7 @@
 #include "DrawingProgram.hpp"
 #include "../World.hpp"
 #include "../MainProgram.hpp"
-#include "DrawingProgramToolBase.hpp"
+#include "Tools/DrawingProgramToolBase.hpp"
 #include "Helpers/FixedPoint.hpp"
 #include <Helpers/MathExtras.hpp>
 #include <Helpers/SCollision.hpp>
diff --git a/src/DrawingProgram/BrushTool.cpp b/src/DrawingProgram/Tools/BrushTool.cpp
similarity index 97%
rename from src/DrawingProgram/BrushTool.cpp
rename to src/DrawingProgram/Tools/BrushTool.cpp
index e79c113..4ed4247 100644
--- a/src/DrawingProgram/BrushTool.cpp
+++ b/src/DrawingProgram/Tools/BrushTool.cpp
@@ -1,13 +1,13 @@
 #include "BrushTool.hpp"
 #include <Helpers/ConvertVec.hpp>
-#include "../GUIStuff/GUIManager.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
+#include "../../GUIStuff/GUIManager.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
 #include "DrawingProgramToolBase.hpp"
-#include "../CanvasComponents/BrushStrokeCanvasComponent.hpp"
+#include "../../CanvasComponents/BrushStrokeCanvasComponent.hpp"
 #include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
 #include "Helpers/NetworkingObjects/NetObjWeakPtr.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 #include <chrono>
 
 #define VEL_SMOOTH_MIN 0.6
diff --git a/src/DrawingProgram/BrushTool.hpp b/src/DrawingProgram/Tools/BrushTool.hpp
similarity index 96%
rename from src/DrawingProgram/BrushTool.hpp
rename to src/DrawingProgram/Tools/BrushTool.hpp
index 30a1fc0..7d449ff 100644
--- a/src/DrawingProgram/BrushTool.hpp
+++ b/src/DrawingProgram/Tools/BrushTool.hpp
@@ -6,7 +6,7 @@
 #include <Helpers/SCollision.hpp>
 #include <deque>
 #include <include/core/SkCanvas.h>
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>
 
 class DrawingProgram;
diff --git a/src/DrawingProgram/DrawingProgramToolBase.cpp b/src/DrawingProgram/Tools/DrawingProgramToolBase.cpp
similarity index 100%
rename from src/DrawingProgram/DrawingProgramToolBase.cpp
rename to src/DrawingProgram/Tools/DrawingProgramToolBase.cpp
diff --git a/src/DrawingProgram/DrawingProgramToolBase.hpp b/src/DrawingProgram/Tools/DrawingProgramToolBase.hpp
similarity index 92%
rename from src/DrawingProgram/DrawingProgramToolBase.hpp
rename to src/DrawingProgram/Tools/DrawingProgramToolBase.hpp
index 7d899be..3a27d05 100644
--- a/src/DrawingProgram/DrawingProgramToolBase.hpp
+++ b/src/DrawingProgram/Tools/DrawingProgramToolBase.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <include/core/SkCanvas.h>
-#include "../DrawData.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../DrawData.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 
 class DrawingProgram;
 
diff --git a/src/DrawingProgram/EditTool.cpp b/src/DrawingProgram/Tools/EditTool.cpp
similarity index 96%
rename from src/DrawingProgram/EditTool.cpp
rename to src/DrawingProgram/Tools/EditTool.cpp
index ece6bed..d19426d 100644
--- a/src/DrawingProgram/EditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTool.cpp
@@ -1,18 +1,18 @@
 #include "EditTool.hpp"
 #include <chrono>
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "Helpers/MathExtras.hpp"
 #include "Helpers/SCollision.hpp"
-#include "../SharedTypes.hpp"
+#include "../../SharedTypes.hpp"
 #include <cereal/types/vector.hpp>
 #include <memory>
 
-#include "TextBoxEditTool.hpp"
-#include "RectDrawEditTool.hpp"
-#include "ImageEditTool.hpp"
-#include "EllipseDrawEditTool.hpp"
+#include "EditTools/TextBoxEditTool.hpp"
+#include "EditTools/RectDrawEditTool.hpp"
+#include "EditTools/ImageEditTool.hpp"
+#include "EditTools/EllipseDrawEditTool.hpp"
 
 EditTool::EditTool(DrawingProgram& initDrawP):
     DrawingProgramToolBase(initDrawP)
diff --git a/src/DrawingProgram/EditTool.hpp b/src/DrawingProgram/Tools/EditTool.hpp
similarity index 96%
rename from src/DrawingProgram/EditTool.hpp
rename to src/DrawingProgram/Tools/EditTool.hpp
index 44d5bae..30fd221 100644
--- a/src/DrawingProgram/EditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTool.hpp
@@ -2,11 +2,10 @@
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
 #include <any>
-#include "DrawingProgramEditToolBase.hpp"
+#include "EditTools/DrawingProgramEditToolBase.hpp"
 
 class DrawingProgram;
 
-
 class EditTool : public DrawingProgramToolBase {
     public:
         struct HandleData {
diff --git a/src/DrawingProgram/DrawingProgramEditToolBase.cpp b/src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.cpp
similarity index 92%
rename from src/DrawingProgram/DrawingProgramEditToolBase.cpp
rename to src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.cpp
index 208af3f..2987f01 100644
--- a/src/DrawingProgram/DrawingProgramEditToolBase.cpp
+++ b/src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.cpp
@@ -1,5 +1,5 @@
 #include "DrawingProgramEditToolBase.hpp"
-#include "../MainProgram.hpp"
+#include "../../../MainProgram.hpp"
 
 DrawingProgramEditToolBase::DrawingProgramEditToolBase(DrawingProgram& initDrawP):
     drawP(initDrawP)
diff --git a/src/DrawingProgram/DrawingProgramEditToolBase.hpp b/src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.hpp
similarity index 89%
rename from src/DrawingProgram/DrawingProgramEditToolBase.hpp
rename to src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.hpp
index 1ea66b5..283a784 100644
--- a/src/DrawingProgram/DrawingProgramEditToolBase.hpp
+++ b/src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <include/core/SkCanvas.h>
-#include "../DrawData.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../../DrawData.hpp"
+#include "../../../CanvasComponents/CanvasComponentContainer.hpp"
 
 class DrawingProgram;
 class EditTool;
diff --git a/src/DrawingProgram/EllipseDrawEditTool.cpp b/src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.cpp
similarity index 93%
rename from src/DrawingProgram/EllipseDrawEditTool.cpp
rename to src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.cpp
index fddeb05..32131e9 100644
--- a/src/DrawingProgram/EllipseDrawEditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.cpp
@@ -1,11 +1,11 @@
 #include "EllipseDrawEditTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../World.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../../DrawingProgram.hpp"
+#include "../../../World.hpp"
+#include "../../../MainProgram.hpp"
+#include "../../../DrawData.hpp"
 #include <cereal/types/vector.hpp>
 #include <memory>
-#include "EditTool.hpp"
+#include "../EditTool.hpp"
 
 EllipseDrawEditTool::EllipseDrawEditTool(DrawingProgram& initDrawP):
     DrawingProgramEditToolBase(initDrawP)
diff --git a/src/DrawingProgram/EllipseDrawEditTool.hpp b/src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.hpp
similarity index 86%
rename from src/DrawingProgram/EllipseDrawEditTool.hpp
rename to src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.hpp
index f682f11..a8721da 100644
--- a/src/DrawingProgram/EllipseDrawEditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "DrawingProgramEditToolBase.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
-#include "../CanvasComponents//EllipseCanvasComponent.hpp"
+#include "../../../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../../CanvasComponents//EllipseCanvasComponent.hpp"
 #include <any>
 #include <Helpers/SCollision.hpp>
 
diff --git a/src/DrawingProgram/ImageEditTool.cpp b/src/DrawingProgram/Tools/EditTools/ImageEditTool.cpp
similarity index 89%
rename from src/DrawingProgram/ImageEditTool.cpp
rename to src/DrawingProgram/Tools/EditTools/ImageEditTool.cpp
index 86bb01d..6d6fcfe 100644
--- a/src/DrawingProgram/ImageEditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTools/ImageEditTool.cpp
@@ -1,10 +1,10 @@
 #include "ImageEditTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../CanvasComponents/ImageCanvasComponent.hpp"
-#include "../World.hpp"
-#include "../Toolbar.hpp"
-#include "../MainProgram.hpp"
-#include "../ResourceManager.hpp"
+#include "../../DrawingProgram.hpp"
+#include "../../../CanvasComponents/ImageCanvasComponent.hpp"
+#include "../../../World.hpp"
+#include "../../../Toolbar.hpp"
+#include "../../../MainProgram.hpp"
+#include "../../../ResourceManager.hpp"
 #include "DrawingProgramEditToolBase.hpp"
 #include <fstream>
 
diff --git a/src/DrawingProgram/ImageEditTool.hpp b/src/DrawingProgram/Tools/EditTools/ImageEditTool.hpp
similarity index 100%
rename from src/DrawingProgram/ImageEditTool.hpp
rename to src/DrawingProgram/Tools/EditTools/ImageEditTool.hpp
diff --git a/src/DrawingProgram/RectDrawEditTool.cpp b/src/DrawingProgram/Tools/EditTools/RectDrawEditTool.cpp
similarity index 95%
rename from src/DrawingProgram/RectDrawEditTool.cpp
rename to src/DrawingProgram/Tools/EditTools/RectDrawEditTool.cpp
index 5931e59..0c001b3 100644
--- a/src/DrawingProgram/RectDrawEditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTools/RectDrawEditTool.cpp
@@ -1,9 +1,9 @@
 #include "RectDrawEditTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../World.hpp"
-#include "../MainProgram.hpp"
+#include "../../DrawingProgram.hpp"
+#include "../../../World.hpp"
+#include "../../../MainProgram.hpp"
 #include <memory>
-#include "EditTool.hpp"
+#include "../EditTool.hpp"
 
 RectDrawEditTool::RectDrawEditTool(DrawingProgram& initDrawP):
     DrawingProgramEditToolBase(initDrawP)
diff --git a/src/DrawingProgram/RectDrawEditTool.hpp b/src/DrawingProgram/Tools/EditTools/RectDrawEditTool.hpp
similarity index 92%
rename from src/DrawingProgram/RectDrawEditTool.hpp
rename to src/DrawingProgram/Tools/EditTools/RectDrawEditTool.hpp
index e36e488..ca27183 100644
--- a/src/DrawingProgram/RectDrawEditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTools/RectDrawEditTool.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "DrawingProgramEditToolBase.hpp"
-#include "../CanvasComponents/RectangleCanvasComponent.hpp"
+#include "../../../CanvasComponents/RectangleCanvasComponent.hpp"
 #include <Helpers/SCollision.hpp>
 #include <any>
 
diff --git a/src/DrawingProgram/TextBoxEditTool.cpp b/src/DrawingProgram/Tools/EditTools/TextBoxEditTool.cpp
similarity index 99%
rename from src/DrawingProgram/TextBoxEditTool.cpp
rename to src/DrawingProgram/Tools/EditTools/TextBoxEditTool.cpp
index 9099e2a..c10ecfd 100644
--- a/src/DrawingProgram/TextBoxEditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTools/TextBoxEditTool.cpp
@@ -1,7 +1,7 @@
 #include "TextBoxEditTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../../DrawingProgram.hpp"
+#include "../../../MainProgram.hpp"
+#include "../../../DrawData.hpp"
 #include "Helpers/ConvertVec.hpp"
 #include "Helpers/SCollision.hpp"
 #include <cereal/types/vector.hpp>
@@ -12,7 +12,7 @@
 #include <modules/skparagraph/src/ParagraphBuilderImpl.h>
 #include <modules/skunicode/include/SkUnicode_icu.h>
 #include <memory>
-#include "EditTool.hpp"
+#include "../EditTool.hpp"
 
 using namespace RichText;
 
diff --git a/src/DrawingProgram/TextBoxEditTool.hpp b/src/DrawingProgram/Tools/EditTools/TextBoxEditTool.hpp
similarity index 97%
rename from src/DrawingProgram/TextBoxEditTool.hpp
rename to src/DrawingProgram/Tools/EditTools/TextBoxEditTool.hpp
index 88f66cc..19cd152 100644
--- a/src/DrawingProgram/TextBoxEditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTools/TextBoxEditTool.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../CanvasComponents/TextBoxCanvasComponent.hpp"
+#include "../../../CanvasComponents/TextBoxCanvasComponent.hpp"
 #include "DrawingProgramEditToolBase.hpp"
 #include <Helpers/SCollision.hpp>
 #include <any>
diff --git a/src/DrawingProgram/EllipseDrawTool.cpp b/src/DrawingProgram/Tools/EllipseDrawTool.cpp
similarity index 94%
rename from src/DrawingProgram/EllipseDrawTool.cpp
rename to src/DrawingProgram/Tools/EllipseDrawTool.cpp
index 136bc9c..153f3d7 100644
--- a/src/DrawingProgram/EllipseDrawTool.cpp
+++ b/src/DrawingProgram/Tools/EllipseDrawTool.cpp
@@ -1,13 +1,13 @@
 #include "EllipseDrawTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include "Helpers/MathExtras.hpp"
-#include "../InputManager.hpp"
+#include "../../InputManager.hpp"
 #include <cereal/types/vector.hpp>
-#include "../CanvasComponents/EllipseCanvasComponent.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/EllipseCanvasComponent.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 
 EllipseDrawTool::EllipseDrawTool(DrawingProgram& initDrawP):
     DrawingProgramToolBase(initDrawP)
diff --git a/src/DrawingProgram/EllipseDrawTool.hpp b/src/DrawingProgram/Tools/EllipseDrawTool.hpp
similarity index 94%
rename from src/DrawingProgram/EllipseDrawTool.hpp
rename to src/DrawingProgram/Tools/EllipseDrawTool.hpp
index 9ba6850..56a0eea 100644
--- a/src/DrawingProgram/EllipseDrawTool.hpp
+++ b/src/DrawingProgram/Tools/EllipseDrawTool.hpp
@@ -2,7 +2,7 @@
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 
 class DrawingProgram;
 
diff --git a/src/DrawingProgram/EraserTool.cpp b/src/DrawingProgram/Tools/EraserTool.cpp
similarity index 97%
rename from src/DrawingProgram/EraserTool.cpp
rename to src/DrawingProgram/Tools/EraserTool.cpp
index 346b59f..992bf13 100644
--- a/src/DrawingProgram/EraserTool.cpp
+++ b/src/DrawingProgram/Tools/EraserTool.cpp
@@ -1,7 +1,7 @@
 #include "EraserTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include <include/core/SkPathBuilder.h>
 
 EraserTool::EraserTool(DrawingProgram& initDrawP):
diff --git a/src/DrawingProgram/EraserTool.hpp b/src/DrawingProgram/Tools/EraserTool.hpp
similarity index 93%
rename from src/DrawingProgram/EraserTool.hpp
rename to src/DrawingProgram/Tools/EraserTool.hpp
index 5e12d35..ce13d5d 100644
--- a/src/DrawingProgram/EraserTool.hpp
+++ b/src/DrawingProgram/Tools/EraserTool.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include <include/core/SkCanvas.h>
-#include "../DrawData.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
-#include "DrawingProgramCache.hpp"
+#include "../DrawingProgramCache.hpp"
 
 class DrawingProgram;
 
diff --git a/src/DrawingProgram/EyeDropperTool.cpp b/src/DrawingProgram/Tools/EyeDropperTool.cpp
similarity index 97%
rename from src/DrawingProgram/EyeDropperTool.cpp
rename to src/DrawingProgram/Tools/EyeDropperTool.cpp
index 3c44646..cfb458b 100644
--- a/src/DrawingProgram/EyeDropperTool.cpp
+++ b/src/DrawingProgram/Tools/EyeDropperTool.cpp
@@ -1,7 +1,7 @@
 #include "EyeDropperTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include <include/core/SkAlphaType.h>
 #include <include/core/SkCanvas.h>
diff --git a/src/DrawingProgram/EyeDropperTool.hpp b/src/DrawingProgram/Tools/EyeDropperTool.hpp
similarity index 100%
rename from src/DrawingProgram/EyeDropperTool.hpp
rename to src/DrawingProgram/Tools/EyeDropperTool.hpp
diff --git a/src/DrawingProgram/GridModifyTool.cpp b/src/DrawingProgram/Tools/GridModifyTool.cpp
similarity index 98%
rename from src/DrawingProgram/GridModifyTool.cpp
rename to src/DrawingProgram/Tools/GridModifyTool.cpp
index 2fafd1a..1806ddb 100644
--- a/src/DrawingProgram/GridModifyTool.cpp
+++ b/src/DrawingProgram/Tools/GridModifyTool.cpp
@@ -1,7 +1,7 @@
 #include "GridModifyTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "Helpers/Networking/NetLibrary.hpp"
 #include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>
diff --git a/src/DrawingProgram/GridModifyTool.hpp b/src/DrawingProgram/Tools/GridModifyTool.hpp
similarity index 97%
rename from src/DrawingProgram/GridModifyTool.hpp
rename to src/DrawingProgram/Tools/GridModifyTool.hpp
index 5ba0a74..fc392e2 100644
--- a/src/DrawingProgram/GridModifyTool.hpp
+++ b/src/DrawingProgram/Tools/GridModifyTool.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "DrawingProgramToolBase.hpp"
-#include "../WorldGrid.hpp"
+#include "../../WorldGrid.hpp"
 #include "Helpers/NetworkingObjects/NetObjWeakPtr.hpp"
 
 class DrawingProgram;
diff --git a/src/DrawingProgram/LassoSelectTool.cpp b/src/DrawingProgram/Tools/LassoSelectTool.cpp
similarity index 96%
rename from src/DrawingProgram/LassoSelectTool.cpp
rename to src/DrawingProgram/Tools/LassoSelectTool.cpp
index e19dd5d..81a96ff 100644
--- a/src/DrawingProgram/LassoSelectTool.cpp
+++ b/src/DrawingProgram/Tools/LassoSelectTool.cpp
@@ -1,13 +1,13 @@
 #include "LassoSelectTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include "Helpers/MathExtras.hpp"
 #include "Helpers/SCollision.hpp"
-#include "../CoordSpaceHelper.hpp"
+#include "../../CoordSpaceHelper.hpp"
 #include <ranges>
-#include "../DrawCollision.hpp"
+#include "../../DrawCollision.hpp"
 #include <earcut.hpp>
 #include <include/core/SkPathBuilder.h>
 
diff --git a/src/DrawingProgram/LassoSelectTool.hpp b/src/DrawingProgram/Tools/LassoSelectTool.hpp
similarity index 93%
rename from src/DrawingProgram/LassoSelectTool.hpp
rename to src/DrawingProgram/Tools/LassoSelectTool.hpp
index b67d5ca..2980259 100644
--- a/src/DrawingProgram/LassoSelectTool.hpp
+++ b/src/DrawingProgram/Tools/LassoSelectTool.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include <include/core/SkCanvas.h>
-#include "../DrawData.hpp"
+#include "../../DrawData.hpp"
 #include <Helpers/SCollision.hpp>
-#include "../CoordSpaceHelper.hpp"
+#include "../../CoordSpaceHelper.hpp"
 #include "DrawingProgramToolBase.hpp"
 
 class DrawingProgram;
diff --git a/src/DrawingProgram/PanCanvasTool.cpp b/src/DrawingProgram/Tools/PanCanvasTool.cpp
similarity index 91%
rename from src/DrawingProgram/PanCanvasTool.cpp
rename to src/DrawingProgram/Tools/PanCanvasTool.cpp
index 6af1f76..b8d60b1 100644
--- a/src/DrawingProgram/PanCanvasTool.cpp
+++ b/src/DrawingProgram/Tools/PanCanvasTool.cpp
@@ -1,7 +1,7 @@
 #include "PanCanvasTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/Logger.hpp>
 
diff --git a/src/DrawingProgram/PanCanvasTool.hpp b/src/DrawingProgram/Tools/PanCanvasTool.hpp
similarity index 100%
rename from src/DrawingProgram/PanCanvasTool.hpp
rename to src/DrawingProgram/Tools/PanCanvasTool.hpp
diff --git a/src/DrawingProgram/RectDrawTool.cpp b/src/DrawingProgram/Tools/RectDrawTool.cpp
similarity index 95%
rename from src/DrawingProgram/RectDrawTool.cpp
rename to src/DrawingProgram/Tools/RectDrawTool.cpp
index 8136ad8..1ff9070 100644
--- a/src/DrawingProgram/RectDrawTool.cpp
+++ b/src/DrawingProgram/Tools/RectDrawTool.cpp
@@ -1,10 +1,10 @@
 #include "RectDrawTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
-#include "../CanvasComponents/RectangleCanvasComponent.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/RectangleCanvasComponent.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 
 RectDrawTool::RectDrawTool(DrawingProgram& initDrawP):
     DrawingProgramToolBase(initDrawP)
diff --git a/src/DrawingProgram/RectDrawTool.hpp b/src/DrawingProgram/Tools/RectDrawTool.hpp
similarity index 94%
rename from src/DrawingProgram/RectDrawTool.hpp
rename to src/DrawingProgram/Tools/RectDrawTool.hpp
index 2131585..41f262c 100644
--- a/src/DrawingProgram/RectDrawTool.hpp
+++ b/src/DrawingProgram/Tools/RectDrawTool.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 
 class DrawingProgram;
 
diff --git a/src/DrawingProgram/RectSelectTool.cpp b/src/DrawingProgram/Tools/RectSelectTool.cpp
similarity index 95%
rename from src/DrawingProgram/RectSelectTool.cpp
rename to src/DrawingProgram/Tools/RectSelectTool.cpp
index 237f8bd..980b221 100644
--- a/src/DrawingProgram/RectSelectTool.cpp
+++ b/src/DrawingProgram/Tools/RectSelectTool.cpp
@@ -1,11 +1,11 @@
 #include "RectSelectTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include "Helpers/MathExtras.hpp"
 #include "Helpers/SCollision.hpp"
-#include "../CoordSpaceHelper.hpp"
+#include "../../CoordSpaceHelper.hpp"
 
 RectSelectTool::RectSelectTool(DrawingProgram& initDrawP):
     DrawingProgramToolBase(initDrawP)
diff --git a/src/DrawingProgram/RectSelectTool.hpp b/src/DrawingProgram/Tools/RectSelectTool.hpp
similarity index 96%
rename from src/DrawingProgram/RectSelectTool.hpp
rename to src/DrawingProgram/Tools/RectSelectTool.hpp
index 63bd61e..4d0aa71 100644
--- a/src/DrawingProgram/RectSelectTool.hpp
+++ b/src/DrawingProgram/Tools/RectSelectTool.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
-#include "../CoordSpaceHelper.hpp"
+#include "../../CoordSpaceHelper.hpp"
 
 class DrawingProgram;
 
diff --git a/src/DrawingProgram/ScreenshotTool.cpp b/src/DrawingProgram/Tools/ScreenshotTool.cpp
similarity index 99%
rename from src/DrawingProgram/ScreenshotTool.cpp
rename to src/DrawingProgram/Tools/ScreenshotTool.cpp
index a1fc949..0f06597 100644
--- a/src/DrawingProgram/ScreenshotTool.cpp
+++ b/src/DrawingProgram/Tools/ScreenshotTool.cpp
@@ -1,7 +1,7 @@
 #include "ScreenshotTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include "Helpers/SCollision.hpp"
 #include <include/core/SkAlphaType.h>
@@ -19,7 +19,7 @@
 #include <include/encode/SkJpegEncoder.h>
 #include <fstream>
 #include <include/gpu/GpuTypes.h>
-#include "../FileHelpers.hpp"
+#include "../../FileHelpers.hpp"
 #include <filesystem>
 #ifdef USE_SKIA_BACKEND_GRAPHITE
     #include <include/gpu/graphite/Surface.h>
@@ -27,10 +27,10 @@
     #include <include/gpu/ganesh/GrDirectContext.h>
     #include <include/gpu/ganesh/SkSurfaceGanesh.h>
 #endif
-#include "../GridManager.hpp"
+#include "../../GridManager.hpp"
 #include <Helpers/Logger.hpp>
 
-#include "../MainProgram.hpp"
+#include "../../MainProgram.hpp"
 
 #ifdef __EMSCRIPTEN__
     #include <EmscriptenHelpers/emscripten_browser_file.h>
diff --git a/src/DrawingProgram/ScreenshotTool.hpp b/src/DrawingProgram/Tools/ScreenshotTool.hpp
similarity index 97%
rename from src/DrawingProgram/ScreenshotTool.hpp
rename to src/DrawingProgram/Tools/ScreenshotTool.hpp
index 58b7c0a..0e5ef1a 100644
--- a/src/DrawingProgram/ScreenshotTool.hpp
+++ b/src/DrawingProgram/Tools/ScreenshotTool.hpp
@@ -2,8 +2,8 @@
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
 #include <filesystem>
-#include "../InputManager.hpp"
-#include "../CoordSpaceHelper.hpp"
+#include "../../InputManager.hpp"
+#include "../../CoordSpaceHelper.hpp"
 
 class DrawingProgram;
 
diff --git a/src/DrawingProgram/TextBoxTool.cpp b/src/DrawingProgram/Tools/TextBoxTool.cpp
similarity index 94%
rename from src/DrawingProgram/TextBoxTool.cpp
rename to src/DrawingProgram/Tools/TextBoxTool.cpp
index 6c03904..3bde9f3 100644
--- a/src/DrawingProgram/TextBoxTool.cpp
+++ b/src/DrawingProgram/Tools/TextBoxTool.cpp
@@ -1,14 +1,14 @@
 #include "TextBoxTool.hpp"
 #include <chrono>
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "Helpers/MathExtras.hpp"
 #include "Helpers/SCollision.hpp"
 #include <cereal/types/vector.hpp>
 #include <memory>
-#include "../CanvasComponents/TextBoxCanvasComponent.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/TextBoxCanvasComponent.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 #include "EditTool.hpp"
 
 TextBoxTool::TextBoxTool(DrawingProgram& initDrawP):
diff --git a/src/DrawingProgram/TextBoxTool.hpp b/src/DrawingProgram/Tools/TextBoxTool.hpp
similarity index 93%
rename from src/DrawingProgram/TextBoxTool.hpp
rename to src/DrawingProgram/Tools/TextBoxTool.hpp
index 8e24b00..178735d 100644
--- a/src/DrawingProgram/TextBoxTool.hpp
+++ b/src/DrawingProgram/Tools/TextBoxTool.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 
 class DrawingProgram;
 
diff --git a/src/DrawingProgram/ZoomCanvasTool.cpp b/src/DrawingProgram/Tools/ZoomCanvasTool.cpp
similarity index 91%
rename from src/DrawingProgram/ZoomCanvasTool.cpp
rename to src/DrawingProgram/Tools/ZoomCanvasTool.cpp
index 4e4a355..c896d30 100644
--- a/src/DrawingProgram/ZoomCanvasTool.cpp
+++ b/src/DrawingProgram/Tools/ZoomCanvasTool.cpp
@@ -1,7 +1,7 @@
 #include "ZoomCanvasTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/Logger.hpp>
 
diff --git a/src/DrawingProgram/ZoomCanvasTool.hpp b/src/DrawingProgram/Tools/ZoomCanvasTool.hpp
similarity index 100%
rename from src/DrawingProgram/ZoomCanvasTool.hpp
rename to src/DrawingProgram/Tools/ZoomCanvasTool.hpp
diff --git a/src/MainProgram.cpp b/src/MainProgram.cpp
index 33105fe..8a34033 100755
--- a/src/MainProgram.cpp
+++ b/src/MainProgram.cpp
@@ -1,9 +1,5 @@
 #include "MainProgram.hpp"
-#include "DrawingProgram/DrawingProgramToolBase.hpp"
-#include "Helpers/NetworkingObjects/NetObjManagerTypeList.hpp"
 #include "VersionConstants.hpp"
-#include "cereal/archives/portable_binary.hpp"
-#include "cereal/details/helpers.hpp"
 #include <SDL3/SDL_render.h>
 #include <SDL3/SDL_video.h>
 #include <chrono>
diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp
index 5d258cf..a548f92 100644
--- a/src/Toolbar.cpp
+++ b/src/Toolbar.cpp
@@ -1,7 +1,6 @@
 #include "Toolbar.hpp"
-#include "DrawingProgram/DrawingProgramToolBase.hpp"
-#include "DrawingProgram/ScreenshotTool.hpp"
-#include "FontData.hpp"
+#include "DrawingProgram/Tools/DrawingProgramToolBase.hpp"
+#include "DrawingProgram/Tools/ScreenshotTool.hpp"
 #include "Helpers/ConvertVec.hpp"
 #include "Helpers/FileDownloader.hpp"
 #include "Helpers/Networking/NetLibrary.hpp"