diff --git a/LICENSE.md b/LICENSE.md
index 42155526..f24c8909 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -89,7 +89,7 @@ SOFTWARE.
 ---
 
 [UI Space Minimalism](https://wenrexa.itch.io/nesia04) released by [Wenrexa](https://wenrexa.itch.io/), licensed under [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/):
-- Background
+- splash_screen
 
 ---
 
@@ -114,4 +114,4 @@ SOFTWARE.
 ---
 
 Icon created by [Justin Spahr-Summers](https://github.com/jspahrsummers) for this project, using [Claude](https://claude.ai):
-- icon.svg
+- icon
diff --git a/ships/pirate.gd b/actors/pirate.gd
similarity index 100%
rename from ships/pirate.gd
rename to actors/pirate.gd
diff --git a/ships/player.gd b/actors/player.gd
similarity index 100%
rename from ships/player.gd
rename to actors/player.gd
diff --git a/effects/explosions/assets/audio/chunky_explosion.mp3.import b/effects/explosions/assets/audio/chunky_explosion.mp3.import
deleted file mode 100644
index 1a5122e2..00000000
--- a/effects/explosions/assets/audio/chunky_explosion.mp3.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://b8tpfftx3si3h"
-path="res://.godot/imported/chunky_explosion.mp3-871e660155121b009606ac469f1b5b76.mp3str"
-
-[deps]
-
-source_file="res://effects/explosions/assets/audio/chunky_explosion.mp3"
-dest_files=["res://.godot/imported/chunky_explosion.mp3-871e660155121b009606ac469f1b5b76.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/effects/explosions/assets/audio/explosion_01.ogg.import b/effects/explosions/assets/audio/explosion_01.ogg.import
deleted file mode 100644
index a57d076d..00000000
--- a/effects/explosions/assets/audio/explosion_01.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://diop5t8vtda88"
-path="res://.godot/imported/explosion_01.ogg-e3186f05efbd2ea59858d6667af2e093.oggvorbisstr"
-
-[deps]
-
-source_file="res://effects/explosions/assets/audio/explosion_01.ogg"
-dest_files=["res://.godot/imported/explosion_01.ogg-e3186f05efbd2ea59858d6667af2e093.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/effects/hyperspace/teleport_02_slowed.ogg.import b/effects/hyperspace/teleport_02_slowed.ogg.import
deleted file mode 100644
index 48f6e2e0..00000000
--- a/effects/hyperspace/teleport_02_slowed.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://cmjfgigj57eie"
-path="res://.godot/imported/teleport_02_slowed.ogg-a9498f4fae9db85b3bc1070c636fe8dd.oggvorbisstr"
-
-[deps]
-
-source_file="res://effects/hyperspace/teleport_02_slowed.ogg"
-dest_files=["res://.godot/imported/teleport_02_slowed.ogg-a9498f4fae9db85b3bc1070c636fe8dd.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0.0
-bpm=0.0
-beat_count=0
-bar_beats=4
diff --git a/effects/engine_glow/engine_glow.gdshader b/fx/engine_glow/engine_glow.gdshader
similarity index 100%
rename from effects/engine_glow/engine_glow.gdshader
rename to fx/engine_glow/engine_glow.gdshader
diff --git a/effects/engine_glow/engine_glow.tscn b/fx/engine_glow/engine_glow.tscn
similarity index 88%
rename from effects/engine_glow/engine_glow.tscn
rename to fx/engine_glow/engine_glow.tscn
index 62da7da9..ce9c22da 100644
--- a/effects/engine_glow/engine_glow.tscn
+++ b/fx/engine_glow/engine_glow.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://dbc2usdmy5wf3"]
 
-[ext_resource type="Material" uid="uid://bekvqqr3ue7vm" path="res://effects/engine_glow/engine_glow_mat.tres" id="1_agefk"]
+[ext_resource type="Material" uid="uid://bekvqqr3ue7vm" path="res://fx/engine_glow/engine_glow_mat.tres" id="1_agefk"]
 
 [sub_resource type="QuadMesh" id="QuadMesh_brk2s"]
 material = ExtResource("1_agefk")
diff --git a/effects/engine_glow/engine_glow_mat.tres b/fx/engine_glow/engine_glow_mat.tres
similarity index 70%
rename from effects/engine_glow/engine_glow_mat.tres
rename to fx/engine_glow/engine_glow_mat.tres
index 7db8c7d7..2f174d15 100644
--- a/effects/engine_glow/engine_glow_mat.tres
+++ b/fx/engine_glow/engine_glow_mat.tres
@@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://bekvqqr3ue7vm"]
 
-[ext_resource type="Shader" path="res://effects/engine_glow/engine_glow.gdshader" id="1_hf1b4"]
+[ext_resource type="Shader" path="res://fx/engine_glow/engine_glow.gdshader" id="1_hf1b4"]
 
 [resource]
 render_priority = 0
diff --git a/effects/explosions/assets/audio/chunky_explosion.mp3 b/fx/explosions/audio/chunky_explosion.mp3
similarity index 100%
rename from effects/explosions/assets/audio/chunky_explosion.mp3
rename to fx/explosions/audio/chunky_explosion.mp3
diff --git a/fx/explosions/audio/chunky_explosion.mp3.import b/fx/explosions/audio/chunky_explosion.mp3.import
new file mode 100644
index 00000000..6b636dad
--- /dev/null
+++ b/fx/explosions/audio/chunky_explosion.mp3.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://b8tpfftx3si3h"
+path="res://.godot/imported/chunky_explosion.mp3-0a6d578b8df6bbc2d681c83e8fbafdc1.mp3str"
+
+[deps]
+
+source_file="res://fx/explosions/audio/chunky_explosion.mp3"
+dest_files=["res://.godot/imported/chunky_explosion.mp3-0a6d578b8df6bbc2d681c83e8fbafdc1.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/effects/explosions/assets/audio/explosion_01.ogg b/fx/explosions/audio/explosion_01.ogg
similarity index 100%
rename from effects/explosions/assets/audio/explosion_01.ogg
rename to fx/explosions/audio/explosion_01.ogg
diff --git a/fx/explosions/audio/explosion_01.ogg.import b/fx/explosions/audio/explosion_01.ogg.import
new file mode 100644
index 00000000..0a4a8f98
--- /dev/null
+++ b/fx/explosions/audio/explosion_01.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://diop5t8vtda88"
+path="res://.godot/imported/explosion_01.ogg-127486c738bdfc4b18300354787e4c3c.oggvorbisstr"
+
+[deps]
+
+source_file="res://fx/explosions/audio/explosion_01.ogg"
+dest_files=["res://.godot/imported/explosion_01.ogg-127486c738bdfc4b18300354787e4c3c.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/effects/explosions/explosion.gd b/fx/explosions/explosion.gd
similarity index 100%
rename from effects/explosions/explosion.gd
rename to fx/explosions/explosion.gd
diff --git a/effects/explosions/explosion001.tscn b/fx/explosions/explosion001.tscn
similarity index 98%
rename from effects/explosions/explosion001.tscn
rename to fx/explosions/explosion001.tscn
index a07ddcf2..d3c8c355 100644
--- a/effects/explosions/explosion001.tscn
+++ b/fx/explosions/explosion001.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=69 format=3 uid="uid://cp0b07jvhi5a"]
 
-[ext_resource type="Texture2D" uid="uid://b6opvnyfhldc1" path="res://effects/explosions/assets/textures/explosion001_halfsize.png" id="1_1kj6i"]
-[ext_resource type="Script" path="res://effects/explosions/explosion.gd" id="2_nmnfi"]
-[ext_resource type="AudioStream" uid="uid://diop5t8vtda88" path="res://effects/explosions/assets/audio/explosion_01.ogg" id="3_kq24d"]
+[ext_resource type="Texture2D" uid="uid://b6opvnyfhldc1" path="res://fx/explosions/textures/explosion001_halfsize.png" id="1_1kj6i"]
+[ext_resource type="Script" path="res://fx/explosions/explosion.gd" id="2_nmnfi"]
+[ext_resource type="AudioStream" uid="uid://diop5t8vtda88" path="res://fx/explosions/audio/explosion_01.ogg" id="3_kq24d"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_xt22u"]
 atlas = ExtResource("1_1kj6i")
diff --git a/effects/explosions/explosion002.tscn b/fx/explosions/explosion002.tscn
similarity index 98%
rename from effects/explosions/explosion002.tscn
rename to fx/explosions/explosion002.tscn
index c9c35406..584fb9b6 100644
--- a/effects/explosions/explosion002.tscn
+++ b/fx/explosions/explosion002.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=69 format=3 uid="uid://cdyo800b83x5i"]
 
-[ext_resource type="Texture2D" uid="uid://0aaekoo13gdw" path="res://effects/explosions/assets/textures/explosion002_fullsize.png" id="1_lbape"]
-[ext_resource type="Script" path="res://effects/explosions/explosion.gd" id="2_746tl"]
-[ext_resource type="AudioStream" uid="uid://b8tpfftx3si3h" path="res://effects/explosions/assets/audio/chunky_explosion.mp3" id="3_ll7lb"]
+[ext_resource type="Texture2D" uid="uid://0aaekoo13gdw" path="res://fx/explosions/textures/explosion002_fullsize.png" id="1_lbape"]
+[ext_resource type="Script" path="res://fx/explosions/explosion.gd" id="2_746tl"]
+[ext_resource type="AudioStream" uid="uid://b8tpfftx3si3h" path="res://fx/explosions/audio/chunky_explosion.mp3" id="3_ll7lb"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_b2xa6"]
 atlas = ExtResource("1_lbape")
diff --git a/effects/explosions/assets/textures/explosion001_halfsize.png b/fx/explosions/textures/explosion001_halfsize.png
similarity index 100%
rename from effects/explosions/assets/textures/explosion001_halfsize.png
rename to fx/explosions/textures/explosion001_halfsize.png
diff --git a/effects/explosions/assets/textures/explosion001_halfsize.png.import b/fx/explosions/textures/explosion001_halfsize.png.import
similarity index 67%
rename from effects/explosions/assets/textures/explosion001_halfsize.png.import
rename to fx/explosions/textures/explosion001_halfsize.png.import
index 4b599b91..a4fb97b5 100644
--- a/effects/explosions/assets/textures/explosion001_halfsize.png.import
+++ b/fx/explosions/textures/explosion001_halfsize.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b6opvnyfhldc1"
-path.s3tc="res://.godot/imported/explosion001_halfsize.png-f2253b0beb9418b653ea2a83464366a7.s3tc.ctex"
+path.s3tc="res://.godot/imported/explosion001_halfsize.png-1253f3e363737426d2f894160be23634.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://effects/explosions/assets/textures/explosion001_halfsize.png"
-dest_files=["res://.godot/imported/explosion001_halfsize.png-f2253b0beb9418b653ea2a83464366a7.s3tc.ctex"]
+source_file="res://fx/explosions/textures/explosion001_halfsize.png"
+dest_files=["res://.godot/imported/explosion001_halfsize.png-1253f3e363737426d2f894160be23634.s3tc.ctex"]
 
 [params]
 
diff --git a/effects/explosions/assets/textures/explosion002_fullsize.png b/fx/explosions/textures/explosion002_fullsize.png
similarity index 100%
rename from effects/explosions/assets/textures/explosion002_fullsize.png
rename to fx/explosions/textures/explosion002_fullsize.png
diff --git a/effects/explosions/assets/textures/explosion002_fullsize.png.import b/fx/explosions/textures/explosion002_fullsize.png.import
similarity index 67%
rename from effects/explosions/assets/textures/explosion002_fullsize.png.import
rename to fx/explosions/textures/explosion002_fullsize.png.import
index 549ff5bd..f9534e8a 100644
--- a/effects/explosions/assets/textures/explosion002_fullsize.png.import
+++ b/fx/explosions/textures/explosion002_fullsize.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://0aaekoo13gdw"
-path.s3tc="res://.godot/imported/explosion002_fullsize.png-7eb3b26033b0d5ea0146171c3b8b574d.s3tc.ctex"
+path.s3tc="res://.godot/imported/explosion002_fullsize.png-787e43428866b606cb5229dd1078d39e.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://effects/explosions/assets/textures/explosion002_fullsize.png"
-dest_files=["res://.godot/imported/explosion002_fullsize.png-7eb3b26033b0d5ea0146171c3b8b574d.s3tc.ctex"]
+source_file="res://fx/explosions/textures/explosion002_fullsize.png"
+dest_files=["res://.godot/imported/explosion002_fullsize.png-787e43428866b606cb5229dd1078d39e.s3tc.ctex"]
 
 [params]
 
diff --git a/effects/hyperspace/hyperspace_effect.gd b/fx/hyperspace/hyperspace_effect.gd
similarity index 100%
rename from effects/hyperspace/hyperspace_effect.gd
rename to fx/hyperspace/hyperspace_effect.gd
diff --git a/effects/hyperspace/teleport_02_slowed.ogg b/fx/hyperspace/teleport_02_slowed.ogg
similarity index 100%
rename from effects/hyperspace/teleport_02_slowed.ogg
rename to fx/hyperspace/teleport_02_slowed.ogg
diff --git a/fx/hyperspace/teleport_02_slowed.ogg.import b/fx/hyperspace/teleport_02_slowed.ogg.import
new file mode 100644
index 00000000..cfbffe59
--- /dev/null
+++ b/fx/hyperspace/teleport_02_slowed.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cmjfgigj57eie"
+path="res://.godot/imported/teleport_02_slowed.ogg-82e1388b974c89e4c09d7449b32f429d.oggvorbisstr"
+
+[deps]
+
+source_file="res://fx/hyperspace/teleport_02_slowed.ogg"
+dest_files=["res://.godot/imported/teleport_02_slowed.ogg-82e1388b974c89e4c09d7449b32f429d.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4
diff --git a/gui/target_overlay_mat.tres b/fx/target_overlay_mat.tres
similarity index 100%
rename from gui/target_overlay_mat.tres
rename to fx/target_overlay_mat.tres
diff --git a/galaxy/main_galaxy.tres b/galaxy/main_galaxy.tres
index 88db102c..de90b347 100644
--- a/galaxy/main_galaxy.tres
+++ b/galaxy/main_galaxy.tres
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://galaxy/galaxy.gd" id="1_bckai"]
 [ext_resource type="Script" path="res://galaxy/star_systems/star_system.gd" id="2_mnbif"]
-[ext_resource type="Resource" uid="uid://cew4x137v08q" path="res://galaxy/sol.tres" id="2_tjv58"]
+[ext_resource type="Resource" uid="uid://cew4x137v08q" path="res://galaxy/star_systems/sol.tres" id="2_va8e4"]
 
 [sub_resource type="Resource" id="Resource_44mst"]
 script = ExtResource("2_mnbif")
@@ -24,4 +24,4 @@ position = Vector3(-2, 2.08165e-12, -2)
 
 [resource]
 script = ExtResource("1_bckai")
-systems = Array[ExtResource("2_mnbif")]([ExtResource("2_tjv58"), SubResource("Resource_44mst"), SubResource("Resource_uo457"), SubResource("Resource_v2b8x")])
+systems = Array[ExtResource("2_mnbif")]([ExtResource("2_va8e4"), SubResource("Resource_44mst"), SubResource("Resource_uo457"), SubResource("Resource_v2b8x")])
diff --git a/galaxy/assets/galaxy-panorama.jpg b/galaxy/map/galaxy-panorama.jpg
similarity index 100%
rename from galaxy/assets/galaxy-panorama.jpg
rename to galaxy/map/galaxy-panorama.jpg
diff --git a/galaxy/assets/galaxy-panorama.jpg.import b/galaxy/map/galaxy-panorama.jpg.import
similarity index 70%
rename from galaxy/assets/galaxy-panorama.jpg.import
rename to galaxy/map/galaxy-panorama.jpg.import
index ae60ee80..67a7b829 100644
--- a/galaxy/assets/galaxy-panorama.jpg.import
+++ b/galaxy/map/galaxy-panorama.jpg.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dvvqwximvkwop"
-path.s3tc="res://.godot/imported/galaxy-panorama.jpg-a5ec63900d6a526734b21aa844307762.s3tc.ctex"
+path.s3tc="res://.godot/imported/galaxy-panorama.jpg-514c99e9d77bfccf059acad54bf4f234.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://galaxy/assets/galaxy-panorama.jpg"
-dest_files=["res://.godot/imported/galaxy-panorama.jpg-a5ec63900d6a526734b21aa844307762.s3tc.ctex"]
+source_file="res://galaxy/map/galaxy-panorama.jpg"
+dest_files=["res://.godot/imported/galaxy-panorama.jpg-514c99e9d77bfccf059acad54bf4f234.s3tc.ctex"]
 
 [params]
 
diff --git a/galaxy/galaxy_map/galaxy_map.gd b/galaxy/map/galaxy_map.gd
similarity index 100%
rename from galaxy/galaxy_map/galaxy_map.gd
rename to galaxy/map/galaxy_map.gd
diff --git a/galaxy/galaxy_map/galaxy_map.tscn b/galaxy/map/galaxy_map.tscn
similarity index 81%
rename from galaxy/galaxy_map/galaxy_map.tscn
rename to galaxy/map/galaxy_map.tscn
index 588cb293..aa918998 100644
--- a/galaxy/galaxy_map/galaxy_map.tscn
+++ b/galaxy/map/galaxy_map.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=9 format=3 uid="uid://kqong7nrl4p2"]
 
-[ext_resource type="Texture2D" uid="uid://dvvqwximvkwop" path="res://galaxy/assets/galaxy-panorama.jpg" id="1_2p7w6"]
-[ext_resource type="Script" path="res://galaxy/galaxy_map/galaxy_map.gd" id="1_4hqvm"]
-[ext_resource type="PackedScene" uid="uid://ckdnlnrybk4mh" path="res://galaxy/galaxy_map/galaxy_map_system.tscn" id="1_somah"]
-[ext_resource type="Script" path="res://galaxy/galaxy_map/galaxy_map_camera.gd" id="3_h6pmd"]
-[ext_resource type="PackedScene" uid="uid://d3lphosly5y8b" path="res://galaxy/galaxy_map/galaxy_map_hyperlane.tscn" id="5_pm0ev"]
+[ext_resource type="Texture2D" uid="uid://dvvqwximvkwop" path="res://galaxy/map/galaxy-panorama.jpg" id="1_2p7w6"]
+[ext_resource type="Script" path="res://galaxy/map/galaxy_map.gd" id="1_4hqvm"]
+[ext_resource type="PackedScene" uid="uid://ckdnlnrybk4mh" path="res://galaxy/map/galaxy_map_system.tscn" id="1_somah"]
+[ext_resource type="Script" path="res://galaxy/map/galaxy_map_camera.gd" id="3_h6pmd"]
+[ext_resource type="PackedScene" uid="uid://d3lphosly5y8b" path="res://galaxy/map/galaxy_map_hyperlane.tscn" id="5_pm0ev"]
 
 [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_fcs3v"]
 panorama = ExtResource("1_2p7w6")
diff --git a/galaxy/galaxy_map/galaxy_map_camera.gd b/galaxy/map/galaxy_map_camera.gd
similarity index 100%
rename from galaxy/galaxy_map/galaxy_map_camera.gd
rename to galaxy/map/galaxy_map_camera.gd
diff --git a/galaxy/galaxy_map/galaxy_map_current_mat.tres b/galaxy/map/galaxy_map_current_mat.tres
similarity index 100%
rename from galaxy/galaxy_map/galaxy_map_current_mat.tres
rename to galaxy/map/galaxy_map_current_mat.tres
diff --git a/galaxy/galaxy_map/galaxy_map_hyperlane.gd b/galaxy/map/galaxy_map_hyperlane.gd
similarity index 100%
rename from galaxy/galaxy_map/galaxy_map_hyperlane.gd
rename to galaxy/map/galaxy_map_hyperlane.gd
diff --git a/galaxy/galaxy_map/galaxy_map_hyperlane.tscn b/galaxy/map/galaxy_map_hyperlane.tscn
similarity index 91%
rename from galaxy/galaxy_map/galaxy_map_hyperlane.tscn
rename to galaxy/map/galaxy_map_hyperlane.tscn
index 66d83d4a..2e2a3609 100644
--- a/galaxy/galaxy_map/galaxy_map_hyperlane.tscn
+++ b/galaxy/map/galaxy_map_hyperlane.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://d3lphosly5y8b"]
 
-[ext_resource type="Script" path="res://galaxy/galaxy_map/galaxy_map_hyperlane.gd" id="1_qtr5l"]
-[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/font/Exo2-VariableFont_wght.ttf" id="2_htujy"]
+[ext_resource type="Script" path="res://galaxy/map/galaxy_map_hyperlane.gd" id="1_qtr5l"]
+[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/fonts/Exo2-VariableFont_wght.ttf" id="2_htujy"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_t1fyw"]
 
diff --git a/galaxy/galaxy_map/galaxy_map_system.gd b/galaxy/map/galaxy_map_system.gd
similarity index 100%
rename from galaxy/galaxy_map/galaxy_map_system.gd
rename to galaxy/map/galaxy_map_system.gd
diff --git a/galaxy/galaxy_map/galaxy_map_system.tscn b/galaxy/map/galaxy_map_system.tscn
similarity index 85%
rename from galaxy/galaxy_map/galaxy_map_system.tscn
rename to galaxy/map/galaxy_map_system.tscn
index 8c9497f4..26d8a468 100644
--- a/galaxy/galaxy_map/galaxy_map_system.tscn
+++ b/galaxy/map/galaxy_map_system.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=7 format=3 uid="uid://ckdnlnrybk4mh"]
 
-[ext_resource type="Script" path="res://galaxy/galaxy_map/galaxy_map_system.gd" id="1_jbywj"]
-[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/font/Exo2-VariableFont_wght.ttf" id="1_yuwvg"]
-[ext_resource type="Material" uid="uid://wjykkjty1dt5" path="res://galaxy/galaxy_map/galaxy_map_current_mat.tres" id="2_ddy2j"]
+[ext_resource type="Script" path="res://galaxy/map/galaxy_map_system.gd" id="1_jbywj"]
+[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/fonts/Exo2-VariableFont_wght.ttf" id="1_yuwvg"]
+[ext_resource type="Material" uid="uid://wjykkjty1dt5" path="res://galaxy/map/galaxy_map_current_mat.tres" id="2_ddy2j"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_j7i3l"]
 
diff --git a/galaxy/galaxy_map/galaxy_sky.gdshader b/galaxy/map/galaxy_sky.gdshader
similarity index 100%
rename from galaxy/galaxy_map/galaxy_sky.gdshader
rename to galaxy/map/galaxy_sky.gdshader
diff --git a/galaxy/star_systems/alpha_centauri.tscn b/galaxy/star_systems/scenes/alpha_centauri.tscn
similarity index 88%
rename from galaxy/star_systems/alpha_centauri.tscn
rename to galaxy/star_systems/scenes/alpha_centauri.tscn
index 3eae595b..80e51ae1 100644
--- a/galaxy/star_systems/alpha_centauri.tscn
+++ b/galaxy/star_systems/scenes/alpha_centauri.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=3 uid="uid://cyoasaafloxke"]
 
-[ext_resource type="PackedScene" uid="uid://cji43wyk7116p" path="res://celestials/stars/star.tscn" id="1_hyeo5"]
-[ext_resource type="Texture2D" uid="uid://b0m27jnaenria" path="res://celestials/stars/assets/star_orange03.png" id="2_ah0uv"]
-[ext_resource type="Texture2D" uid="uid://dfmoa1t4rv4kk" path="res://celestials/stars/assets/star_red01.png" id="2_hng7k"]
+[ext_resource type="PackedScene" uid="uid://cji43wyk7116p" path="res://stars/star.tscn" id="1_hyeo5"]
+[ext_resource type="Texture2D" uid="uid://b0m27jnaenria" path="res://stars/sprites/star_orange03.png" id="2_ah0uv"]
+[ext_resource type="Texture2D" uid="uid://dfmoa1t4rv4kk" path="res://stars/sprites/star_red01.png" id="2_hng7k"]
 
 [node name="Alpha Centauri" type="Node3D" groups=["star_system"]]
 
diff --git a/galaxy/star_systems/barnard's_star.tscn b/galaxy/star_systems/scenes/barnard's_star.tscn
similarity index 87%
rename from galaxy/star_systems/barnard's_star.tscn
rename to galaxy/star_systems/scenes/barnard's_star.tscn
index 0a06f0c3..415997d9 100644
--- a/galaxy/star_systems/barnard's_star.tscn
+++ b/galaxy/star_systems/scenes/barnard's_star.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=5 format=3 uid="uid://cghdtnx2qen2u"]
 
-[ext_resource type="PackedScene" uid="uid://cji43wyk7116p" path="res://celestials/stars/star.tscn" id="1_dt7yu"]
-[ext_resource type="Texture2D" uid="uid://bsgwmdcreel60" path="res://celestials/stars/assets/star_red02.png" id="2_xr5lq"]
-[ext_resource type="Script" path="res://ships/pirate.gd" id="4_cyjdf"]
+[ext_resource type="PackedScene" uid="uid://cji43wyk7116p" path="res://stars/star.tscn" id="1_dt7yu"]
+[ext_resource type="Texture2D" uid="uid://bsgwmdcreel60" path="res://stars/sprites/star_red02.png" id="2_xr5lq"]
+[ext_resource type="Script" path="res://actors/pirate.gd" id="4_cyjdf"]
 [ext_resource type="PackedScene" uid="uid://bxggrqus7bst5" path="res://ships/frigate03/frigate03.tscn" id="7_lnhbv"]
 
 [node name="Barnard\'s Star" type="Node3D" groups=["star_system"]]
diff --git a/galaxy/star_systems/sol.tscn b/galaxy/star_systems/scenes/sol.tscn
similarity index 83%
rename from galaxy/star_systems/sol.tscn
rename to galaxy/star_systems/scenes/sol.tscn
index 483d47b4..8dc96395 100644
--- a/galaxy/star_systems/sol.tscn
+++ b/galaxy/star_systems/scenes/sol.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=3 uid="uid://2mdsbbko7baw"]
 
-[ext_resource type="PackedScene" uid="uid://cji43wyk7116p" path="res://celestials/stars/star.tscn" id="1_j8iws"]
-[ext_resource type="PackedScene" uid="uid://b04hfgkcuq7k6" path="res://celestials/planets/planet.tscn" id="3_7gpxn"]
-[ext_resource type="Texture2D" uid="uid://bqxxjmbapro8l" path="res://celestials/planets/assets/planet_02.png" id="4_afp06"]
-[ext_resource type="Texture2D" uid="uid://bege8n4jjcej5" path="res://celestials/planets/assets/planet_37.png" id="5_hnp7v"]
-[ext_resource type="Texture2D" uid="uid://dkelmabwfrb5x" path="res://celestials/planets/assets/planet_23.png" id="5_k6fyb"]
+[ext_resource type="PackedScene" uid="uid://cji43wyk7116p" path="res://stars/star.tscn" id="1_j8iws"]
+[ext_resource type="PackedScene" uid="uid://b04hfgkcuq7k6" path="res://planets/planet.tscn" id="3_7gpxn"]
+[ext_resource type="Texture2D" uid="uid://bqxxjmbapro8l" path="res://planets/sprites/planet_02.png" id="4_afp06"]
+[ext_resource type="Texture2D" uid="uid://bege8n4jjcej5" path="res://planets/sprites/planet_37.png" id="5_hnp7v"]
+[ext_resource type="Texture2D" uid="uid://dkelmabwfrb5x" path="res://planets/sprites/planet_23.png" id="5_k6fyb"]
 
 [node name="Sol" type="Node3D" groups=["star_system"]]
 
diff --git a/galaxy/star_systems/wolf_359.tscn b/galaxy/star_systems/scenes/wolf_359.tscn
similarity index 90%
rename from galaxy/star_systems/wolf_359.tscn
rename to galaxy/star_systems/scenes/wolf_359.tscn
index 4e185684..89fd5ce8 100644
--- a/galaxy/star_systems/wolf_359.tscn
+++ b/galaxy/star_systems/scenes/wolf_359.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=3 uid="uid://d3qpe4ne3bgww"]
 
-[ext_resource type="PackedScene" uid="uid://cji43wyk7116p" path="res://celestials/stars/star.tscn" id="1_p0ggc"]
-[ext_resource type="Texture2D" uid="uid://dh0obx8nl0ltx" path="res://celestials/stars/assets/star_red03.png" id="2_sinon"]
+[ext_resource type="PackedScene" uid="uid://cji43wyk7116p" path="res://stars/star.tscn" id="1_p0ggc"]
+[ext_resource type="Texture2D" uid="uid://dh0obx8nl0ltx" path="res://stars/sprites/star_red03.png" id="2_sinon"]
 [ext_resource type="PackedScene" uid="uid://bxggrqus7bst5" path="res://ships/frigate03/frigate03.tscn" id="3_1cx0e"]
-[ext_resource type="Script" path="res://ships/pirate.gd" id="4_j6bxn"]
+[ext_resource type="Script" path="res://actors/pirate.gd" id="4_j6bxn"]
 
 [node name="Wolf 359" type="Node3D" groups=["star_system"]]
 
diff --git a/galaxy/sol.tres b/galaxy/star_systems/sol.tres
similarity index 100%
rename from galaxy/sol.tres
rename to galaxy/star_systems/sol.tres
diff --git a/galaxy/star_systems/star_system.gd b/galaxy/star_systems/star_system.gd
index dc3c3235..78c17edd 100644
--- a/galaxy/star_systems/star_system.gd
+++ b/galaxy/star_systems/star_system.gd
@@ -16,4 +16,4 @@ class_name StarSystem
 
 ## The resource path to this star system's scene.
 func scene_path() -> String:
-    return "res://galaxy/star_systems/%s.tscn" % self.name.to_snake_case()
+    return "res://galaxy/star_systems/scenes/%s.tscn" % self.name.to_snake_case()
diff --git a/gui/generic_sounds/itempick1.wav b/gui/audio/itempick1.wav
similarity index 100%
rename from gui/generic_sounds/itempick1.wav
rename to gui/audio/itempick1.wav
diff --git a/gui/generic_sounds/itempick1.wav.import b/gui/audio/itempick1.wav.import
similarity index 54%
rename from gui/generic_sounds/itempick1.wav.import
rename to gui/audio/itempick1.wav.import
index 36369c78..b9a0817d 100644
--- a/gui/generic_sounds/itempick1.wav.import
+++ b/gui/audio/itempick1.wav.import
@@ -3,12 +3,12 @@
 importer="wav"
 type="AudioStreamWAV"
 uid="uid://dqsuscukdo5oa"
-path="res://.godot/imported/itempick1.wav-28be526b77f05843757152e206189e12.sample"
+path="res://.godot/imported/itempick1.wav-35b6da5d46f1f19903b75ad6a4338a9a.sample"
 
 [deps]
 
-source_file="res://gui/generic_sounds/itempick1.wav"
-dest_files=["res://.godot/imported/itempick1.wav-28be526b77f05843757152e206189e12.sample"]
+source_file="res://gui/audio/itempick1.wav"
+dest_files=["res://.godot/imported/itempick1.wav-35b6da5d46f1f19903b75ad6a4338a9a.sample"]
 
 [params]
 
diff --git a/gui/font/Exo2-VariableFont_wght.ttf b/gui/fonts/Exo2-VariableFont_wght.ttf
similarity index 100%
rename from gui/font/Exo2-VariableFont_wght.ttf
rename to gui/fonts/Exo2-VariableFont_wght.ttf
diff --git a/gui/font/Exo2-VariableFont_wght.ttf.import b/gui/fonts/Exo2-VariableFont_wght.ttf.import
similarity index 63%
rename from gui/font/Exo2-VariableFont_wght.ttf.import
rename to gui/fonts/Exo2-VariableFont_wght.ttf.import
index 57e432a5..aa737c94 100644
--- a/gui/font/Exo2-VariableFont_wght.ttf.import
+++ b/gui/fonts/Exo2-VariableFont_wght.ttf.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://cwgggkla4xejt"
-path="res://.godot/imported/Exo2-VariableFont_wght.ttf-d76156a0d61c410d18a2641da7e8748a.fontdata"
+path="res://.godot/imported/Exo2-VariableFont_wght.ttf-1db402fbea5787f7ae98a6e2a507ccd0.fontdata"
 
 [deps]
 
-source_file="res://gui/font/Exo2-VariableFont_wght.ttf"
-dest_files=["res://.godot/imported/Exo2-VariableFont_wght.ttf-d76156a0d61c410d18a2641da7e8748a.fontdata"]
+source_file="res://gui/fonts/Exo2-VariableFont_wght.ttf"
+dest_files=["res://.godot/imported/Exo2-VariableFont_wght.ttf-1db402fbea5787f7ae98a6e2a507ccd0.fontdata"]
 
 [params]
 
diff --git a/gui/control_scheme_button.gd b/gui/hud/control_scheme_button.gd
similarity index 100%
rename from gui/control_scheme_button.gd
rename to gui/hud/control_scheme_button.gd
diff --git a/gui/nesia_assets/elements/IconEnergy.png b/gui/hud/images/IconEnergy.png
similarity index 100%
rename from gui/nesia_assets/elements/IconEnergy.png
rename to gui/hud/images/IconEnergy.png
diff --git a/gui/nesia_assets/elements/IconEnergy.png.import b/gui/hud/images/IconEnergy.png.import
similarity index 70%
rename from gui/nesia_assets/elements/IconEnergy.png.import
rename to gui/hud/images/IconEnergy.png.import
index 772bdc7b..501ece1e 100644
--- a/gui/nesia_assets/elements/IconEnergy.png.import
+++ b/gui/hud/images/IconEnergy.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dif27wf74itjw"
-path="res://.godot/imported/IconEnergy.png-7d28592ea902d59f0c28cebbb0d83015.ctex"
+path="res://.godot/imported/IconEnergy.png-1cbe8d1e3b88de1e3502683fe2642016.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://gui/nesia_assets/elements/IconEnergy.png"
-dest_files=["res://.godot/imported/IconEnergy.png-7d28592ea902d59f0c28cebbb0d83015.ctex"]
+source_file="res://gui/hud/images/IconEnergy.png"
+dest_files=["res://.godot/imported/IconEnergy.png-1cbe8d1e3b88de1e3502683fe2642016.ctex"]
 
 [params]
 
diff --git a/gui/nesia_assets/elements/IconHull.png b/gui/hud/images/IconHull.png
similarity index 100%
rename from gui/nesia_assets/elements/IconHull.png
rename to gui/hud/images/IconHull.png
diff --git a/gui/nesia_assets/elements/IconHull.png.import b/gui/hud/images/IconHull.png.import
similarity index 71%
rename from gui/nesia_assets/elements/IconHull.png.import
rename to gui/hud/images/IconHull.png.import
index 3ff0e7a2..1d89e78d 100644
--- a/gui/nesia_assets/elements/IconHull.png.import
+++ b/gui/hud/images/IconHull.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://if0dthunxkns"
-path="res://.godot/imported/IconHull.png-b925af330e200af0916b46286980ef8b.ctex"
+path="res://.godot/imported/IconHull.png-2124483e33087a91d8f27c5a2a488c0d.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://gui/nesia_assets/elements/IconHull.png"
-dest_files=["res://.godot/imported/IconHull.png-b925af330e200af0916b46286980ef8b.ctex"]
+source_file="res://gui/hud/images/IconHull.png"
+dest_files=["res://.godot/imported/IconHull.png-2124483e33087a91d8f27c5a2a488c0d.ctex"]
 
 [params]
 
diff --git a/gui/nesia_assets/elements/IconShield.png b/gui/hud/images/IconShield.png
similarity index 100%
rename from gui/nesia_assets/elements/IconShield.png
rename to gui/hud/images/IconShield.png
diff --git a/gui/nesia_assets/elements/IconShield.png.import b/gui/hud/images/IconShield.png.import
similarity index 70%
rename from gui/nesia_assets/elements/IconShield.png.import
rename to gui/hud/images/IconShield.png.import
index b4d847bb..8a071195 100644
--- a/gui/nesia_assets/elements/IconShield.png.import
+++ b/gui/hud/images/IconShield.png.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b1kk3dhk5ak4u"
-path="res://.godot/imported/IconShield.png-77048929ef6f4fe78abf79372e18f420.ctex"
+path="res://.godot/imported/IconShield.png-1178b736b748c7468431b9532159253c.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://gui/nesia_assets/elements/IconShield.png"
-dest_files=["res://.godot/imported/IconShield.png-77048929ef6f4fe78abf79372e18f420.ctex"]
+source_file="res://gui/hud/images/IconShield.png"
+dest_files=["res://.godot/imported/IconShield.png-1178b736b748c7468431b9532159253c.ctex"]
 
 [params]
 
diff --git a/gui/jump_destination_name.gd b/gui/hud/jump_destination_name.gd
similarity index 100%
rename from gui/jump_destination_name.gd
rename to gui/hud/jump_destination_name.gd
diff --git a/gui/minimap_target_override_mat.tres b/gui/hud/minimap_target_override_mat.tres
similarity index 100%
rename from gui/minimap_target_override_mat.tres
rename to gui/hud/minimap_target_override_mat.tres
diff --git a/gui/player_vitals.gd b/gui/hud/player_vitals.gd
similarity index 100%
rename from gui/player_vitals.gd
rename to gui/hud/player_vitals.gd
diff --git a/gui/system_name.gd b/gui/hud/system_name.gd
similarity index 100%
rename from gui/system_name.gd
rename to gui/hud/system_name.gd
diff --git a/gui/target_info.gd b/gui/hud/target_info.gd
similarity index 100%
rename from gui/target_info.gd
rename to gui/hud/target_info.gd
diff --git a/icon.svg b/gui/images/icon.svg
similarity index 100%
rename from icon.svg
rename to gui/images/icon.svg
diff --git a/icon.svg.import b/gui/images/icon.svg.import
similarity index 100%
rename from icon.svg.import
rename to gui/images/icon.svg.import
diff --git a/gui/nesia_assets/backgrounds/Background.png b/gui/images/splash_screen.png
similarity index 100%
rename from gui/nesia_assets/backgrounds/Background.png
rename to gui/images/splash_screen.png
diff --git a/gui/nesia_assets/backgrounds/Background.png.import b/gui/images/splash_screen.png.import
similarity index 100%
rename from gui/nesia_assets/backgrounds/Background.png.import
rename to gui/images/splash_screen.png.import
diff --git a/gui/theme.tres b/gui/theme.tres
index bc147716..b2eab39a 100644
--- a/gui/theme.tres
+++ b/gui/theme.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=2 format=3 uid="uid://r4w2xa3q1twa"]
 
-[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/font/Exo2-VariableFont_wght.ttf" id="1_3xdqw"]
+[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/fonts/Exo2-VariableFont_wght.ttf" id="1_3xdqw"]
 
 [resource]
 default_font = ExtResource("1_3xdqw")
diff --git a/effects/environment.tres b/main/environment.tres
similarity index 100%
rename from effects/environment.tres
rename to main/environment.tres
diff --git a/game.tscn b/main/game.tscn
similarity index 92%
rename from game.tscn
rename to main/game.tscn
index 0e82a1d8..c0b90805 100644
--- a/game.tscn
+++ b/main/game.tscn
@@ -1,33 +1,33 @@
 [gd_scene load_steps=38 format=3 uid="uid://sunhu71swcs2"]
 
 [ext_resource type="Script" path="res://utils/shader_precompiler.gd" id="1_kgmvv"]
-[ext_resource type="Script" path="res://galaxy/hyperspace_controller.gd" id="2_5gj7y"]
+[ext_resource type="Script" path="res://main/hyperspace_controller.gd" id="2_5gj7y"]
 [ext_resource type="PackedScene" uid="uid://b7tckdwyjwpso" path="res://weapons/blaster/blaster_bolt.tscn" id="2_bp704"]
-[ext_resource type="Script" path="res://effects/main_camera.gd" id="2_v5hns"]
+[ext_resource type="Script" path="res://main/main_camera.gd" id="2_v5hns"]
 [ext_resource type="Resource" uid="uid://bcva4l4cpt70c" path="res://galaxy/main_galaxy.tres" id="3_j76v0"]
-[ext_resource type="Material" uid="uid://tpd4rufhhe4h" path="res://celestials/starfield/starfield.tres" id="3_vksuy"]
-[ext_resource type="Script" path="res://effects/hyperspace/hyperspace_effect.gd" id="4_bmy66"]
-[ext_resource type="AudioStream" uid="uid://cmjfgigj57eie" path="res://effects/hyperspace/teleport_02_slowed.ogg" id="5_jhe1g"]
+[ext_resource type="Material" uid="uid://tpd4rufhhe4h" path="res://main/starfield/starfield.tres" id="3_vksuy"]
+[ext_resource type="Script" path="res://fx/hyperspace/hyperspace_effect.gd" id="4_bmy66"]
+[ext_resource type="AudioStream" uid="uid://cmjfgigj57eie" path="res://fx/hyperspace/teleport_02_slowed.ogg" id="5_jhe1g"]
 [ext_resource type="PackedScene" uid="uid://cqxv07b8bwiev" path="res://ships/corvette01/corvette01.tscn" id="6_8inyn"]
-[ext_resource type="Resource" uid="uid://cew4x137v08q" path="res://galaxy/sol.tres" id="6_es1br"]
-[ext_resource type="Environment" uid="uid://b7t3opwr35xen" path="res://effects/environment.tres" id="6_srnxb"]
-[ext_resource type="Script" path="res://ships/player.gd" id="7_6citj"]
-[ext_resource type="PackedScene" uid="uid://2mdsbbko7baw" path="res://galaxy/star_systems/sol.tscn" id="10_vhe4b"]
+[ext_resource type="Resource" uid="uid://cew4x137v08q" path="res://galaxy/star_systems/sol.tres" id="6_es1br"]
+[ext_resource type="Environment" uid="uid://b7t3opwr35xen" path="res://main/environment.tres" id="6_srnxb"]
+[ext_resource type="Script" path="res://actors/player.gd" id="7_6citj"]
+[ext_resource type="PackedScene" uid="uid://2mdsbbko7baw" path="res://galaxy/star_systems/scenes/sol.tscn" id="10_vhe4b"]
 [ext_resource type="Theme" uid="uid://r4w2xa3q1twa" path="res://gui/theme.tres" id="11_x7io4"]
-[ext_resource type="Script" path="res://gui/control_scheme_button.gd" id="12_ti545"]
-[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/font/Exo2-VariableFont_wght.ttf" id="13_8snbk"]
+[ext_resource type="Script" path="res://gui/hud/control_scheme_button.gd" id="12_ti545"]
+[ext_resource type="FontFile" uid="uid://cwgggkla4xejt" path="res://gui/fonts/Exo2-VariableFont_wght.ttf" id="13_8snbk"]
 [ext_resource type="Script" path="res://gui/in_game_gui.gd" id="14_hh3no"]
-[ext_resource type="Script" path="res://gui/system_name.gd" id="14_lhpn8"]
-[ext_resource type="Script" path="res://gui/jump_destination_name.gd" id="15_xo6uu"]
-[ext_resource type="AudioStream" uid="uid://dqsuscukdo5oa" path="res://gui/generic_sounds/itempick1.wav" id="16_q8d2x"]
-[ext_resource type="Script" path="res://gui/player_vitals.gd" id="17_kyl4x"]
-[ext_resource type="Texture2D" uid="uid://if0dthunxkns" path="res://gui/nesia_assets/elements/IconHull.png" id="18_ie1l8"]
-[ext_resource type="Texture2D" uid="uid://b1kk3dhk5ak4u" path="res://gui/nesia_assets/elements/IconShield.png" id="19_0m5x5"]
-[ext_resource type="Script" path="res://gui/target_info.gd" id="20_4ebat"]
+[ext_resource type="Script" path="res://gui/hud/system_name.gd" id="14_lhpn8"]
+[ext_resource type="Script" path="res://gui/hud/jump_destination_name.gd" id="15_xo6uu"]
+[ext_resource type="AudioStream" uid="uid://dqsuscukdo5oa" path="res://gui/audio/itempick1.wav" id="16_q8d2x"]
+[ext_resource type="Script" path="res://gui/hud/player_vitals.gd" id="17_kyl4x"]
+[ext_resource type="Texture2D" uid="uid://if0dthunxkns" path="res://gui/hud/images/IconHull.png" id="18_ie1l8"]
+[ext_resource type="Texture2D" uid="uid://b1kk3dhk5ak4u" path="res://gui/hud/images/IconShield.png" id="19_0m5x5"]
+[ext_resource type="Script" path="res://gui/hud/target_info.gd" id="20_4ebat"]
 [ext_resource type="Script" path="res://gui/game_over.gd" id="22_g1tis"]
 [ext_resource type="Script" path="res://gui/fps_counter.gd" id="23_ncnr7"]
-[ext_resource type="Texture2D" uid="uid://dif27wf74itjw" path="res://gui/nesia_assets/elements/IconEnergy.png" id="24_iwm5p"]
-[ext_resource type="PackedScene" uid="uid://kqong7nrl4p2" path="res://galaxy/galaxy_map/galaxy_map.tscn" id="28_oyaod"]
+[ext_resource type="Texture2D" uid="uid://dif27wf74itjw" path="res://gui/hud/images/IconEnergy.png" id="24_iwm5p"]
+[ext_resource type="PackedScene" uid="uid://kqong7nrl4p2" path="res://galaxy/map/galaxy_map.tscn" id="28_oyaod"]
 
 [sub_resource type="World3D" id="World3D_pvg5q"]
 environment = ExtResource("6_srnxb")
diff --git a/galaxy/hyperspace_controller.gd b/main/hyperspace_controller.gd
similarity index 100%
rename from galaxy/hyperspace_controller.gd
rename to main/hyperspace_controller.gd
diff --git a/effects/main_camera.gd b/main/main_camera.gd
similarity index 100%
rename from effects/main_camera.gd
rename to main/main_camera.gd
diff --git a/celestials/starfield/starfield.png b/main/starfield/starfield.png
similarity index 100%
rename from celestials/starfield/starfield.png
rename to main/starfield/starfield.png
diff --git a/celestials/starfield/starfield.png.import b/main/starfield/starfield.png.import
similarity index 71%
rename from celestials/starfield/starfield.png.import
rename to main/starfield/starfield.png.import
index 13e6ead8..d7702f8b 100644
--- a/celestials/starfield/starfield.png.import
+++ b/main/starfield/starfield.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dssjyddqrwoto"
-path.s3tc="res://.godot/imported/starfield.png-2a5dfedcab06683f7b1f2c1886b579ec.s3tc.ctex"
+path.s3tc="res://.godot/imported/starfield.png-76c2097617d446ea630e16bfdfe7d768.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/starfield/starfield.png"
-dest_files=["res://.godot/imported/starfield.png-2a5dfedcab06683f7b1f2c1886b579ec.s3tc.ctex"]
+source_file="res://main/starfield/starfield.png"
+dest_files=["res://.godot/imported/starfield.png-76c2097617d446ea630e16bfdfe7d768.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/starfield/starfield.tres b/main/starfield/starfield.tres
similarity index 89%
rename from celestials/starfield/starfield.tres
rename to main/starfield/starfield.tres
index 17564bdb..0712debe 100644
--- a/celestials/starfield/starfield.tres
+++ b/main/starfield/starfield.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://tpd4rufhhe4h"]
 
-[ext_resource type="Texture2D" uid="uid://dssjyddqrwoto" path="res://celestials/starfield/starfield.png" id="1_m1ji0"]
+[ext_resource type="Texture2D" uid="uid://dssjyddqrwoto" path="res://main/starfield/starfield.png" id="1_m1ji0"]
 
 [resource]
 render_priority = -1
diff --git a/celestials/planets/planet.tscn b/planets/planet.tscn
similarity index 93%
rename from celestials/planets/planet.tscn
rename to planets/planet.tscn
index 699f2704..a5d41c59 100644
--- a/celestials/planets/planet.tscn
+++ b/planets/planet.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://b04hfgkcuq7k6"]
 
-[ext_resource type="Texture2D" uid="uid://olumucogupnw" path="res://celestials/planets/assets/planet_04.png" id="1_w3ph5"]
+[ext_resource type="Texture2D" uid="uid://olumucogupnw" path="res://planets/sprites/planet_04.png" id="1_w3ph5"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0y335"]
 shading_mode = 0
diff --git a/celestials/planets/assets/planet_02.png b/planets/sprites/planet_02.png
similarity index 100%
rename from celestials/planets/assets/planet_02.png
rename to planets/sprites/planet_02.png
diff --git a/celestials/planets/assets/planet_02.png.import b/planets/sprites/planet_02.png.import
similarity index 70%
rename from celestials/planets/assets/planet_02.png.import
rename to planets/sprites/planet_02.png.import
index 479280a3..3421a4c4 100644
--- a/celestials/planets/assets/planet_02.png.import
+++ b/planets/sprites/planet_02.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bqxxjmbapro8l"
-path.s3tc="res://.godot/imported/planet_02.png-cbcd104f9e5dc0ad3cd06da65d59851e.s3tc.ctex"
+path.s3tc="res://.godot/imported/planet_02.png-b6530cf075b521d70f0aae9d066790a5.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/planets/assets/planet_02.png"
-dest_files=["res://.godot/imported/planet_02.png-cbcd104f9e5dc0ad3cd06da65d59851e.s3tc.ctex"]
+source_file="res://planets/sprites/planet_02.png"
+dest_files=["res://.godot/imported/planet_02.png-b6530cf075b521d70f0aae9d066790a5.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/planets/assets/planet_04.png b/planets/sprites/planet_04.png
similarity index 100%
rename from celestials/planets/assets/planet_04.png
rename to planets/sprites/planet_04.png
diff --git a/celestials/planets/assets/planet_04.png.import b/planets/sprites/planet_04.png.import
similarity index 70%
rename from celestials/planets/assets/planet_04.png.import
rename to planets/sprites/planet_04.png.import
index 5ed02270..82fa0262 100644
--- a/celestials/planets/assets/planet_04.png.import
+++ b/planets/sprites/planet_04.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://olumucogupnw"
-path.s3tc="res://.godot/imported/planet_04.png-433aa5cc534330f7fe0b5a8ee5b933f1.s3tc.ctex"
+path.s3tc="res://.godot/imported/planet_04.png-ad32bc51120210a0d15591543f633045.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/planets/assets/planet_04.png"
-dest_files=["res://.godot/imported/planet_04.png-433aa5cc534330f7fe0b5a8ee5b933f1.s3tc.ctex"]
+source_file="res://planets/sprites/planet_04.png"
+dest_files=["res://.godot/imported/planet_04.png-ad32bc51120210a0d15591543f633045.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/planets/assets/planet_23.png b/planets/sprites/planet_23.png
similarity index 100%
rename from celestials/planets/assets/planet_23.png
rename to planets/sprites/planet_23.png
diff --git a/celestials/planets/assets/planet_23.png.import b/planets/sprites/planet_23.png.import
similarity index 70%
rename from celestials/planets/assets/planet_23.png.import
rename to planets/sprites/planet_23.png.import
index f92d94c0..79912732 100644
--- a/celestials/planets/assets/planet_23.png.import
+++ b/planets/sprites/planet_23.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dkelmabwfrb5x"
-path.s3tc="res://.godot/imported/planet_23.png-e37ef7d075f72df94909d761b43b14fd.s3tc.ctex"
+path.s3tc="res://.godot/imported/planet_23.png-7b78dafdebf5b46ae64e34220955250b.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/planets/assets/planet_23.png"
-dest_files=["res://.godot/imported/planet_23.png-e37ef7d075f72df94909d761b43b14fd.s3tc.ctex"]
+source_file="res://planets/sprites/planet_23.png"
+dest_files=["res://.godot/imported/planet_23.png-7b78dafdebf5b46ae64e34220955250b.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/planets/assets/planet_37.png b/planets/sprites/planet_37.png
similarity index 100%
rename from celestials/planets/assets/planet_37.png
rename to planets/sprites/planet_37.png
diff --git a/celestials/planets/assets/planet_37.png.import b/planets/sprites/planet_37.png.import
similarity index 70%
rename from celestials/planets/assets/planet_37.png.import
rename to planets/sprites/planet_37.png.import
index 0953d8c4..9e119a49 100644
--- a/celestials/planets/assets/planet_37.png.import
+++ b/planets/sprites/planet_37.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bege8n4jjcej5"
-path.s3tc="res://.godot/imported/planet_37.png-42a21fc1fdc35f35c55759c82a9b552f.s3tc.ctex"
+path.s3tc="res://.godot/imported/planet_37.png-4acb3a892a61254c7214400b56ce9697.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/planets/assets/planet_37.png"
-dest_files=["res://.godot/imported/planet_37.png-42a21fc1fdc35f35c55759c82a9b552f.s3tc.ctex"]
+source_file="res://planets/sprites/planet_37.png"
+dest_files=["res://.godot/imported/planet_37.png-4acb3a892a61254c7214400b56ce9697.s3tc.ctex"]
 
 [params]
 
diff --git a/project.godot b/project.godot
index e9f83f2a..5c31c61f 100644
--- a/project.godot
+++ b/project.godot
@@ -11,12 +11,12 @@ config_version=5
 [application]
 
 config/name="Merc"
-run/main_scene="res://game.tscn"
+run/main_scene="res://main/game.tscn"
 config/use_custom_user_dir=true
 config/features=PackedStringArray("4.2", "GL Compatibility")
 boot_splash/bg_color=Color(0.0509804, 0.0666667, 0.101961, 1)
-boot_splash/image="res://gui/nesia_assets/backgrounds/Background.png"
-config/icon="res://icon.svg"
+boot_splash/image="res://gui/images/splash_screen.png"
+config/icon="res://gui/images/icon.svg"
 
 [autoload]
 
diff --git a/ships/corvette01/corvette01.tscn b/ships/corvette01/corvette01.tscn
index ec93c074..320451de 100644
--- a/ships/corvette01/corvette01.tscn
+++ b/ships/corvette01/corvette01.tscn
@@ -1,12 +1,14 @@
-[gd_scene load_steps=12 format=3 uid="uid://cqxv07b8bwiev"]
+[gd_scene load_steps=14 format=3 uid="uid://cqxv07b8bwiev"]
 
 [ext_resource type="Script" path="res://ships/ship.gd" id="1_wioy5"]
 [ext_resource type="ArrayMesh" uid="uid://40a23nnu1j37" path="res://ships/corvette01/corvette01_mesh.tres" id="1_yacfo"]
 [ext_resource type="Resource" uid="uid://dc468i445pkgd" path="res://ships/corvette01/corvette01.tres" id="2_20tol"]
 [ext_resource type="PackedScene" uid="uid://b7tckdwyjwpso" path="res://weapons/blaster/blaster_bolt.tscn" id="2_gae27"]
-[ext_resource type="PackedScene" uid="uid://cdyo800b83x5i" path="res://effects/explosions/explosion002.tscn" id="2_xcc1t"]
+[ext_resource type="PackedScene" uid="uid://cdyo800b83x5i" path="res://fx/explosions/explosion002.tscn" id="2_xcc1t"]
 [ext_resource type="AudioStream" uid="uid://5iqc5o8p02l5" path="res://ships/audio/THRUSTER LOW.wav" id="4_xrdjv"]
-[ext_resource type="PackedScene" uid="uid://dbc2usdmy5wf3" path="res://effects/engine_glow/engine_glow.tscn" id="8_kgu6n"]
+[ext_resource type="Material" uid="uid://dskoto6nul131" path="res://fx/target_overlay_mat.tres" id="5_bvs2s"]
+[ext_resource type="Material" uid="uid://cyhh74uif4hp0" path="res://gui/hud/minimap_target_override_mat.tres" id="6_03mwh"]
+[ext_resource type="PackedScene" uid="uid://dbc2usdmy5wf3" path="res://fx/engine_glow/engine_glow.tscn" id="8_kgu6n"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_2lrme"]
 radius = 0.362506
@@ -34,7 +36,10 @@ bullet = ExtResource("2_gae27")
 explosion = ExtResource("2_xcc1t")
 thruster_audio = NodePath("AudioStreamPlayer3D")
 mesh_instance = NodePath("MeshInstance3D")
+target_overlay_material = ExtResource("5_bvs2s")
 minimap_mesh_instance = NodePath("MinimapIcon")
+minimap_target_override_material = ExtResource("6_03mwh")
+free_when_destroyed = null
 weapon_hardpoints = [NodePath("BlasterHardpoint")]
 engine_glow = [NodePath("EngineGlowLeft"), NodePath("EngineGlowRight")]
 engine_glow_tween_duration_sec = 0.3
diff --git a/ships/frigate03/frigate03.tscn b/ships/frigate03/frigate03.tscn
index 5f2f7598..a35fdf6d 100644
--- a/ships/frigate03/frigate03.tscn
+++ b/ships/frigate03/frigate03.tscn
@@ -1,13 +1,15 @@
-[gd_scene load_steps=14 format=3 uid="uid://bxggrqus7bst5"]
+[gd_scene load_steps=16 format=3 uid="uid://bxggrqus7bst5"]
 
 [ext_resource type="Script" path="res://ships/ship.gd" id="1_wioy5"]
 [ext_resource type="PackedScene" uid="uid://b7tckdwyjwpso" path="res://weapons/blaster/blaster_bolt.tscn" id="2_gae27"]
 [ext_resource type="Resource" uid="uid://dmd83o4ylhb0l" path="res://ships/frigate03/frigate03.tres" id="2_lg5km"]
-[ext_resource type="PackedScene" uid="uid://cdyo800b83x5i" path="res://effects/explosions/explosion002.tscn" id="2_xcc1t"]
+[ext_resource type="PackedScene" uid="uid://cdyo800b83x5i" path="res://fx/explosions/explosion002.tscn" id="2_xcc1t"]
 [ext_resource type="AudioStream" uid="uid://5iqc5o8p02l5" path="res://ships/audio/THRUSTER LOW.wav" id="4_xrdjv"]
+[ext_resource type="Material" uid="uid://dskoto6nul131" path="res://fx/target_overlay_mat.tres" id="5_ukkea"]
 [ext_resource type="ArrayMesh" uid="uid://c2y60nf8m25ka" path="res://ships/frigate03/frigate03_mesh.tres" id="6_g7bx0"]
-[ext_resource type="PackedScene" uid="uid://dbc2usdmy5wf3" path="res://effects/engine_glow/engine_glow.tscn" id="8_ibdmx"]
-[ext_resource type="Shader" path="res://effects/engine_glow/engine_glow.gdshader" id="9_2y7a5"]
+[ext_resource type="Material" uid="uid://cyhh74uif4hp0" path="res://gui/hud/minimap_target_override_mat.tres" id="6_moja0"]
+[ext_resource type="PackedScene" uid="uid://dbc2usdmy5wf3" path="res://fx/engine_glow/engine_glow.tscn" id="8_ibdmx"]
+[ext_resource type="Shader" path="res://fx/engine_glow/engine_glow.gdshader" id="9_2y7a5"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_quq5g"]
 size = Vector3(1.98299, 0.832642, 1.04932)
@@ -43,7 +45,10 @@ bullet = ExtResource("2_gae27")
 explosion = ExtResource("2_xcc1t")
 thruster_audio = NodePath("AudioStreamPlayer3D")
 mesh_instance = NodePath("MeshInstance3D")
+target_overlay_material = ExtResource("5_ukkea")
 minimap_mesh_instance = NodePath("MinimapIcon")
+minimap_target_override_material = ExtResource("6_moja0")
+free_when_destroyed = null
 weapon_hardpoints = [NodePath("BlasterHardpoint")]
 engine_glow = [NodePath("EngineGlow")]
 engine_glow_tween_duration_sec = 0.6
diff --git a/ships/ship.gd b/ships/ship.gd
index 8a2b67c9..c5752e2d 100644
--- a/ships/ship.gd
+++ b/ships/ship.gd
@@ -23,13 +23,13 @@ class_name Ship
 @export var mesh_instance: MeshInstance3D
 
 ## A material to overlay on this ship's mesh when it is targeted by the player.
-@export var target_overlay_material: BaseMaterial3D = preload ("res://gui/target_overlay_mat.tres")
+@export var target_overlay_material: BaseMaterial3D
 
 ## This ship's minimap icon.
 @export var minimap_mesh_instance: MeshInstance3D
 
 ## A material to override this ship's minimap icon when it is targeted by the player.
-@export var minimap_target_override_material: BaseMaterial3D = preload ("res://gui/minimap_target_override_mat.tres")
+@export var minimap_target_override_material: BaseMaterial3D
 
 ## Whether the ship node should be removed from the scene tree and freed when it is destroyed.
 ##
diff --git a/celestials/stars/assets/star_orange02.png b/stars/sprites/star_orange02.png
similarity index 100%
rename from celestials/stars/assets/star_orange02.png
rename to stars/sprites/star_orange02.png
diff --git a/celestials/stars/assets/star_orange02.png.import b/stars/sprites/star_orange02.png.import
similarity index 69%
rename from celestials/stars/assets/star_orange02.png.import
rename to stars/sprites/star_orange02.png.import
index 87c26efd..6b4fd6d0 100644
--- a/celestials/stars/assets/star_orange02.png.import
+++ b/stars/sprites/star_orange02.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://6ijlgdb1n5rc"
-path.s3tc="res://.godot/imported/star_orange02.png-dc1843f5e133e0e156c18c8feec2e7a1.s3tc.ctex"
+path.s3tc="res://.godot/imported/star_orange02.png-0de4377967d42bc312d125bcd3ed78ba.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/stars/assets/star_orange02.png"
-dest_files=["res://.godot/imported/star_orange02.png-dc1843f5e133e0e156c18c8feec2e7a1.s3tc.ctex"]
+source_file="res://stars/sprites/star_orange02.png"
+dest_files=["res://.godot/imported/star_orange02.png-0de4377967d42bc312d125bcd3ed78ba.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/stars/assets/star_orange03.png b/stars/sprites/star_orange03.png
similarity index 100%
rename from celestials/stars/assets/star_orange03.png
rename to stars/sprites/star_orange03.png
diff --git a/celestials/stars/assets/star_orange03.png.import b/stars/sprites/star_orange03.png.import
similarity index 69%
rename from celestials/stars/assets/star_orange03.png.import
rename to stars/sprites/star_orange03.png.import
index f39524e3..04fb5a83 100644
--- a/celestials/stars/assets/star_orange03.png.import
+++ b/stars/sprites/star_orange03.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b0m27jnaenria"
-path.s3tc="res://.godot/imported/star_orange03.png-1b69c282c2fca2b8ff8c7e4d68b53e59.s3tc.ctex"
+path.s3tc="res://.godot/imported/star_orange03.png-7ec753f81e481a4069466efc7a74984d.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/stars/assets/star_orange03.png"
-dest_files=["res://.godot/imported/star_orange03.png-1b69c282c2fca2b8ff8c7e4d68b53e59.s3tc.ctex"]
+source_file="res://stars/sprites/star_orange03.png"
+dest_files=["res://.godot/imported/star_orange03.png-7ec753f81e481a4069466efc7a74984d.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/stars/assets/star_red01.png b/stars/sprites/star_red01.png
similarity index 100%
rename from celestials/stars/assets/star_red01.png
rename to stars/sprites/star_red01.png
diff --git a/celestials/stars/assets/star_red01.png.import b/stars/sprites/star_red01.png.import
similarity index 70%
rename from celestials/stars/assets/star_red01.png.import
rename to stars/sprites/star_red01.png.import
index b7974105..01820355 100644
--- a/celestials/stars/assets/star_red01.png.import
+++ b/stars/sprites/star_red01.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dfmoa1t4rv4kk"
-path.s3tc="res://.godot/imported/star_red01.png-8a3b919e67cdfe367b1fa8e7f8df5c14.s3tc.ctex"
+path.s3tc="res://.godot/imported/star_red01.png-aca009998aa7595f5b91a73c5e5f8d0e.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/stars/assets/star_red01.png"
-dest_files=["res://.godot/imported/star_red01.png-8a3b919e67cdfe367b1fa8e7f8df5c14.s3tc.ctex"]
+source_file="res://stars/sprites/star_red01.png"
+dest_files=["res://.godot/imported/star_red01.png-aca009998aa7595f5b91a73c5e5f8d0e.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/stars/assets/star_red02.png b/stars/sprites/star_red02.png
similarity index 100%
rename from celestials/stars/assets/star_red02.png
rename to stars/sprites/star_red02.png
diff --git a/celestials/stars/assets/star_red02.png.import b/stars/sprites/star_red02.png.import
similarity index 70%
rename from celestials/stars/assets/star_red02.png.import
rename to stars/sprites/star_red02.png.import
index ba46271e..0cb10758 100644
--- a/celestials/stars/assets/star_red02.png.import
+++ b/stars/sprites/star_red02.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bsgwmdcreel60"
-path.s3tc="res://.godot/imported/star_red02.png-d52ce1e3c1bbc19743115d4c16e8abd6.s3tc.ctex"
+path.s3tc="res://.godot/imported/star_red02.png-816cdfdbe7103292812ee73afe7b46ef.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/stars/assets/star_red02.png"
-dest_files=["res://.godot/imported/star_red02.png-d52ce1e3c1bbc19743115d4c16e8abd6.s3tc.ctex"]
+source_file="res://stars/sprites/star_red02.png"
+dest_files=["res://.godot/imported/star_red02.png-816cdfdbe7103292812ee73afe7b46ef.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/stars/assets/star_red03.png b/stars/sprites/star_red03.png
similarity index 100%
rename from celestials/stars/assets/star_red03.png
rename to stars/sprites/star_red03.png
diff --git a/celestials/stars/assets/star_red03.png.import b/stars/sprites/star_red03.png.import
similarity index 70%
rename from celestials/stars/assets/star_red03.png.import
rename to stars/sprites/star_red03.png.import
index 55b7ab90..7747ed8c 100644
--- a/celestials/stars/assets/star_red03.png.import
+++ b/stars/sprites/star_red03.png.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dh0obx8nl0ltx"
-path.s3tc="res://.godot/imported/star_red03.png-47a4b938450c92611ec096f93568bb20.s3tc.ctex"
+path.s3tc="res://.godot/imported/star_red03.png-c6d080d3fe5ef0624d1f9528eb4594ee.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://celestials/stars/assets/star_red03.png"
-dest_files=["res://.godot/imported/star_red03.png-47a4b938450c92611ec096f93568bb20.s3tc.ctex"]
+source_file="res://stars/sprites/star_red03.png"
+dest_files=["res://.godot/imported/star_red03.png-c6d080d3fe5ef0624d1f9528eb4594ee.s3tc.ctex"]
 
 [params]
 
diff --git a/celestials/stars/star.tscn b/stars/star.tscn
similarity index 94%
rename from celestials/stars/star.tscn
rename to stars/star.tscn
index 342bc55c..14d893ff 100644
--- a/celestials/stars/star.tscn
+++ b/stars/star.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://cji43wyk7116p"]
 
-[ext_resource type="Texture2D" uid="uid://6ijlgdb1n5rc" path="res://celestials/stars/assets/star_orange02.png" id="1_so3uy"]
+[ext_resource type="Texture2D" uid="uid://6ijlgdb1n5rc" path="res://stars/sprites/star_orange02.png" id="1_so3uy"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6m41v"]
 shading_mode = 0
diff --git a/weapons/blaster/blaster_bolt.tscn b/weapons/blaster/blaster_bolt.tscn
index 4b3be000..893d511d 100644
--- a/weapons/blaster/blaster_bolt.tscn
+++ b/weapons/blaster/blaster_bolt.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=8 format=3 uid="uid://b7tckdwyjwpso"]
 
 [ext_resource type="Script" path="res://weapons/blaster/blaster_bolt.gd" id="1_lhj56"]
-[ext_resource type="PackedScene" uid="uid://cp0b07jvhi5a" path="res://effects/explosions/explosion001.tscn" id="2_lqot8"]
+[ext_resource type="PackedScene" uid="uid://cp0b07jvhi5a" path="res://fx/explosions/explosion001.tscn" id="2_lqot8"]
 [ext_resource type="Texture2D" uid="uid://lyur31oafltf" path="res://weapons/blaster/blaster_bolt.png" id="3_c2tch"]
 [ext_resource type="AudioStream" uid="uid://cscjfy7e1dy78" path="res://weapons/blaster/laser4.mp3" id="4_we7w6"]