Clean up project file/dir organization

jspahrsummers · Jul 2, 2024 · 1dd6be2 · 1dd6be2
1 parent b817972
commit 1dd6be2
Show file tree

Hide file tree

Showing 95 changed files with 195 additions and 185 deletions.
diff --git 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 → actors/pirate.gd b/ships/pirate.gd → actors/pirate.gd
diff --git a/ships/player.gd → actors/player.gd b/ships/player.gd → actors/player.gd
diff --git a/effects/explosions/assets/audio/chunky_explosion.mp3.import b/effects/explosions/assets/audio/chunky_explosion.mp3.import
diff --git a/effects/explosions/assets/audio/explosion_01.ogg.import b/effects/explosions/assets/audio/explosion_01.ogg.import
diff --git a/effects/hyperspace/teleport_02_slowed.ogg.import b/effects/hyperspace/teleport_02_slowed.ogg.import
diff --git a/effects/engine_glow/engine_glow.gdshader → fx/engine_glow/engine_glow.gdshader b/effects/engine_glow/engine_glow.gdshader → fx/engine_glow/engine_glow.gdshader
diff --git a/effects/engine_glow/engine_glow.tscn → fx/engine_glow/engine_glow.tscn b/effects/engine_glow/engine_glow.tscn → 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 → fx/engine_glow/engine_glow_mat.tres b/effects/engine_glow/engine_glow_mat.tres → 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/...losions/assets/audio/chunky_explosion.mp3 → fx/explosions/audio/chunky_explosion.mp3 b/...losions/assets/audio/chunky_explosion.mp3 → fx/explosions/audio/chunky_explosion.mp3
diff --git a/fx/explosions/audio/chunky_explosion.mp3.import 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/.../explosions/assets/audio/explosion_01.ogg → fx/explosions/audio/explosion_01.ogg b/.../explosions/assets/audio/explosion_01.ogg → fx/explosions/audio/explosion_01.ogg
diff --git a/fx/explosions/audio/explosion_01.ogg.import 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 → fx/explosions/explosion.gd b/effects/explosions/explosion.gd → fx/explosions/explosion.gd
diff --git a/effects/explosions/explosion001.tscn → fx/explosions/explosion001.tscn b/effects/explosions/explosion001.tscn → 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 → fx/explosions/explosion002.tscn b/effects/explosions/explosion002.tscn → 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/...assets/textures/explosion001_halfsize.png → ...osions/textures/explosion001_halfsize.png b/...assets/textures/explosion001_halfsize.png → ...osions/textures/explosion001_halfsize.png
diff --git a/...textures/explosion001_halfsize.png.import → ...textures/explosion001_halfsize.png.import b/...textures/explosion001_halfsize.png.import → ...textures/explosion001_halfsize.png.import
@@ -3,16 +3,16 @@
 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
 }
 
 [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/...assets/textures/explosion002_fullsize.png → ...osions/textures/explosion002_fullsize.png b/...assets/textures/explosion002_fullsize.png → ...osions/textures/explosion002_fullsize.png
diff --git a/...textures/explosion002_fullsize.png.import → ...textures/explosion002_fullsize.png.import b/...textures/explosion002_fullsize.png.import → ...textures/explosion002_fullsize.png.import
@@ -3,16 +3,16 @@
 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
 }
 
 [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 → fx/hyperspace/hyperspace_effect.gd b/effects/hyperspace/hyperspace_effect.gd → fx/hyperspace/hyperspace_effect.gd
diff --git a/effects/hyperspace/teleport_02_slowed.ogg → fx/hyperspace/teleport_02_slowed.ogg b/effects/hyperspace/teleport_02_slowed.ogg → fx/hyperspace/teleport_02_slowed.ogg
diff --git a/fx/hyperspace/teleport_02_slowed.ogg.import 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 → fx/target_overlay_mat.tres b/gui/target_overlay_mat.tres → fx/target_overlay_mat.tres
diff --git 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 → galaxy/map/galaxy-panorama.jpg b/galaxy/assets/galaxy-panorama.jpg → galaxy/map/galaxy-panorama.jpg
diff --git a/galaxy/assets/galaxy-panorama.jpg.import → galaxy/map/galaxy-panorama.jpg.import b/galaxy/assets/galaxy-panorama.jpg.import → galaxy/map/galaxy-panorama.jpg.import
@@ -3,16 +3,16 @@
 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
 }
 
 [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 → galaxy/map/galaxy_map.gd b/galaxy/galaxy_map/galaxy_map.gd → galaxy/map/galaxy_map.gd
diff --git a/galaxy/galaxy_map/galaxy_map.tscn → galaxy/map/galaxy_map.tscn b/galaxy/galaxy_map/galaxy_map.tscn → 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 → galaxy/map/galaxy_map_camera.gd b/galaxy/galaxy_map/galaxy_map_camera.gd → galaxy/map/galaxy_map_camera.gd
diff --git a/...xy/galaxy_map/galaxy_map_current_mat.tres → galaxy/map/galaxy_map_current_mat.tres b/...xy/galaxy_map/galaxy_map_current_mat.tres → galaxy/map/galaxy_map_current_mat.tres
diff --git a/galaxy/galaxy_map/galaxy_map_hyperlane.gd → galaxy/map/galaxy_map_hyperlane.gd b/galaxy/galaxy_map/galaxy_map_hyperlane.gd → galaxy/map/galaxy_map_hyperlane.gd
diff --git a/galaxy/galaxy_map/galaxy_map_hyperlane.tscn → galaxy/map/galaxy_map_hyperlane.tscn b/galaxy/galaxy_map/galaxy_map_hyperlane.tscn → 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 → galaxy/map/galaxy_map_system.gd b/galaxy/galaxy_map/galaxy_map_system.gd → galaxy/map/galaxy_map_system.gd
diff --git a/galaxy/galaxy_map/galaxy_map_system.tscn → galaxy/map/galaxy_map_system.tscn b/galaxy/galaxy_map/galaxy_map_system.tscn → 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 → galaxy/map/galaxy_sky.gdshader b/galaxy/galaxy_map/galaxy_sky.gdshader → galaxy/map/galaxy_sky.gdshader
diff --git a/galaxy/star_systems/alpha_centauri.tscn → ...y/star_systems/scenes/alpha_centauri.tscn b/galaxy/star_systems/alpha_centauri.tscn → ...y/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 → ...y/star_systems/scenes/barnard's_star.tscn b/galaxy/star_systems/barnard's_star.tscn → ...y/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 → galaxy/star_systems/scenes/sol.tscn b/galaxy/star_systems/sol.tscn → 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 → galaxy/star_systems/scenes/wolf_359.tscn b/galaxy/star_systems/wolf_359.tscn → 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 → galaxy/star_systems/sol.tres b/galaxy/sol.tres → galaxy/star_systems/sol.tres
diff --git 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 → gui/audio/itempick1.wav b/gui/generic_sounds/itempick1.wav → gui/audio/itempick1.wav
diff --git a/gui/generic_sounds/itempick1.wav.import → gui/audio/itempick1.wav.import b/gui/generic_sounds/itempick1.wav.import → 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 → gui/fonts/Exo2-VariableFont_wght.ttf b/gui/font/Exo2-VariableFont_wght.ttf → gui/fonts/Exo2-VariableFont_wght.ttf
diff --git a/gui/font/Exo2-VariableFont_wght.ttf.import → gui/fonts/Exo2-VariableFont_wght.ttf.import b/gui/font/Exo2-VariableFont_wght.ttf.import → 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 → gui/hud/control_scheme_button.gd b/gui/control_scheme_button.gd → gui/hud/control_scheme_button.gd
diff --git a/gui/nesia_assets/elements/IconEnergy.png → gui/hud/images/IconEnergy.png b/gui/nesia_assets/elements/IconEnergy.png → gui/hud/images/IconEnergy.png
diff --git a/...sia_assets/elements/IconEnergy.png.import → gui/hud/images/IconEnergy.png.import b/...sia_assets/elements/IconEnergy.png.import → 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 → gui/hud/images/IconHull.png b/gui/nesia_assets/elements/IconHull.png → gui/hud/images/IconHull.png