diff --git a/entities/target_dummy/assets/models/.gdignore b/entities/target_dummy/assets/models/.gdignore
new file mode 100644
index 0000000..e69de29
diff --git a/entities/target_dummy/assets/player_mesh.blend b/entities/target_dummy/assets/models/player_mesh.blend
similarity index 100%
rename from entities/target_dummy/assets/player_mesh.blend
rename to entities/target_dummy/assets/models/player_mesh.blend
diff --git a/entities/target_dummy/assets/player_mesh.blend.import b/entities/target_dummy/assets/player_mesh.blend.import
deleted file mode 100644
index 57e42e6..0000000
--- a/entities/target_dummy/assets/player_mesh.blend.import
+++ /dev/null
@@ -1,50 +0,0 @@
-[remap]
-
-importer="scene"
-importer_version=1
-type="PackedScene"
-uid="uid://b83leo1ca47d7"
-path="res://.godot/imported/player_mesh.blend-b5697f48af9161c855a7a3326936546b.scn"
-
-[deps]
-
-source_file="res://entities/target_dummy/assets/player_mesh.blend"
-dest_files=["res://.godot/imported/player_mesh.blend-b5697f48af9161c855a7a3326936546b.scn"]
-
-[params]
-
-nodes/root_type=""
-nodes/root_name=""
-nodes/apply_root_scale=true
-nodes/root_scale=1.0
-meshes/ensure_tangents=true
-meshes/generate_lods=false
-meshes/create_shadow_meshes=true
-meshes/light_baking=1
-meshes/lightmap_texel_size=0.2
-meshes/force_disable_compression=false
-skins/use_named_skins=true
-animation/import=true
-animation/fps=30
-animation/trimming=false
-animation/remove_immutable_tracks=true
-import_script/path=""
-_subresources={}
-gltf/naming_version=1
-gltf/embedded_image_handling=1
-blender/nodes/visible=0
-blender/nodes/punctual_lights=true
-blender/nodes/cameras=true
-blender/nodes/custom_properties=true
-blender/nodes/modifiers=1
-blender/meshes/colors=false
-blender/meshes/uvs=true
-blender/meshes/normals=true
-blender/meshes/tangents=true
-blender/meshes/skins=2
-blender/meshes/export_bones_deforming_mesh_only=false
-blender/materials/unpack_enabled=true
-blender/materials/export_materials=1
-blender/animation/limit_playback=true
-blender/animation/always_sample=true
-blender/animation/group_tracks=true
diff --git a/entities/target_dummy/assets/player_mesh.glb b/entities/target_dummy/assets/player_mesh.glb
new file mode 100644
index 0000000..38bc155
Binary files /dev/null and b/entities/target_dummy/assets/player_mesh.glb differ
diff --git a/entities/weapons/space_gun/assets/SpaceGun.glb.import b/entities/target_dummy/assets/player_mesh.glb.import
similarity index 68%
rename from entities/weapons/space_gun/assets/SpaceGun.glb.import
rename to entities/target_dummy/assets/player_mesh.glb.import
index 668b38e..7817a72 100644
--- a/entities/weapons/space_gun/assets/SpaceGun.glb.import
+++ b/entities/target_dummy/assets/player_mesh.glb.import
@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://dmkytrpsfbtlh"
-path="res://.godot/imported/SpaceGun.glb-0db04c8ca5303ddb63caf30246915a7e.scn"
+uid="uid://chuein4frnvwt"
+path="res://.godot/imported/player_mesh.glb-a0e04e00b0469c9659174448aceb10a7.scn"
 
 [deps]
 
-source_file="res://entities/weapons/space_gun/assets/SpaceGun.glb"
-dest_files=["res://.godot/imported/SpaceGun.glb-0db04c8ca5303ddb63caf30246915a7e.scn"]
+source_file="res://entities/target_dummy/assets/player_mesh.glb"
+dest_files=["res://.godot/imported/player_mesh.glb-a0e04e00b0469c9659174448aceb10a7.scn"]
 
 [params]
 
diff --git a/entities/target_dummy/target_dummy.tscn b/entities/target_dummy/target_dummy.tscn
index 57e0095..472bc8a 100644
--- a/entities/target_dummy/target_dummy.tscn
+++ b/entities/target_dummy/target_dummy.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://entities/target_dummy/target_dummy.gd" id="1_iup5v"]
 [ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://entities/player/collision_shape.tres" id="2_i5k5j"]
-[ext_resource type="PackedScene" uid="uid://b83leo1ca47d7" path="res://entities/target_dummy/assets/player_mesh.blend" id="2_u0wyn"]
+[ext_resource type="PackedScene" uid="uid://chuein4frnvwt" path="res://entities/target_dummy/assets/player_mesh.glb" id="4_fuync"]
 [ext_resource type="PackedScene" uid="uid://bof3mg7wgxrmn" path="res://components/health_component.tscn" id="4_l1exy"]
 
 [node name="DummyTarget" type="RigidBody3D"]
@@ -16,77 +16,10 @@ continuous_cd = true
 script = ExtResource("1_iup5v")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 shape = ExtResource("2_i5k5j")
 
 [node name="HealthComponent" parent="." instance=ExtResource("4_l1exy")]
 
-[node name="TargetMesh" parent="." instance=ExtResource("2_u0wyn")]
-transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0, -0.916438, 0)
-
-[node name="Skeleton3D" parent="TargetMesh/playerrig" index="0"]
-bones/0/position = Vector3(0, 0.995864, -0.0552)
-bones/0/rotation = Quaternion(0.12582, -1.79059e-15, -1.33409e-23, 0.992053)
-bones/0/scale = Vector3(1, 1, 1)
-bones/1/rotation = Quaternion(-0.0644764, 5.62483e-23, -9.26994e-23, 0.997919)
-bones/4/rotation = Quaternion(0.201738, -3.62729e-15, 4.53412e-16, 0.97944)
-bones/6/rotation = Quaternion(-0.605155, -0.345862, -0.356135, 0.622363)
-bones/7/rotation = Quaternion(-0.244994, 0.787594, -0.344589, 0.448255)
-bones/7/scale = Vector3(1, 1, 1)
-bones/8/scale = Vector3(1, 1, 1)
-bones/9/rotation = Quaternion(0.126866, -0.0346058, -0.00662176, 0.991294)
-bones/9/scale = Vector3(1, 1, 1)
-bones/11/rotation = Quaternion(-0.0630718, -0.16283, 0.0971492, 0.979832)
-bones/13/rotation = Quaternion(0.0299552, -0.545663, -0.00259936, 0.837465)
-bones/13/scale = Vector3(1, 1, 1)
-bones/14/rotation = Quaternion(-0.0636278, -0.0624373, 0.0299354, 0.995569)
-bones/17/rotation = Quaternion(0.0486079, -0.0407852, 0.014286, 0.997883)
-bones/19/rotation = Quaternion(-0.12453, -0.526036, 0.129609, 0.831252)
-bones/20/rotation = Quaternion(-0.0225172, -0.0668488, 0.0231689, 0.99724)
-bones/20/scale = Vector3(1, 1, 1)
-bones/21/rotation = Quaternion(-0.00114936, 0.0252308, -0.0174874, 0.999528)
-bones/21/scale = Vector3(1, 1, 1)
-bones/23/rotation = Quaternion(0.0104723, -0.0704384, 0.0293146, 0.99703)
-bones/23/scale = Vector3(1, 1, 1)
-bones/25/rotation = Quaternion(-0.605155, 0.345863, 0.356135, 0.622363)
-bones/25/scale = Vector3(1, 1, 1)
-bones/26/rotation = Quaternion(0.0407172, -0.246634, 0.858112, 0.448506)
-bones/26/scale = Vector3(1, 1, 1)
-bones/27/scale = Vector3(1, 1, 1)
-bones/28/rotation = Quaternion(-0.217102, 0.0422089, 0.0230507, 0.974963)
-bones/28/scale = Vector3(1, 1, 1)
-bones/30/rotation = Quaternion(-0.0630717, 0.16283, -0.0971492, 0.979832)
-bones/31/rotation = Quaternion(0.0237032, 0.0123211, -0.0433656, 0.998702)
-bones/31/scale = Vector3(1, 1, 1)
-bones/32/rotation = Quaternion(0.243143, 0.523041, 0.164477, 0.800161)
-bones/32/scale = Vector3(1, 1, 1)
-bones/33/rotation = Quaternion(-0.0636278, 0.0624373, -0.0299354, 0.995569)
-bones/35/rotation = Quaternion(0.113348, 0.545076, 0.134205, 0.819776)
-bones/36/rotation = Quaternion(-0.4266, 0.0977703, 0.332942, 0.835226)
-bones/37/rotation = Quaternion(-0.632018, -0.129105, 0.241206, 0.725056)
-bones/38/rotation = Quaternion(0.0934222, 0.536709, 0.031309, 0.837995)
-bones/39/rotation = Quaternion(-0.479327, 0.030236, 0.338389, 0.809212)
-bones/40/rotation = Quaternion(-0.540176, -0.0581251, 0.395197, 0.740709)
-bones/40/scale = Vector3(1, 1, 1)
-bones/41/rotation = Quaternion(0.0241847, 0.530538, 0.0849425, 0.843048)
-bones/41/scale = Vector3(1, 1, 1)
-bones/42/rotation = Quaternion(-0.451682, -0.0170104, 0.326969, 0.829931)
-bones/43/rotation = Quaternion(-0.512965, -0.0942157, 0.391943, 0.757873)
-bones/44/rotation = Quaternion(0.986515, -3.3762e-16, 1.34771e-25, 0.163672)
-bones/44/scale = Vector3(1, 1, 0.999997)
-bones/45/scale = Vector3(1, 1, 1)
-bones/46/rotation = Quaternion(-0.574131, 2.92207e-06, -4.58343e-06, 0.818763)
-bones/47/rotation = Quaternion(1.99048e-05, 0.961249, -0.27568, 4.3124e-06)
-bones/47/scale = Vector3(1, 1, 1)
-bones/48/rotation = Quaternion(0.679706, 0.679706, -0.194936, 0.194936)
-bones/49/rotation = Quaternion(0.986515, -3.3762e-16, 1.34771e-25, 0.163672)
-bones/49/scale = Vector3(1, 1, 0.999997)
-bones/50/scale = Vector3(1, 1, 1)
-bones/51/rotation = Quaternion(-0.574131, -2.92207e-06, 4.58343e-06, 0.818763)
-bones/52/rotation = Quaternion(-1.99048e-05, 0.961249, -0.27568, -4.3124e-06)
-bones/52/scale = Vector3(1, 1, 1)
-bones/53/rotation = Quaternion(0.679706, -0.679706, 0.194936, 0.194936)
-
-[node name="AnimationPlayer" parent="TargetMesh" index="4"]
-autoplay = "gunOneHanded"
-
-[editable path="TargetMesh"]
+[node name="TargetMesh" parent="." instance=ExtResource("4_fuync")]
+transform = Transform3D(0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0, 0, 0)
diff --git a/entities/weapons/space_gun/assets/SpaceGun.glb b/entities/weapons/space_gun/assets/SpaceGun.glb
deleted file mode 100644
index cd52816..0000000
Binary files a/entities/weapons/space_gun/assets/SpaceGun.glb and /dev/null differ
diff --git a/entities/weapons/space_gun/assets/SpaceGun_0.png b/entities/weapons/space_gun/assets/SpaceGun_0.png
deleted file mode 100644
index 4ee4d81..0000000
Binary files a/entities/weapons/space_gun/assets/SpaceGun_0.png and /dev/null differ
diff --git a/entities/weapons/space_gun/assets/SpaceGun_0.png.import b/entities/weapons/space_gun/assets/SpaceGun_0.png.import
deleted file mode 100644
index 63931de..0000000
--- a/entities/weapons/space_gun/assets/SpaceGun_0.png.import
+++ /dev/null
@@ -1,36 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://0khl3tfc5qt7"
-path.s3tc="res://.godot/imported/SpaceGun_0.png-7b156369b1f6601ca016c4c1372db4e1.s3tc.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
-}
-generator_parameters={}
-
-[deps]
-
-source_file="res://entities/weapons/space_gun/assets/SpaceGun_0.png"
-dest_files=["res://.godot/imported/SpaceGun_0.png-7b156369b1f6601ca016c4c1372db4e1.s3tc.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=true
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=0
diff --git a/entities/weapons/space_gun/assets/albedo.png b/entities/weapons/space_gun/assets/albedo.png
deleted file mode 100644
index 4ee4d81..0000000
Binary files a/entities/weapons/space_gun/assets/albedo.png and /dev/null differ
diff --git a/entities/weapons/space_gun/assets/albedo.png.import b/entities/weapons/space_gun/assets/albedo.png.import
deleted file mode 100644
index 66e9b1b..0000000
--- a/entities/weapons/space_gun/assets/albedo.png.import
+++ /dev/null
@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b6jh0pviakeba"
-path.bptc="res://.godot/imported/albedo.png-22cb12b7a806f7a46cb787f5504e33c7.bptc.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://entities/weapons/space_gun/assets/albedo.png"
-dest_files=["res://.godot/imported/albedo.png-22cb12b7a806f7a46cb787f5504e33c7.bptc.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=true
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=true
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1
diff --git a/entities/weapons/space_gun/assets/disclauncher.blend.import b/entities/weapons/space_gun/assets/disclauncher.blend.import
deleted file mode 100644
index 33ea1e3..0000000
--- a/entities/weapons/space_gun/assets/disclauncher.blend.import
+++ /dev/null
@@ -1,50 +0,0 @@
-[remap]
-
-importer="scene"
-importer_version=1
-type="PackedScene"
-uid="uid://q2v7c7011xva"
-path="res://.godot/imported/disclauncher.blend-a26958530956435b197b16a484362916.scn"
-
-[deps]
-
-source_file="res://entities/weapons/space_gun/assets/disclauncher.blend"
-dest_files=["res://.godot/imported/disclauncher.blend-a26958530956435b197b16a484362916.scn"]
-
-[params]
-
-nodes/root_type=""
-nodes/root_name=""
-nodes/apply_root_scale=true
-nodes/root_scale=1.0
-meshes/ensure_tangents=true
-meshes/generate_lods=true
-meshes/create_shadow_meshes=true
-meshes/light_baking=1
-meshes/lightmap_texel_size=0.2
-meshes/force_disable_compression=false
-skins/use_named_skins=true
-animation/import=true
-animation/fps=30
-animation/trimming=false
-animation/remove_immutable_tracks=true
-import_script/path=""
-_subresources={}
-gltf/naming_version=1
-gltf/embedded_image_handling=1
-blender/nodes/visible=0
-blender/nodes/punctual_lights=true
-blender/nodes/cameras=true
-blender/nodes/custom_properties=true
-blender/nodes/modifiers=1
-blender/meshes/colors=false
-blender/meshes/uvs=true
-blender/meshes/normals=true
-blender/meshes/tangents=true
-blender/meshes/skins=2
-blender/meshes/export_bones_deforming_mesh_only=false
-blender/materials/unpack_enabled=true
-blender/materials/export_materials=1
-blender/animation/limit_playback=true
-blender/animation/always_sample=true
-blender/animation/group_tracks=true
diff --git a/entities/weapons/space_gun/assets/disclauncher.glb b/entities/weapons/space_gun/assets/disclauncher.glb
new file mode 100644
index 0000000..5c319b3
Binary files /dev/null and b/entities/weapons/space_gun/assets/disclauncher.glb differ
diff --git a/entities/weapons/space_gun/assets/disclauncher.glb.import b/entities/weapons/space_gun/assets/disclauncher.glb.import
new file mode 100644
index 0000000..a79a2e5
--- /dev/null
+++ b/entities/weapons/space_gun/assets/disclauncher.glb.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bjcn37ops3bro"
+path="res://.godot/imported/disclauncher.glb-e58edebbe444fad4554f8c76e8b18f06.scn"
+
+[deps]
+
+source_file="res://entities/weapons/space_gun/assets/disclauncher.glb"
+dest_files=["res://.godot/imported/disclauncher.glb-e58edebbe444fad4554f8c76e8b18f06.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/naming_version=1
+gltf/embedded_image_handling=1
diff --git a/entities/weapons/space_gun/assets/material.tres b/entities/weapons/space_gun/assets/material.tres
deleted file mode 100644
index 2c88076..0000000
--- a/entities/weapons/space_gun/assets/material.tres
+++ /dev/null
@@ -1,3 +0,0 @@
-[gd_resource type="ShaderMaterial" format=3 uid="uid://de6t4olk7hrs1"]
-
-[resource]
diff --git a/entities/weapons/space_gun/assets/models/.gdignore b/entities/weapons/space_gun/assets/models/.gdignore
new file mode 100644
index 0000000..e69de29
diff --git a/entities/weapons/space_gun/assets/disclauncher.blend b/entities/weapons/space_gun/assets/models/disclauncher.blend
similarity index 69%
rename from entities/weapons/space_gun/assets/disclauncher.blend
rename to entities/weapons/space_gun/assets/models/disclauncher.blend
index e6eda8c..9c46790 100644
Binary files a/entities/weapons/space_gun/assets/disclauncher.blend and b/entities/weapons/space_gun/assets/models/disclauncher.blend differ
diff --git a/entities/weapons/space_gun/assets/textures/albedo0.png b/entities/weapons/space_gun/assets/textures/albedo0.png
deleted file mode 100644
index 4ee4d81..0000000
Binary files a/entities/weapons/space_gun/assets/textures/albedo0.png and /dev/null differ
diff --git a/entities/weapons/space_gun/assets/textures/albedo0.png.import b/entities/weapons/space_gun/assets/textures/albedo0.png.import
deleted file mode 100644
index 4b43a0e..0000000
--- a/entities/weapons/space_gun/assets/textures/albedo0.png.import
+++ /dev/null
@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://ccmtnj5j5suas"
-path.bptc="res://.godot/imported/albedo0.png-121381efe4812ebf7a36005e21664fab.bptc.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://entities/weapons/space_gun/assets/textures/albedo0.png"
-dest_files=["res://.godot/imported/albedo0.png-121381efe4812ebf7a36005e21664fab.bptc.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=true
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=true
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1
diff --git a/entities/weapons/space_gun/space_gun.tscn b/entities/weapons/space_gun/space_gun.tscn
index 07875ab..91cf752 100644
--- a/entities/weapons/space_gun/space_gun.tscn
+++ b/entities/weapons/space_gun/space_gun.tscn
@@ -1,19 +1,14 @@
 [gd_scene load_steps=4 format=3 uid="uid://c8co0qa2omjmh"]
 
 [ext_resource type="Script" path="res://entities/weapons/space_gun/space_gun.gd" id="1_6sm4s"]
-[ext_resource type="PackedScene" uid="uid://q2v7c7011xva" path="res://entities/weapons/space_gun/assets/disclauncher.blend" id="2_28y77"]
 [ext_resource type="PackedScene" uid="uid://dn1tcakam5egs" path="res://entities/weapons/space_gun/projectile.tscn" id="2_wvneg"]
+[ext_resource type="PackedScene" uid="uid://bjcn37ops3bro" path="res://entities/weapons/space_gun/assets/disclauncher.glb" id="3_5k2xm"]
 
 [node name="SpaceGun" type="Node3D"]
 script = ExtResource("1_6sm4s")
 PROJECTILE = ExtResource("2_wvneg")
 
-[node name="Mesh" parent="." instance=ExtResource("2_28y77")]
-
-[node name="grip" parent="Mesh" index="0"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
+[node name="disclauncher" parent="." instance=ExtResource("3_5k2xm")]
 
 [node name="Nozzle" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.111355, 0.540839)
-
-[editable path="Mesh"]
diff --git a/project.godot b/project.godot
index 5f007c7..cd0bad0 100644
--- a/project.godot
+++ b/project.godot
@@ -49,6 +49,10 @@ movie_writer/disable_vsync=true
 
 enabled=PackedStringArray("res://addons/gut/plugin.cfg", "res://addons/smoothing/plugin.cfg", "res://addons/terrain_3d/plugin.cfg")
 
+[filesystem]
+
+import/blender/enabled=false
+
 [input]
 
 forward={