diff --git a/grid.tscn b/components/grid.tscn
similarity index 94%
rename from grid.tscn
rename to components/grid.tscn
index 51bb08d..f16a405 100644
--- a/grid.tscn
+++ b/components/grid.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://bnfois00347c2"]
 
-[ext_resource type="Script" uid="uid://c1k5pgejmn3bb" path="res://grid.gd" id="1_ebq2e"]
+[ext_resource type="Script" uid="uid://c1k5pgejmn3bb" path="res://components/scripts/grid.gd" id="1_ebq2e"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ebq2e"]
 resource_local_to_scene = true
diff --git a/grid.gd b/components/scripts/grid.gd
similarity index 99%
rename from grid.gd
rename to components/scripts/grid.gd
index b32e44c..0f03054 100644
--- a/grid.gd
+++ b/components/scripts/grid.gd
@@ -20,7 +20,7 @@ var hovered_group: Array
 
 var debug_label: Label
 
-var token = preload("res://token.tscn")
+var token = preload("res://components/token.tscn")
 
 func _ready():
 	debug_label = $"Debug Label"
diff --git a/grid.gd.uid b/components/scripts/grid.gd.uid
similarity index 100%
rename from grid.gd.uid
rename to components/scripts/grid.gd.uid
diff --git a/token.gd b/components/scripts/token.gd
similarity index 100%
rename from token.gd
rename to components/scripts/token.gd
diff --git a/token.gd.uid b/components/scripts/token.gd.uid
similarity index 100%
rename from token.gd.uid
rename to components/scripts/token.gd.uid
diff --git a/token.tscn b/components/token.tscn
similarity index 90%
rename from token.tscn
rename to components/token.tscn
index f4bbf86..5c62d1f 100644
--- a/token.tscn
+++ b/components/token.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://b50otusq306jl"]
 
-[ext_resource type="Script" uid="uid://cy18iue2caocn" path="res://token.gd" id="1_0ucay"]
-[ext_resource type="Texture2D" uid="uid://cqtw7t2uag6f8" path="res://icon.svg" id="1_bd72f"]
+[ext_resource type="Script" uid="uid://cy18iue2caocn" path="res://components/scripts/token.gd" id="1_mep5p"]
+[ext_resource type="Texture2D" uid="uid://cqtw7t2uag6f8" path="res://icon.svg" id="2_lcbe8"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_0ucay"]
 outline_size = 2
@@ -14,7 +14,7 @@ blend_mode = 1
 blend_mode = 2
 
 [node name="Token" type="Node2D"]
-script = ExtResource("1_0ucay")
+script = ExtResource("1_mep5p")
 
 [node name="Debug Label" type="Label" parent="."]
 z_index = 2
@@ -27,7 +27,7 @@ label_settings = SubResource("LabelSettings_0ucay")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 scale = Vector2(0.4, 0.4)
-texture = ExtResource("1_bd72f")
+texture = ExtResource("2_lcbe8")
 centered = false
 
 [node name="Color" type="Polygon2D" parent="."]
diff --git a/game_window.tscn b/game_window.tscn
index 04c37d1..7140c57 100644
--- a/game_window.tscn
+++ b/game_window.tscn
@@ -1,8 +1,9 @@
 [gd_scene load_steps=2 format=3 uid="uid://bai2mcthexgm5"]
 
-[ext_resource type="PackedScene" uid="uid://bnfois00347c2" path="res://grid.tscn" id="1_mn5vm"]
+[ext_resource type="PackedScene" uid="uid://bnfois00347c2" path="res://components/grid.tscn" id="1_mn5vm"]
 
 [node name="GameWindow" type="Node2D"]
 
 [node name="Grid" parent="." instance=ExtResource("1_mn5vm")]
 position = Vector2(393, 224)
+min_group_size = 1