diff --git a/icon.svg b/assets/sprites/icon.svg
similarity index 100%
rename from icon.svg
rename to assets/sprites/icon.svg
diff --git a/icon.svg.import b/assets/sprites/icon.svg.import
similarity index 76%
rename from icon.svg.import
rename to assets/sprites/icon.svg.import
index f79c410..a55920f 100644
--- a/icon.svg.import
+++ b/assets/sprites/icon.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://fdqnc2qrrvn1"
-path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
+path="res://.godot/imported/icon.svg-00a55f41757400f7387d4069be498893.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://icon.svg"
-dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
+source_file="res://assets/sprites/icon.svg"
+dest_files=["res://.godot/imported/icon.svg-00a55f41757400f7387d4069be498893.ctex"]
 
 [params]
 
diff --git a/project.godot b/project.godot
index e60b1a6..c6a7881 100644
--- a/project.godot
+++ b/project.godot
@@ -14,7 +14,7 @@ config/name="SantJordiJam25"
 run/main_scene="uid://ctytpqaed0yqx"
 config/features=PackedStringArray("4.4", "GL Compatibility")
 boot_splash/show_image=false
-config/icon="res://icon.svg"
+config/icon="res://assets/sprites/icon.svg"
 
 [display]
 
diff --git a/dragon.tscn b/scenes/dragons/dragon.tscn
similarity index 86%
rename from dragon.tscn
rename to scenes/dragons/dragon.tscn
index 1df9978..b4b3590 100644
--- a/dragon.tscn
+++ b/scenes/dragons/dragon.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://baa8gpicw2yg0"]
 
-[ext_resource type="Texture2D" uid="uid://fdqnc2qrrvn1" path="res://icon.svg" id="1_ixu8j"]
+[ext_resource type="Texture2D" uid="uid://fdqnc2qrrvn1" path="res://assets/sprites/icon.svg" id="1_ixu8j"]
 
 [node name="Dragon" type="Node2D"]
 
diff --git a/scripts/window.gd b/scenes/main.gd
similarity index 100%
rename from scripts/window.gd
rename to scenes/main.gd
diff --git a/scripts/window.gd.uid b/scenes/main.gd.uid
similarity index 100%
rename from scripts/window.gd.uid
rename to scenes/main.gd.uid
diff --git a/base.tscn b/scenes/main.tscn
similarity index 76%
rename from base.tscn
rename to scenes/main.tscn
index a17a324..5edcc6a 100644
--- a/base.tscn
+++ b/scenes/main.tscn
@@ -1,18 +1,18 @@
 [gd_scene load_steps=4 format=3 uid="uid://ctytpqaed0yqx"]
 
-[ext_resource type="Script" uid="uid://3kyt3shje5r1" path="res://scripts/window.gd" id="1_3vi8l"]
-[ext_resource type="Texture2D" uid="uid://fdqnc2qrrvn1" path="res://icon.svg" id="1_rpg24"]
-[ext_resource type="PackedScene" uid="uid://c7nfcgjxqeg7l" path="res://dragon_popup.tscn" id="2_8rhti"]
+[ext_resource type="Script" uid="uid://3kyt3shje5r1" path="res://scenes/main.gd" id="1_sugp2"]
+[ext_resource type="PackedScene" uid="uid://c7nfcgjxqeg7l" path="res://scenes/window/dragon_popup.tscn" id="2_jyhfs"]
+[ext_resource type="Texture2D" uid="uid://fdqnc2qrrvn1" path="res://assets/sprites/icon.svg" id="3_tbgi4"]
 
 [node name="Base" type="Node2D" node_paths=PackedStringArray("dragon_spots")]
-script = ExtResource("1_3vi8l")
-dragon_template = ExtResource("2_8rhti")
+script = ExtResource("1_sugp2")
+dragon_template = ExtResource("2_jyhfs")
 dragon_spots = [NodePath("DragonSpot1"), NodePath("DragonSpot2"), NodePath("DragonSpot3")]
 
 [node name="Icon" type="Sprite2D" parent="."]
 position = Vector2(576, 324)
 scale = Vector2(9, 5.0625)
-texture = ExtResource("1_rpg24")
+texture = ExtResource("3_tbgi4")
 
 [node name="DragonSpot1" type="Node2D" parent="."]
 position = Vector2(259, 450)
diff --git a/scripts/dragon/draggable.gd b/scenes/window/draggable.gd
similarity index 100%
rename from scripts/dragon/draggable.gd
rename to scenes/window/draggable.gd
diff --git a/scripts/dragon/draggable.gd.uid b/scenes/window/draggable.gd.uid
similarity index 100%
rename from scripts/dragon/draggable.gd.uid
rename to scenes/window/draggable.gd.uid
diff --git a/scripts/dragon/dragon.gd b/scenes/window/dragon.gd
similarity index 100%
rename from scripts/dragon/dragon.gd
rename to scenes/window/dragon.gd
diff --git a/scripts/dragon/dragon.gd.uid b/scenes/window/dragon.gd.uid
similarity index 100%
rename from scripts/dragon/dragon.gd.uid
rename to scenes/window/dragon.gd.uid
diff --git a/dragon_popup.tscn b/scenes/window/dragon_popup.tscn
similarity index 84%
rename from dragon_popup.tscn
rename to scenes/window/dragon_popup.tscn
index 766693c..8693128 100644
--- a/dragon_popup.tscn
+++ b/scenes/window/dragon_popup.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=3 uid="uid://c7nfcgjxqeg7l"]
 
-[ext_resource type="Script" uid="uid://bmlkcni4km614" path="res://scripts/dragon/dragon.gd" id="1_ctdir"]
-[ext_resource type="Script" uid="uid://ch7d3wo8ucskb" path="res://scripts/dragon/draggable.gd" id="2_2r6si"]
-[ext_resource type="PackedScene" uid="uid://baa8gpicw2yg0" path="res://dragon.tscn" id="3_ctdir"]
+[ext_resource type="Script" uid="uid://bmlkcni4km614" path="res://scenes/window/dragon.gd" id="1_ctdir"]
+[ext_resource type="Script" uid="uid://ch7d3wo8ucskb" path="res://scenes/window/draggable.gd" id="2_2r6si"]
+[ext_resource type="PackedScene" uid="uid://baa8gpicw2yg0" path="res://scenes/dragons/dragon.tscn" id="3_ctdir"]
 
 [node name="DragonPopup" type="Window"]
 disable_3d = true
diff --git a/scripts/dragon_instantiator.gd b/src/dragon_instantiator.gd
similarity index 100%
rename from scripts/dragon_instantiator.gd
rename to src/dragon_instantiator.gd
diff --git a/scripts/dragon_instantiator.gd.uid b/src/dragon_instantiator.gd.uid
similarity index 100%
rename from scripts/dragon_instantiator.gd.uid
rename to src/dragon_instantiator.gd.uid