diff --git a/Game/Map.tscn b/Game/Map.tscn
index 4184863..27190d0 100644
--- a/Game/Map.tscn
+++ b/Game/Map.tscn
@@ -1,8 +1,17 @@
-[gd_scene load_steps=9 format=3 uid="uid://b1078bn8gy2qf"]
+[gd_scene load_steps=8 format=3 uid="uid://b1078bn8gy2qf"]
 
 [ext_resource type="PackedScene" uid="uid://n3ktc2gomi2p" path="res://Assets/MapComponents/SpawnPoint.tscn" id="1"]
 [ext_resource type="Material" uid="uid://dsq5f4ams7ibh" path="res://Assets/Materials/World/Development/dev.tres" id="1_iue03"]
-[ext_resource type="StreamTexture3D" uid="uid://dp74htl3lpbqu" path="res://Assets/Maps/DM1/ParticlesCollisionSDF.exr" id="10_2c624"]
+
+[sub_resource type="CameraEffects" id="CameraEffects_i6883"]
+dof_blur_far_enabled = true
+dof_blur_far_distance = 0.01
+dof_blur_far_transition = 173.56
+dof_blur_near_enabled = true
+dof_blur_near_distance = 33.81
+dof_blur_near_transition = 17.18
+dof_blur_amount = 1.0
+override_exposure = 0.0
 
 [sub_resource type="PhysicalSkyMaterial" id="1"]
 
@@ -42,18 +51,14 @@ volumetric_fog_gi_inject = 0.1
 
 [sub_resource type="CameraEffects" id="4"]
 
-[sub_resource type="CameraEffects" id="CameraEffects_i6883"]
-dof_blur_far_enabled = true
-dof_blur_far_distance = 0.01
-dof_blur_far_transition = 173.56
-dof_blur_near_enabled = true
-dof_blur_near_distance = 33.81
-dof_blur_near_transition = 17.18
-dof_blur_amount = 1.0
-override_exposure = 0.0
-
 [node name="Map" type="Node3D"]
 
+[node name="Camera" type="Camera3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 16)
+effects = SubResource( "CameraEffects_i6883" )
+current = true
+fov = 60.0
+
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource( "3" )
 camera_effects = SubResource( "4" )
@@ -80,7 +85,31 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
 size = Vector3(16, 2, 16)
 material = ExtResource( "1_iue03" )
 
-[node name="DecalsStatic" type="Node3D" parent="."]
+[node name="Props" type="Node3D" parent="."]
+__meta__ = {
+"_edit_lock_": true
+}
+
+[node name="ParticlesCollision" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.22556, 9.57059, 0)
+__meta__ = {
+"_edit_lock_": true
+}
+
+[node name="GPUParticlesCollisionSDF" type="GPUParticlesCollisionSDF" parent="ParticlesCollision"]
+cull_mask = 4293918721
+extents = Vector3(64, 64, 64)
+resolution = 3
+__meta__ = {
+"_edit_lock_": true
+}
+
+[node name="SpecialCollision" type="Node3D" parent="."]
+__meta__ = {
+"_edit_lock_": true
+}
+
+[node name="Decals" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
 __meta__ = {
 "_edit_lock_": true
@@ -97,6 +126,7 @@ __meta__ = {
 }
 
 [node name="ReflectionProbe" type="ReflectionProbe" parent="ReflectionProbes"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0)
 extents = Vector3(64, 64, 64)
 box_projection = true
 enable_shadows = true
@@ -115,6 +145,9 @@ priority = 1.0
 reverb_bus_enable = true
 reverb_bus_name = &"Reverb Large"
 reverb_bus_amount = 1.0
+__meta__ = {
+"_edit_lock_": true
+}
 
 [node name="Medium" type="Area3D" parent="ReverbZones"]
 collision_mask = 0
@@ -123,6 +156,9 @@ monitoring = false
 reverb_bus_enable = true
 reverb_bus_name = &"Reverb Medium"
 reverb_bus_amount = 1.0
+__meta__ = {
+"_edit_lock_": true
+}
 
 [node name="Small" type="Area3D" parent="ReverbZones"]
 collision_mask = 0
@@ -131,8 +167,6 @@ monitoring = false
 reverb_bus_enable = true
 reverb_bus_name = &"Reverb Small"
 reverb_bus_amount = 1.0
-
-[node name="Props" type="Node3D" parent="."]
 __meta__ = {
 "_edit_lock_": true
 }
@@ -143,19 +177,3 @@ __meta__ = {
 }
 
 [node name="SpawnPoint1" parent="SpawnPoints" instance=ExtResource( "1" )]
-
-[node name="Camera" type="Camera3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 16)
-effects = SubResource( "CameraEffects_i6883" )
-current = true
-fov = 60.0
-
-[node name="GPUParticlesCollisionSDF" type="GPUParticlesCollisionSDF" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.22556, 9.57059, 0)
-cull_mask = 4293918721
-extents = Vector3(26.1656, 14.931, 22.8541)
-resolution = 3
-texture = ExtResource( "10_2c624" )
-__meta__ = {
-"_edit_lock_": true
-}
diff --git a/Game/project.godot b/Game/project.godot
index 05f224a..30d7802 100644
--- a/Game/project.godot
+++ b/Game/project.godot
@@ -173,13 +173,18 @@ screenshot={
 
 [layer_names]
 
-3d_render/layer_1="Map Geometry"
-3d_render/layer_2="Character Models"
-3d_render/layer_3="Effects"
-3d_physics/layer_1="World"
-3d_physics/layer_2="Players"
+3d_render/layer_1="Static"
+3d_render/layer_2="Dynamic"
+3d_render/layer_3="Players"
+3d_physics/layer_1="Solid"
+3d_physics/layer_2="SemiSolid"
 3d_physics/layer_3="Pickups"
-3d_physics/layer_4="Decoration"
+3d_physics/layer_4="PlayersOnly"
+3d_physics/layer_5="FireOnly"
+3d_physics/layer_6="RedTeamPlayersOnly"
+3d_physics/layer_7="BlueTeamPlayersOnly"
+3d_physics/layer_8="RedTeamFireOnly"
+3d_physics/layer_9="BlueTeamFireOnly"
 
 [rendering]