diff --git a/Userland/Applications/PixelPaint/CMakeLists.txt b/Userland/Applications/PixelPaint/CMakeLists.txt
index 2e77fbc740..84252f41ab 100644
--- a/Userland/Applications/PixelPaint/CMakeLists.txt
+++ b/Userland/Applications/PixelPaint/CMakeLists.txt
@@ -9,40 +9,40 @@ compile_gml(PixelPaintWindow.gml PixelPaintWindowGML.h pixel_paint_window_gml)
 compile_gml(EditGuideDialog.gml EditGuideDialogGML.h edit_guide_dialog_gml)
 
 set(SOURCES
-    BrushTool.cpp
-    BucketTool.cpp
-    CloneTool.cpp
     CreateNewImageDialog.cpp
     CreateNewLayerDialog.cpp
     EditGuideDialog.cpp
     EditGuideDialogGML.h
-    EllipseTool.cpp
-    EraseTool.cpp
-    GuideTool.cpp
     Image.cpp
     ImageEditor.cpp
     Layer.cpp
     LayerListWidget.cpp
     LayerPropertiesWidget.cpp
-    LineTool.cpp
     MainWidget.cpp
-    main.cpp
-    MoveTool.cpp
+    Mask.cpp
     PaletteWidget.cpp
-    PenTool.cpp
-    PickerTool.cpp
     PixelPaintWindowGML.h
     ProjectLoader.cpp
-    RectangleTool.cpp
-    RectangleSelectTool.cpp
-    Mask.cpp
     Selection.cpp
-    SprayTool.cpp
-    ToolboxWidget.cpp
     ToolPropertiesWidget.cpp
-    Tool.cpp
-    ZoomTool.cpp
-)
+    ToolboxWidget.cpp
+    Tools/BrushTool.cpp
+    Tools/BucketTool.cpp
+    Tools/CloneTool.cpp
+    Tools/EllipseTool.cpp
+    Tools/EraseTool.cpp
+    Tools/GuideTool.cpp
+    Tools/LineTool.cpp
+    Tools/MoveTool.cpp
+    Tools/PenTool.cpp
+    Tools/PickerTool.cpp
+    Tools/RectangleSelectTool.cpp
+    Tools/RectangleTool.cpp
+    Tools/SprayTool.cpp
+    Tools/Tool.cpp
+    Tools/ZoomTool.cpp
+    main.cpp
+    )
 
 serenity_app(PixelPaint ICON app-pixel-paint)
 target_link_libraries(PixelPaint LibImageDecoderClient LibGUI LibGfx LibFileSystemAccessClient LibConfig)
diff --git a/Userland/Applications/PixelPaint/ImageEditor.cpp b/Userland/Applications/PixelPaint/ImageEditor.cpp
index 9f328f32ea..b4584ef4b4 100644
--- a/Userland/Applications/PixelPaint/ImageEditor.cpp
+++ b/Userland/Applications/PixelPaint/ImageEditor.cpp
@@ -10,8 +10,8 @@
 #include "ImageEditor.h"
 #include "Image.h"
 #include "Layer.h"
-#include "MoveTool.h"
-#include "Tool.h"
+#include "Tools/MoveTool.h"
+#include "Tools/Tool.h"
 #include <LibConfig/Client.h>
 #include <LibGUI/Command.h>
 #include <LibGUI/Painter.h>
diff --git a/Userland/Applications/PixelPaint/MainWidget.h b/Userland/Applications/PixelPaint/MainWidget.h
index 82e74c183b..58cf0e2f26 100644
--- a/Userland/Applications/PixelPaint/MainWidget.h
+++ b/Userland/Applications/PixelPaint/MainWidget.h
@@ -14,9 +14,9 @@
 #include "LayerPropertiesWidget.h"
 #include "PaletteWidget.h"
 #include "ProjectLoader.h"
-#include "Tool.h"
 #include "ToolPropertiesWidget.h"
 #include "ToolboxWidget.h"
+#include "Tools/Tool.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/Forward.h>
 #include <LibGUI/Statusbar.h>
diff --git a/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp b/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp
index 6aa245ea62..bc8d8a8eaa 100644
--- a/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp
+++ b/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "ToolPropertiesWidget.h"
-#include "Tool.h"
+#include "Tools/Tool.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/GroupBox.h>
 
diff --git a/Userland/Applications/PixelPaint/ToolboxWidget.cpp b/Userland/Applications/PixelPaint/ToolboxWidget.cpp
index 5b212e7aad..4f5ffc042c 100644
--- a/Userland/Applications/PixelPaint/ToolboxWidget.cpp
+++ b/Userland/Applications/PixelPaint/ToolboxWidget.cpp
@@ -5,20 +5,20 @@
  */
 
 #include "ToolboxWidget.h"
-#include "BrushTool.h"
-#include "BucketTool.h"
-#include "CloneTool.h"
-#include "EllipseTool.h"
-#include "EraseTool.h"
-#include "GuideTool.h"
-#include "LineTool.h"
-#include "MoveTool.h"
-#include "PenTool.h"
-#include "PickerTool.h"
-#include "RectangleSelectTool.h"
-#include "RectangleTool.h"
-#include "SprayTool.h"
-#include "ZoomTool.h"
+#include "Tools/BrushTool.h"
+#include "Tools/BucketTool.h"
+#include "Tools/CloneTool.h"
+#include "Tools/EllipseTool.h"
+#include "Tools/EraseTool.h"
+#include "Tools/GuideTool.h"
+#include "Tools/LineTool.h"
+#include "Tools/MoveTool.h"
+#include "Tools/PenTool.h"
+#include "Tools/PickerTool.h"
+#include "Tools/RectangleSelectTool.h"
+#include "Tools/RectangleTool.h"
+#include "Tools/SprayTool.h"
+#include "Tools/ZoomTool.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Button.h>
diff --git a/Userland/Applications/PixelPaint/BrushTool.cpp b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp
similarity index 99%
rename from Userland/Applications/PixelPaint/BrushTool.cpp
rename to Userland/Applications/PixelPaint/Tools/BrushTool.cpp
index fa6cea94b3..42d702d898 100644
--- a/Userland/Applications/PixelPaint/BrushTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "BrushTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
diff --git a/Userland/Applications/PixelPaint/BrushTool.h b/Userland/Applications/PixelPaint/Tools/BrushTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/BrushTool.h
rename to Userland/Applications/PixelPaint/Tools/BrushTool.h
diff --git a/Userland/Applications/PixelPaint/BucketTool.cpp b/Userland/Applications/PixelPaint/Tools/BucketTool.cpp
similarity index 98%
rename from Userland/Applications/PixelPaint/BucketTool.cpp
rename to Userland/Applications/PixelPaint/Tools/BucketTool.cpp
index cf255603fb..36595055c4 100644
--- a/Userland/Applications/PixelPaint/BucketTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/BucketTool.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "BucketTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <AK/HashTable.h>
 #include <AK/Queue.h>
 #include <LibGUI/BoxLayout.h>
diff --git a/Userland/Applications/PixelPaint/BucketTool.h b/Userland/Applications/PixelPaint/Tools/BucketTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/BucketTool.h
rename to Userland/Applications/PixelPaint/Tools/BucketTool.h
diff --git a/Userland/Applications/PixelPaint/CloneTool.cpp b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp
similarity index 99%
rename from Userland/Applications/PixelPaint/CloneTool.cpp
rename to Userland/Applications/PixelPaint/Tools/CloneTool.cpp
index 831cc23ac5..3e64180c58 100644
--- a/Userland/Applications/PixelPaint/CloneTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "CloneTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
diff --git a/Userland/Applications/PixelPaint/CloneTool.h b/Userland/Applications/PixelPaint/Tools/CloneTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/CloneTool.h
rename to Userland/Applications/PixelPaint/Tools/CloneTool.h
diff --git a/Userland/Applications/PixelPaint/EllipseTool.cpp b/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp
similarity index 99%
rename from Userland/Applications/PixelPaint/EllipseTool.cpp
rename to Userland/Applications/PixelPaint/Tools/EllipseTool.cpp
index 03fdea3a17..d8feefb90e 100644
--- a/Userland/Applications/PixelPaint/EllipseTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "EllipseTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
diff --git a/Userland/Applications/PixelPaint/EllipseTool.h b/Userland/Applications/PixelPaint/Tools/EllipseTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/EllipseTool.h
rename to Userland/Applications/PixelPaint/Tools/EllipseTool.h
diff --git a/Userland/Applications/PixelPaint/EraseTool.cpp b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp
similarity index 99%
rename from Userland/Applications/PixelPaint/EraseTool.cpp
rename to Userland/Applications/PixelPaint/Tools/EraseTool.cpp
index 8bfd5f365f..8ee0642729 100644
--- a/Userland/Applications/PixelPaint/EraseTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "EraseTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/CheckBox.h>
diff --git a/Userland/Applications/PixelPaint/EraseTool.h b/Userland/Applications/PixelPaint/Tools/EraseTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/EraseTool.h
rename to Userland/Applications/PixelPaint/Tools/EraseTool.h
diff --git a/Userland/Applications/PixelPaint/GuideTool.cpp b/Userland/Applications/PixelPaint/Tools/GuideTool.cpp
similarity index 99%
rename from Userland/Applications/PixelPaint/GuideTool.cpp
rename to Userland/Applications/PixelPaint/Tools/GuideTool.cpp
index 2fee6f6b74..67562651b1 100644
--- a/Userland/Applications/PixelPaint/GuideTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/GuideTool.cpp
@@ -5,8 +5,7 @@
  */
 
 #include "GuideTool.h"
-#include "EditGuideDialog.h"
-#include "ImageEditor.h"
+#include "../EditGuideDialog.h"
 #include <LibGUI/Application.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
diff --git a/Userland/Applications/PixelPaint/GuideTool.h b/Userland/Applications/PixelPaint/Tools/GuideTool.h
similarity index 98%
rename from Userland/Applications/PixelPaint/GuideTool.h
rename to Userland/Applications/PixelPaint/Tools/GuideTool.h
index eefa2a14bc..33faae84a4 100644
--- a/Userland/Applications/PixelPaint/GuideTool.h
+++ b/Userland/Applications/PixelPaint/Tools/GuideTool.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Guide.h"
+#include "../Guide.h"
 #include "Tool.h"
 #include <AK/RefPtr.h>
 
diff --git a/Userland/Applications/PixelPaint/LineTool.cpp b/Userland/Applications/PixelPaint/Tools/LineTool.cpp
similarity index 98%
rename from Userland/Applications/PixelPaint/LineTool.cpp
rename to Userland/Applications/PixelPaint/Tools/LineTool.cpp
index 0810712652..3ba9aeed9c 100644
--- a/Userland/Applications/PixelPaint/LineTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/LineTool.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "LineTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <AK/Math.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
diff --git a/Userland/Applications/PixelPaint/LineTool.h b/Userland/Applications/PixelPaint/Tools/LineTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/LineTool.h
rename to Userland/Applications/PixelPaint/Tools/LineTool.h
diff --git a/Userland/Applications/PixelPaint/MoveTool.cpp b/Userland/Applications/PixelPaint/Tools/MoveTool.cpp
similarity index 96%
rename from Userland/Applications/PixelPaint/MoveTool.cpp
rename to Userland/Applications/PixelPaint/Tools/MoveTool.cpp
index 59bcbb578a..c09172e929 100644
--- a/Userland/Applications/PixelPaint/MoveTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/MoveTool.cpp
@@ -5,13 +5,12 @@
  */
 
 #include "MoveTool.h"
-#include "Image.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../Image.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Window.h>
-#include <LibGfx/Bitmap.h>
 
 namespace PixelPaint {
 
diff --git a/Userland/Applications/PixelPaint/MoveTool.h b/Userland/Applications/PixelPaint/Tools/MoveTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/MoveTool.h
rename to Userland/Applications/PixelPaint/Tools/MoveTool.h
diff --git a/Userland/Applications/PixelPaint/PenTool.cpp b/Userland/Applications/PixelPaint/Tools/PenTool.cpp
similarity index 97%
rename from Userland/Applications/PixelPaint/PenTool.cpp
rename to Userland/Applications/PixelPaint/Tools/PenTool.cpp
index be9cf3e7a4..587755ae8a 100644
--- a/Userland/Applications/PixelPaint/PenTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/PenTool.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PenTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
diff --git a/Userland/Applications/PixelPaint/PenTool.h b/Userland/Applications/PixelPaint/Tools/PenTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/PenTool.h
rename to Userland/Applications/PixelPaint/Tools/PenTool.h
diff --git a/Userland/Applications/PixelPaint/PickerTool.cpp b/Userland/Applications/PixelPaint/Tools/PickerTool.cpp
similarity index 96%
rename from Userland/Applications/PixelPaint/PickerTool.cpp
rename to Userland/Applications/PixelPaint/Tools/PickerTool.cpp
index 1b63284521..955beb545b 100644
--- a/Userland/Applications/PixelPaint/PickerTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/PickerTool.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "PickerTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/CheckBox.h>
 
diff --git a/Userland/Applications/PixelPaint/PickerTool.h b/Userland/Applications/PixelPaint/Tools/PickerTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/PickerTool.h
rename to Userland/Applications/PixelPaint/Tools/PickerTool.h
diff --git a/Userland/Applications/PixelPaint/RectangleSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp
similarity index 99%
rename from Userland/Applications/PixelPaint/RectangleSelectTool.cpp
rename to Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp
index 429ff6e546..ace0316239 100644
--- a/Userland/Applications/PixelPaint/RectangleSelectTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "RectangleSelectTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Button.h>
 #include <LibGUI/ComboBox.h>
diff --git a/Userland/Applications/PixelPaint/RectangleSelectTool.h b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.h
similarity index 98%
rename from Userland/Applications/PixelPaint/RectangleSelectTool.h
rename to Userland/Applications/PixelPaint/Tools/RectangleSelectTool.h
index 1d8fc45907..94705d7b7b 100644
--- a/Userland/Applications/PixelPaint/RectangleSelectTool.h
+++ b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Selection.h"
+#include "../Selection.h"
 #include "Tool.h"
 
 #include <AK/Vector.h>
diff --git a/Userland/Applications/PixelPaint/RectangleTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp
similarity index 99%
rename from Userland/Applications/PixelPaint/RectangleTool.cpp
rename to Userland/Applications/PixelPaint/Tools/RectangleTool.cpp
index cec747c25c..b5b638aeaf 100644
--- a/Userland/Applications/PixelPaint/RectangleTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "RectangleTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <LibGUI/Action.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
diff --git a/Userland/Applications/PixelPaint/RectangleTool.h b/Userland/Applications/PixelPaint/Tools/RectangleTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/RectangleTool.h
rename to Userland/Applications/PixelPaint/Tools/RectangleTool.h
diff --git a/Userland/Applications/PixelPaint/SprayTool.cpp b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp
similarity index 98%
rename from Userland/Applications/PixelPaint/SprayTool.cpp
rename to Userland/Applications/PixelPaint/Tools/SprayTool.cpp
index 0aa431aa8b..711ce0d3db 100644
--- a/Userland/Applications/PixelPaint/SprayTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "SprayTool.h"
-#include "ImageEditor.h"
-#include "Layer.h"
+#include "../ImageEditor.h"
+#include "../Layer.h"
 #include <AK/Math.h>
 #include <AK/Queue.h>
 #include <LibGUI/Action.h>
diff --git a/Userland/Applications/PixelPaint/SprayTool.h b/Userland/Applications/PixelPaint/Tools/SprayTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/SprayTool.h
rename to Userland/Applications/PixelPaint/Tools/SprayTool.h
diff --git a/Userland/Applications/PixelPaint/Tool.cpp b/Userland/Applications/PixelPaint/Tools/Tool.cpp
similarity index 98%
rename from Userland/Applications/PixelPaint/Tool.cpp
rename to Userland/Applications/PixelPaint/Tools/Tool.cpp
index 2d0dbfc92a..27694b9650 100644
--- a/Userland/Applications/PixelPaint/Tool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/Tool.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "Tool.h"
-#include "ImageEditor.h"
+#include "../ImageEditor.h"
 #include <LibGUI/Action.h>
 
 namespace PixelPaint {
diff --git a/Userland/Applications/PixelPaint/Tool.h b/Userland/Applications/PixelPaint/Tools/Tool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/Tool.h
rename to Userland/Applications/PixelPaint/Tools/Tool.h
diff --git a/Userland/Applications/PixelPaint/ZoomTool.cpp b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp
similarity index 98%
rename from Userland/Applications/PixelPaint/ZoomTool.cpp
rename to Userland/Applications/PixelPaint/Tools/ZoomTool.cpp
index 94a50484e9..5bc7769cab 100644
--- a/Userland/Applications/PixelPaint/ZoomTool.cpp
+++ b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "ZoomTool.h"
-#include "ImageEditor.h"
+#include "../ImageEditor.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/ValueSlider.h>
diff --git a/Userland/Applications/PixelPaint/ZoomTool.h b/Userland/Applications/PixelPaint/Tools/ZoomTool.h
similarity index 100%
rename from Userland/Applications/PixelPaint/ZoomTool.h
rename to Userland/Applications/PixelPaint/Tools/ZoomTool.h