diff --git a/DialogDebug_1.tres b/DialogContent/DialogDebug_1.tres
similarity index 86%
rename from DialogDebug_1.tres
rename to DialogContent/DialogDebug_1.tres
index 4f3ea2d..54291c3 100644
--- a/DialogDebug_1.tres
+++ b/DialogContent/DialogDebug_1.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="DialogText" format=3 uid="uid://iprmiuvbd0pj"]
 
-[ext_resource type="Script" uid="uid://d1wmy2e1qhr5h" path="res://DialogText.gd" id="1_d2twj"]
+[ext_resource type="Script" uid="uid://d1wmy2e1qhr5h" path="res://DialogSystem/DialogText.gd" id="1_d2twj"]
 
 [resource]
 script = ExtResource("1_d2twj")
diff --git a/Controllers/DialogContainer.tscn b/DialogSystem/DialogContainer.tscn
similarity index 100%
rename from Controllers/DialogContainer.tscn
rename to DialogSystem/DialogContainer.tscn
diff --git a/Controllers/DialogController.gd b/DialogSystem/DialogController.gd
similarity index 100%
rename from Controllers/DialogController.gd
rename to DialogSystem/DialogController.gd
diff --git a/Controllers/DialogController.gd.uid b/DialogSystem/DialogController.gd.uid
similarity index 100%
rename from Controllers/DialogController.gd.uid
rename to DialogSystem/DialogController.gd.uid
diff --git a/DialogText.gd b/DialogSystem/DialogText.gd
similarity index 100%
rename from DialogText.gd
rename to DialogSystem/DialogText.gd
diff --git a/DialogText.gd.uid b/DialogSystem/DialogText.gd.uid
similarity index 100%
rename from DialogText.gd.uid
rename to DialogSystem/DialogText.gd.uid
diff --git a/Scenes/OneOne.tscn b/Scenes/OneOne.tscn
index 08f68dd..68ba53e 100644
--- a/Scenes/OneOne.tscn
+++ b/Scenes/OneOne.tscn
@@ -1,8 +1,8 @@
 [gd_scene format=4 uid="uid://xensvnomjpi8"]
 
 [ext_resource type="Script" uid="uid://b4nlbrxto0tjp" path="res://Controllers/GameplayController.gd" id="1_abpbi"]
-[ext_resource type="Script" uid="uid://crdpf275pa70b" path="res://Controllers/DialogController.gd" id="2_gsv08"]
-[ext_resource type="PackedScene" uid="uid://xmes6cyca17" path="res://Controllers/DialogContainer.tscn" id="2_qntlo"]
+[ext_resource type="Script" uid="uid://crdpf275pa70b" path="res://DialogSystem/DialogController.gd" id="2_gsv08"]
+[ext_resource type="PackedScene" uid="uid://xmes6cyca17" path="res://DialogSystem/DialogContainer.tscn" id="2_qntlo"]
 [ext_resource type="TileSet" uid="uid://blw0jlvdxyhwl" path="res://Tilesets/delve.tres" id="4_kn2ac"]
 [ext_resource type="PackedScene" uid="uid://dndbf44fkm2ww" path="res://BoxBoy/BoxBoy.tscn" id="5_kn2ac"]
 [ext_resource type="PackedScene" uid="uid://cn8srrkyt4h8e" path="res://ArrowGirl/ArrowGirl.tscn" id="6_ywj2d"]
diff --git a/Scenes/Template.tscn b/Scenes/Template.tscn
index a78ccdd..f429f75 100644
--- a/Scenes/Template.tscn
+++ b/Scenes/Template.tscn
@@ -1,8 +1,8 @@
 [gd_scene format=4 uid="uid://c3plh6bpeq0hs"]
 
 [ext_resource type="Script" uid="uid://b4nlbrxto0tjp" path="res://Controllers/GameplayController.gd" id="1_ik3yq"]
-[ext_resource type="Script" uid="uid://crdpf275pa70b" path="res://Controllers/DialogController.gd" id="2_ec8g2"]
-[ext_resource type="PackedScene" uid="uid://xmes6cyca17" path="res://Controllers/DialogContainer.tscn" id="3_fcd3m"]
+[ext_resource type="Script" uid="uid://crdpf275pa70b" path="res://DialogSystem/DialogController.gd" id="2_ec8g2"]
+[ext_resource type="PackedScene" uid="uid://xmes6cyca17" path="res://DialogSystem/DialogContainer.tscn" id="3_fcd3m"]
 [ext_resource type="TileSet" uid="uid://blw0jlvdxyhwl" path="res://Tilesets/delve.tres" id="4_ekmwr"]
 [ext_resource type="PackedScene" uid="uid://dndbf44fkm2ww" path="res://BoxBoy/BoxBoy.tscn" id="5_rej16"]
 
diff --git a/Workspace.tscn b/Workspace.tscn
index 15709e3..2d8937a 100644
--- a/Workspace.tscn
+++ b/Workspace.tscn
@@ -1,12 +1,12 @@
 [gd_scene format=4 uid="uid://b7ndmr6uvnyqb"]
 
 [ext_resource type="Script" uid="uid://b4nlbrxto0tjp" path="res://Controllers/GameplayController.gd" id="1_uwsjo"]
-[ext_resource type="Script" uid="uid://crdpf275pa70b" path="res://Controllers/DialogController.gd" id="2_lfy71"]
+[ext_resource type="Script" uid="uid://crdpf275pa70b" path="res://DialogSystem/DialogController.gd" id="2_lfy71"]
 [ext_resource type="TileSet" uid="uid://blw0jlvdxyhwl" path="res://Tilesets/delve.tres" id="3_lfy71"]
 [ext_resource type="PackedScene" uid="uid://b1hpr05b5sgww" path="res://Bouncy/Bouncy.tscn" id="4_h2cgl"]
 [ext_resource type="PackedScene" uid="uid://cn8srrkyt4h8e" path="res://ArrowGirl/ArrowGirl.tscn" id="5_5l3e5"]
 [ext_resource type="PackedScene" uid="uid://dndbf44fkm2ww" path="res://BoxBoy/BoxBoy.tscn" id="6_dgurb"]
-[ext_resource type="PackedScene" uid="uid://xmes6cyca17" path="res://Controllers/DialogContainer.tscn" id="7_lfy71"]
+[ext_resource type="PackedScene" uid="uid://xmes6cyca17" path="res://DialogSystem/DialogContainer.tscn" id="7_lfy71"]
 
 [node name="Scene" type="Node" unique_id=1524577592]