diff --git a/src/Autoload/Tools.gd b/src/Autoload/Tools.gd
index d9fbc7fc0..a9f90be79 100644
--- a/src/Autoload/Tools.gd
+++ b/src/Autoload/Tools.gd
@@ -39,9 +39,9 @@ class Slot:
 signal color_changed(color, button)
 
 var _tools = {
-	"RectSelect" : "res://src/Tools/RectSelect.tscn",
-	"ColorSelect" : "res://src/Tools/ColorSelect.tscn",
-	"MagicWand" : "res://src/Tools/MagicWand.tscn",
+	"RectSelect" : "res://src/Tools/SelectionTools/RectSelect.tscn",
+	"ColorSelect" : "res://src/Tools/SelectionTools/ColorSelect.tscn",
+	"MagicWand" : "res://src/Tools/SelectionTools/MagicWand.tscn",
 	"Move" : "res://src/Tools/Move.tscn",
 	"Zoom" : "res://src/Tools/Zoom.tscn",
 	"Pan" : "res://src/Tools/Pan.tscn",
diff --git a/src/Tools/ColorSelect.gd b/src/Tools/SelectionTools/ColorSelect.gd
similarity index 95%
rename from src/Tools/ColorSelect.gd
rename to src/Tools/SelectionTools/ColorSelect.gd
index e1baeb0c2..2028f8d2d 100644
--- a/src/Tools/ColorSelect.gd
+++ b/src/Tools/SelectionTools/ColorSelect.gd
@@ -1,4 +1,4 @@
-extends "res://src/Tools/SelectionTool.gd"
+extends "res://src/Tools/SelectionTools/SelectionTool.gd"
 
 
 func draw_move(_position : Vector2) -> void:
diff --git a/src/Tools/ColorSelect.tscn b/src/Tools/SelectionTools/ColorSelect.tscn
similarity index 83%
rename from src/Tools/ColorSelect.tscn
rename to src/Tools/SelectionTools/ColorSelect.tscn
index 4e76d364c..6ca3f6fd8 100644
--- a/src/Tools/ColorSelect.tscn
+++ b/src/Tools/SelectionTools/ColorSelect.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://src/Tools/BaseTool.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/Tools/ColorSelect.gd" type="Script" id=2]
+[ext_resource path="res://src/Tools/SelectionTools/ColorSelect.gd" type="Script" id=2]
 
 [node name="ToolOptions" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
diff --git a/src/Tools/MagicWand.gd b/src/Tools/SelectionTools/MagicWand.gd
similarity index 97%
rename from src/Tools/MagicWand.gd
rename to src/Tools/SelectionTools/MagicWand.gd
index 62a818aa0..ca1ae6067 100644
--- a/src/Tools/MagicWand.gd
+++ b/src/Tools/SelectionTools/MagicWand.gd
@@ -1,4 +1,4 @@
-extends "res://src/Tools/SelectionTool.gd"
+extends "res://src/Tools/SelectionTools/SelectionTool.gd"
 
 
 func draw_move(_position : Vector2) -> void:
diff --git a/src/Tools/MagicWand.tscn b/src/Tools/SelectionTools/MagicWand.tscn
similarity index 84%
rename from src/Tools/MagicWand.tscn
rename to src/Tools/SelectionTools/MagicWand.tscn
index 6505fba02..9017f8286 100644
--- a/src/Tools/MagicWand.tscn
+++ b/src/Tools/SelectionTools/MagicWand.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://src/Tools/BaseTool.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/Tools/MagicWand.gd" type="Script" id=2]
+[ext_resource path="res://src/Tools/SelectionTools/MagicWand.gd" type="Script" id=2]
 
 [node name="ToolOptions" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
diff --git a/src/Tools/RectSelect.gd b/src/Tools/SelectionTools/RectSelect.gd
similarity index 98%
rename from src/Tools/RectSelect.gd
rename to src/Tools/SelectionTools/RectSelect.gd
index 0d1371bc6..9c5e18c3d 100644
--- a/src/Tools/RectSelect.gd
+++ b/src/Tools/SelectionTools/RectSelect.gd
@@ -1,4 +1,4 @@
-extends "res://src/Tools/SelectionTool.gd"
+extends "res://src/Tools/SelectionTools/SelectionTool.gd"
 
 
 var _rect := Rect2(0, 0, 0, 0)
diff --git a/src/Tools/RectSelect.tscn b/src/Tools/SelectionTools/RectSelect.tscn
similarity index 84%
rename from src/Tools/RectSelect.tscn
rename to src/Tools/SelectionTools/RectSelect.tscn
index 374d6c600..97b8de8ea 100644
--- a/src/Tools/RectSelect.tscn
+++ b/src/Tools/SelectionTools/RectSelect.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://src/Tools/BaseTool.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/Tools/RectSelect.gd" type="Script" id=2]
+[ext_resource path="res://src/Tools/SelectionTools/RectSelect.gd" type="Script" id=2]
 
 [node name="ToolOptions" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
diff --git a/src/Tools/SelectionTool.gd b/src/Tools/SelectionTools/SelectionTool.gd
similarity index 100%
rename from src/Tools/SelectionTool.gd
rename to src/Tools/SelectionTools/SelectionTool.gd
diff --git a/src/Tools/SelectionTool.tscn b/src/Tools/SelectionTools/SelectionTool.tscn
similarity index 83%
rename from src/Tools/SelectionTool.tscn
rename to src/Tools/SelectionTools/SelectionTool.tscn
index a5f451f22..04ff3a1f8 100644
--- a/src/Tools/SelectionTool.tscn
+++ b/src/Tools/SelectionTools/SelectionTool.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://src/Tools/BaseTool.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/Tools/SelectionTool.gd" type="Script" id=2]
+[ext_resource path="res://src/Tools/SelectionTools/SelectionTool.gd" type="Script" id=2]
 
 [node name="ToolOptions" instance=ExtResource( 1 )]
 script = ExtResource( 2 )