diff --git a/Assets/Prefabs/Geometry/Corridor.prefab b/Assets/Prefabs/Geometry/Corridor.prefab
index 817788b..f770a30 100644
--- a/Assets/Prefabs/Geometry/Corridor.prefab
+++ b/Assets/Prefabs/Geometry/Corridor.prefab
@@ -14,7 +14,7 @@ GameObject:
   - component: {fileID: 1512510488903838250}
   - component: {fileID: 1512510488903838251}
   - component: {fileID: 1512510488903838248}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Cube
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -834,7 +834,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1512510490295915832}
-  m_Layer: 0
+  - component: {fileID: 8806165094647198657}
+  m_Layer: 7
   m_Name: Corridor
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -858,6 +859,19 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8806165094647198657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1512510490295915833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 805fdd402844143449c117db608dd1af, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  dimensions: {x: 8, y: 3, z: 8}
 --- !u!1 &5912142284899155845
 GameObject:
   m_ObjectHideFlags: 0
@@ -867,7 +881,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1993360738814005221}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Attachment
   m_TagString: Untagged
   m_Icon: {fileID: 0}
diff --git a/Assets/Prefabs/Geometry/Wall-S.prefab b/Assets/Prefabs/Geometry/DeadEnd.prefab
similarity index 73%
rename from Assets/Prefabs/Geometry/Wall-S.prefab
rename to Assets/Prefabs/Geometry/DeadEnd.prefab
index 591d8f6..039a892 100644
--- a/Assets/Prefabs/Geometry/Wall-S.prefab
+++ b/Assets/Prefabs/Geometry/DeadEnd.prefab
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2197883235744611184
+--- !u!1 &6036638518381947339
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,41 +8,73 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2197883235744611178}
-  - component: {fileID: 2197883235744611179}
-  - component: {fileID: 2197883235744611180}
-  - component: {fileID: 2197883235744611181}
-  - component: {fileID: 2197883235744611182}
-  - component: {fileID: 2197883235744611183}
-  m_Layer: 0
-  m_Name: Wall-S
+  - component: {fileID: 6036638518381947336}
+  m_Layer: 7
+  m_Name: DeadEnd
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2197883235744611178
+--- !u!4 &6036638518381947336
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2197883235744611184}
+  m_GameObject: {fileID: 6036638518381947339}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -30, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 6036638518928302446}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2197883235744611179
+--- !u!1 &6036638518928302441
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6036638518928302446}
+  - component: {fileID: 6036638518928302435}
+  - component: {fileID: 6036638518928302434}
+  - component: {fileID: 6036638518928302445}
+  - component: {fileID: 6036638518928302444}
+  - component: {fileID: 6036638518928302447}
+  m_Layer: 7
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6036638518928302446
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6036638518928302441}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -3, y: 0, z: -1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6036638518381947336}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6036638518928302435
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2197883235744611184}
+  m_GameObject: {fileID: 6036638518928302441}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3}
@@ -164,54 +196,54 @@ MonoBehaviour:
   m_SharedTextures: []
   m_Positions:
   - {x: 0, y: 0, z: 1}
-  - {x: 10, y: 0, z: 1}
-  - {x: 0, y: 3, z: 1}
-  - {x: 10, y: 3, z: 1}
-  - {x: 10, y: 0, z: 1}
-  - {x: 10, y: 0, z: 0}
-  - {x: 10, y: 3, z: 1}
-  - {x: 10, y: 3, z: 0}
-  - {x: 10, y: 0, z: 0}
+  - {x: 6, y: 0, z: 1}
+  - {x: 0, y: 2, z: 1}
+  - {x: 6, y: 2, z: 1}
+  - {x: 6, y: 0, z: 1}
+  - {x: 6, y: 0, z: 0}
+  - {x: 6, y: 2, z: 1}
+  - {x: 6, y: 2, z: 0}
+  - {x: 6, y: 0, z: 0}
   - {x: 0, y: 0, z: 0}
-  - {x: 10, y: 3, z: 0}
-  - {x: 0, y: 3, z: 0}
+  - {x: 6, y: 2, z: 0}
+  - {x: 0, y: 2, z: 0}
   - {x: 0, y: 0, z: 0}
   - {x: 0, y: 0, z: 1}
-  - {x: 0, y: 3, z: 0}
-  - {x: 0, y: 3, z: 1}
-  - {x: 0, y: 3, z: 1}
-  - {x: 10, y: 3, z: 1}
-  - {x: 0, y: 3, z: 0}
-  - {x: 10, y: 3, z: 0}
+  - {x: 0, y: 2, z: 0}
+  - {x: 0, y: 2, z: 1}
+  - {x: 0, y: 2, z: 1}
+  - {x: 6, y: 2, z: 1}
+  - {x: 0, y: 2, z: 0}
+  - {x: 6, y: 2, z: 0}
   - {x: 0, y: 0, z: 0}
-  - {x: 10, y: 0, z: 0}
+  - {x: 6, y: 0, z: 0}
   - {x: 0, y: 0, z: 1}
-  - {x: 10, y: 0, z: 1}
+  - {x: 6, y: 0, z: 1}
   m_Textures0:
   - {x: 0, y: 0}
-  - {x: -10, y: 0}
-  - {x: 0, y: 3}
-  - {x: -10, y: 3}
+  - {x: -6, y: 0}
+  - {x: 0, y: 2}
+  - {x: -6, y: 2}
   - {x: 1, y: 0}
   - {x: 0, y: 0}
-  - {x: 1, y: 3}
-  - {x: 0, y: 3}
-  - {x: 10, y: 0}
+  - {x: 1, y: 2}
+  - {x: 0, y: 2}
+  - {x: 6, y: 0}
   - {x: 0, y: 0}
-  - {x: 10, y: 3}
-  - {x: 0, y: 3}
+  - {x: 6, y: 2}
+  - {x: 0, y: 2}
   - {x: 0, y: 0}
   - {x: -1, y: 0}
-  - {x: 0, y: 3}
-  - {x: -1, y: 3}
+  - {x: 0, y: 2}
+  - {x: -1, y: 2}
   - {x: 0, y: 1}
-  - {x: 10, y: 1}
+  - {x: 6, y: 1}
   - {x: 0, y: 0}
-  - {x: 10, y: 0}
+  - {x: 6, y: 0}
   - {x: 0, y: 0}
-  - {x: -10, y: 0}
+  - {x: -6, y: 0}
   - {x: 0, y: 1}
-  - {x: -10, y: 1}
+  - {x: -6, y: 1}
   m_Textures2: []
   m_Textures3: []
   m_Tangents:
@@ -248,45 +280,45 @@ MonoBehaviour:
   m_PreserveMeshAssetOnDestroy: 0
   assetGuid: 
   m_Mesh: {fileID: 0}
-  m_VersionIndex: 17
+  m_VersionIndex: 21
   m_IsSelectable: 1
   m_SelectedFaces: 
   m_SelectedEdges: []
   m_SelectedVertices: 
---- !u!114 &2197883235744611180
+--- !u!114 &6036638518928302434
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2197883235744611184}
+  m_GameObject: {fileID: 6036638518928302441}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Shape:
-    rid: 2146742158488502282
-  m_Size: {x: 10, y: 3, z: 1}
+    rid: 1833426981419220995
+  m_Size: {x: 6, y: 2, z: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_PivotLocation: 1
   m_PivotPosition: {x: 0, y: 0, z: 0}
   m_UnmodifiedMeshVersion: 17
   m_ShapeBox:
-    m_Center: {x: 5, y: 1.5, z: 0.5}
-    m_Extent: {x: 5, y: 1.5, z: 0.5}
+    m_Center: {x: 3, y: 1, z: 0.5}
+    m_Extent: {x: 3, y: 1, z: 0.5}
   references:
     version: 2
     RefIds:
-    - rid: 2146742158488502282
+    - rid: 1833426981419220995
       type: {class: Cube, ns: UnityEngine.ProBuilder.Shapes, asm: Unity.ProBuilder}
---- !u!23 &2197883235744611181
+--- !u!23 &6036638518928302445
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2197883235744611184}
+  m_GameObject: {fileID: 6036638518928302441}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -322,21 +354,21 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &2197883235744611182
+--- !u!33 &6036638518928302444
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2197883235744611184}
+  m_GameObject: {fileID: 6036638518928302441}
   m_Mesh: {fileID: 0}
---- !u!64 &2197883235744611183
+--- !u!64 &6036638518928302447
 MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2197883235744611184}
+  m_GameObject: {fileID: 6036638518928302441}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
diff --git a/Assets/Prefabs/Geometry/Wall-S.prefab.meta b/Assets/Prefabs/Geometry/DeadEnd.prefab.meta
similarity index 100%
rename from Assets/Prefabs/Geometry/Wall-S.prefab.meta
rename to Assets/Prefabs/Geometry/DeadEnd.prefab.meta
diff --git a/Assets/Prefabs/Geometry/Ground.prefab b/Assets/Prefabs/Geometry/Ground.prefab
deleted file mode 100644
index 4f1863b..0000000
--- a/Assets/Prefabs/Geometry/Ground.prefab
+++ /dev/null
@@ -1,346 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3041982322822041137
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3041982322822041167}
-  - component: {fileID: 3041982322822041166}
-  - component: {fileID: 3041982322822041165}
-  - component: {fileID: 3041982322822041164}
-  - component: {fileID: 3041982322822041139}
-  - component: {fileID: 3041982322822041138}
-  m_Layer: 0
-  m_Name: Ground
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3041982322822041167
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3041982322822041137}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -30, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3041982322822041166
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3041982322822041137}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MeshFormatVersion: 2
-  m_Faces:
-  - m_Indexes: 000000000100000002000000010000000300000002000000
-    m_SmoothingGroup: 0
-    m_Uv:
-      m_UseWorldSpace: 0
-      m_FlipU: 0
-      m_FlipV: 0
-      m_SwapUV: 0
-      m_Fill: 1
-      m_Scale: {x: 1, y: 1}
-      m_Offset: {x: 0, y: 0}
-      m_Rotation: 0
-      m_Anchor: 9
-    m_Material: {fileID: 0}
-    m_SubmeshIndex: 0
-    m_ManualUV: 0
-    elementGroup: -1
-    m_TextureGroup: -1
-  - m_Indexes: 040000000500000006000000050000000700000006000000
-    m_SmoothingGroup: 0
-    m_Uv:
-      m_UseWorldSpace: 0
-      m_FlipU: 0
-      m_FlipV: 0
-      m_SwapUV: 0
-      m_Fill: 1
-      m_Scale: {x: 1, y: 1}
-      m_Offset: {x: 0, y: 0}
-      m_Rotation: 0
-      m_Anchor: 9
-    m_Material: {fileID: 0}
-    m_SubmeshIndex: 0
-    m_ManualUV: 0
-    elementGroup: -1
-    m_TextureGroup: -1
-  - m_Indexes: 08000000090000000a000000090000000b0000000a000000
-    m_SmoothingGroup: 0
-    m_Uv:
-      m_UseWorldSpace: 0
-      m_FlipU: 0
-      m_FlipV: 0
-      m_SwapUV: 0
-      m_Fill: 1
-      m_Scale: {x: 1, y: 1}
-      m_Offset: {x: 0, y: 0}
-      m_Rotation: 0
-      m_Anchor: 9
-    m_Material: {fileID: 0}
-    m_SubmeshIndex: 0
-    m_ManualUV: 0
-    elementGroup: -1
-    m_TextureGroup: -1
-  - m_Indexes: 0c0000000d0000000e0000000d0000000f0000000e000000
-    m_SmoothingGroup: 0
-    m_Uv:
-      m_UseWorldSpace: 0
-      m_FlipU: 0
-      m_FlipV: 0
-      m_SwapUV: 0
-      m_Fill: 1
-      m_Scale: {x: 1, y: 1}
-      m_Offset: {x: 0, y: 0}
-      m_Rotation: 0
-      m_Anchor: 9
-    m_Material: {fileID: 0}
-    m_SubmeshIndex: 0
-    m_ManualUV: 0
-    elementGroup: -1
-    m_TextureGroup: -1
-  - m_Indexes: 100000001100000012000000110000001300000012000000
-    m_SmoothingGroup: 0
-    m_Uv:
-      m_UseWorldSpace: 0
-      m_FlipU: 0
-      m_FlipV: 0
-      m_SwapUV: 0
-      m_Fill: 1
-      m_Scale: {x: 1, y: 1}
-      m_Offset: {x: 0, y: 0}
-      m_Rotation: 0
-      m_Anchor: 9
-    m_Material: {fileID: 0}
-    m_SubmeshIndex: 0
-    m_ManualUV: 0
-    elementGroup: -1
-    m_TextureGroup: -1
-  - m_Indexes: 140000001500000016000000150000001700000016000000
-    m_SmoothingGroup: 0
-    m_Uv:
-      m_UseWorldSpace: 0
-      m_FlipU: 0
-      m_FlipV: 0
-      m_SwapUV: 0
-      m_Fill: 1
-      m_Scale: {x: 1, y: 1}
-      m_Offset: {x: 0, y: 0}
-      m_Rotation: 0
-      m_Anchor: 9
-    m_Material: {fileID: 0}
-    m_SubmeshIndex: 0
-    m_ManualUV: 0
-    elementGroup: -1
-    m_TextureGroup: -1
-  m_SharedVertices:
-  - m_Vertices: 000000000d00000016000000
-  - m_Vertices: 010000000400000017000000
-  - m_Vertices: 020000000f00000010000000
-  - m_Vertices: 030000000600000011000000
-  - m_Vertices: 050000000800000015000000
-  - m_Vertices: 070000000a00000013000000
-  - m_Vertices: 090000000c00000014000000
-  - m_Vertices: 0b0000000e00000012000000
-  m_SharedTextures: []
-  m_Positions:
-  - {x: 0, y: 0, z: 10}
-  - {x: 10, y: 0, z: 10}
-  - {x: 0, y: 1, z: 10}
-  - {x: 10, y: 1, z: 10}
-  - {x: 10, y: 0, z: 10}
-  - {x: 10, y: 0, z: 0}
-  - {x: 10, y: 1, z: 10}
-  - {x: 10, y: 1, z: 0}
-  - {x: 10, y: 0, z: 0}
-  - {x: 0, y: 0, z: 0}
-  - {x: 10, y: 1, z: 0}
-  - {x: 0, y: 1, z: 0}
-  - {x: 0, y: 0, z: 0}
-  - {x: 0, y: 0, z: 10}
-  - {x: 0, y: 1, z: 0}
-  - {x: 0, y: 1, z: 10}
-  - {x: 0, y: 1, z: 10}
-  - {x: 10, y: 1, z: 10}
-  - {x: 0, y: 1, z: 0}
-  - {x: 10, y: 1, z: 0}
-  - {x: 0, y: 0, z: 0}
-  - {x: 10, y: 0, z: 0}
-  - {x: 0, y: 0, z: 10}
-  - {x: 10, y: 0, z: 10}
-  m_Textures0:
-  - {x: 0, y: 0}
-  - {x: -10, y: 0}
-  - {x: 0, y: 1}
-  - {x: -10, y: 1}
-  - {x: 10, y: 0}
-  - {x: 0, y: 0}
-  - {x: 10, y: 1}
-  - {x: 0, y: 1}
-  - {x: 10, y: 0}
-  - {x: 0, y: 0}
-  - {x: 10, y: 1}
-  - {x: 0, y: 1}
-  - {x: 0, y: 0}
-  - {x: -10, y: 0}
-  - {x: 0, y: 1}
-  - {x: -10, y: 1}
-  - {x: 0, y: 10}
-  - {x: 10, y: 10}
-  - {x: 0, y: 0}
-  - {x: 10, y: 0}
-  - {x: 0, y: 0}
-  - {x: -10, y: 0}
-  - {x: 0, y: 10}
-  - {x: -10, y: 10}
-  m_Textures2: []
-  m_Textures3: []
-  m_Tangents:
-  - {x: -1, y: 0, z: 0, w: -1}
-  - {x: -1, y: 0, z: 0, w: -1}
-  - {x: -1, y: 0, z: 0, w: -1}
-  - {x: -1, y: 0, z: 0, w: -1}
-  - {x: 0, y: 0, z: 1, w: -1}
-  - {x: 0, y: 0, z: 1, w: -1}
-  - {x: 0, y: 0, z: 1, w: -1}
-  - {x: 0, y: 0, z: 1, w: -1}
-  - {x: 1, y: 0, z: 0, w: -1}
-  - {x: 1, y: 0, z: 0, w: -1}
-  - {x: 1, y: 0, z: 0, w: -1}
-  - {x: 1, y: 0, z: 0, w: -1}
-  - {x: 0, y: 0, z: -1, w: -1}
-  - {x: 0, y: 0, z: -1, w: -1}
-  - {x: 0, y: 0, z: -1, w: -1}
-  - {x: 0, y: 0, z: -1, w: -1}
-  - {x: 1, y: 0, z: 0, w: -1}
-  - {x: 1, y: 0, z: 0, w: -1}
-  - {x: 1, y: 0, z: 0, w: -1}
-  - {x: 1, y: 0, z: 0, w: -1}
-  - {x: -1, y: 0, z: 0, w: -1}
-  - {x: -1, y: 0, z: 0, w: -1}
-  - {x: -1, y: 0, z: 0, w: -1}
-  - {x: -1, y: 0, z: 0, w: -1}
-  m_Colors: []
-  m_UnwrapParameters:
-    m_HardAngle: 88
-    m_PackMargin: 20
-    m_AngleError: 8
-    m_AreaError: 15
-  m_PreserveMeshAssetOnDestroy: 0
-  assetGuid: 
-  m_Mesh: {fileID: 0}
-  m_VersionIndex: 17
-  m_IsSelectable: 1
-  m_SelectedFaces: 
-  m_SelectedEdges: []
-  m_SelectedVertices: 
---- !u!114 &3041982322822041165
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3041982322822041137}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Shape:
-    rid: 2146742158488502275
-  m_Size: {x: 10, y: 1, z: 10}
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  m_PivotLocation: 1
-  m_PivotPosition: {x: 0, y: 0, z: 0}
-  m_UnmodifiedMeshVersion: 17
-  m_ShapeBox:
-    m_Center: {x: 5, y: 0.5, z: 5}
-    m_Extent: {x: 5, y: 0.5, z: 5}
-  references:
-    version: 2
-    RefIds:
-    - rid: 2146742158488502275
-      type: {class: Cube, ns: UnityEngine.ProBuilder.Shapes, asm: Unity.ProBuilder}
---- !u!23 &3041982322822041164
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3041982322822041137}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: bdd2d6c973a2d9d4a9639f4446d1d1a4, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 2
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &3041982322822041139
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3041982322822041137}
-  m_Mesh: {fileID: 0}
---- !u!64 &3041982322822041138
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3041982322822041137}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 0}
diff --git a/Assets/Prefabs/Geometry/Ground.prefab.meta b/Assets/Prefabs/Geometry/Ground.prefab.meta
deleted file mode 100644
index 3b2d166..0000000
--- a/Assets/Prefabs/Geometry/Ground.prefab.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d567a9ab8042f3e4bb586974d6be03c3
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Prefabs/Geometry/NavMesh-Model 1.asset b/Assets/Prefabs/Geometry/NavMesh-Model 1.asset
deleted file mode 100644
index d908fc3..0000000
Binary files a/Assets/Prefabs/Geometry/NavMesh-Model 1.asset and /dev/null differ
diff --git a/Assets/Prefabs/Geometry/NavMesh-Model 1.asset.meta b/Assets/Prefabs/Geometry/NavMesh-Model 1.asset.meta
deleted file mode 100644
index 29b0d6f..0000000
--- a/Assets/Prefabs/Geometry/NavMesh-Model 1.asset.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1d4b48dc3a8679747851643e8be38238
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Prefabs/Geometry/Room.prefab b/Assets/Prefabs/Geometry/Room.prefab
index 794672b..47d5b06 100644
--- a/Assets/Prefabs/Geometry/Room.prefab
+++ b/Assets/Prefabs/Geometry/Room.prefab
@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8921555762821758839}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: RootAttachment
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -40,7 +40,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6914995174106282478}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Attachment
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -71,7 +71,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2936333696244214011}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Attachment
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -103,7 +103,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4026393600238520488}
   - component: {fileID: 8079603382893677679}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Room
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -159,7 +159,7 @@ GameObject:
   - component: {fileID: 4026393600420885629}
   - component: {fileID: 4026393600420885628}
   - component: {fileID: 2901331533860472279}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Model
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5585,7 +5585,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3136227232943836433}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Attachment
   m_TagString: Untagged
   m_Icon: {fileID: 0}
diff --git a/Assets/Prefabs/Geometry/Spawn.meta b/Assets/Prefabs/Geometry/Spawn.meta
deleted file mode 100644
index 9730900..0000000
--- a/Assets/Prefabs/Geometry/Spawn.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 12b94fc609919b547b30e71073ff812f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Ghost_White.prefab b/Assets/Prefabs/Ghost_White.prefab
similarity index 100%
rename from Assets/Ghost_White.prefab
rename to Assets/Prefabs/Ghost_White.prefab
diff --git a/Assets/Ghost_White.prefab.meta b/Assets/Prefabs/Ghost_White.prefab.meta
similarity index 100%
rename from Assets/Ghost_White.prefab.meta
rename to Assets/Prefabs/Ghost_White.prefab.meta
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index 2fbc502..0cc1be7 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -223,7 +223,7 @@ Mesh:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: pb_Mesh-1620
+  m_Name: pb_Mesh-1558
   serializedVersion: 10
   m_SubMeshes:
   - serializedVersion: 2
@@ -400,7 +400,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 197828906}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Geometry
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -799,6 +799,7 @@ GameObject:
   - component: {fileID: 1524951595}
   - component: {fileID: 1524951596}
   - component: {fileID: 1524951597}
+  - component: {fileID: 1524951598}
   m_Layer: 0
   m_Name: GameManager
   m_TagString: Untagged
@@ -814,7 +815,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1524951594}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.0602655, y: 6.498241, z: 15.297254}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -848,6 +849,39 @@ MonoBehaviour:
   enemyPrefab: {fileID: 2422363816341469345, guid: 878f06b5ada303f47b84bdd84f0d4917, type: 3}
   roomPrefabs:
   - {fileID: 4026393600238520495, guid: 6109664f69c5dc6419104103d44e9410, type: 3}
+  corridorPrefab: {fileID: 1512510490295915833, guid: 6851cd75e9f241f4f9328937ffd2e5e3, type: 3}
+  deadEndPrefab: {fileID: 6036638518381947339, guid: e88a18bb667cc4a4187ef5caa7f22121, type: 3}
+  minRoomCount: 10
+--- !u!114 &1524951598
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1524951594}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_AgentTypeID: 0
+  m_CollectObjects: 0
+  m_Size: {x: 10, y: 10, z: 10}
+  m_Center: {x: 0, y: 2, z: 0}
+  m_LayerMask:
+    serializedVersion: 2
+    m_Bits: 128
+  m_UseGeometry: 0
+  m_DefaultArea: 0
+  m_IgnoreNavMeshAgent: 1
+  m_IgnoreNavMeshObstacle: 1
+  m_OverrideTileSize: 0
+  m_TileSize: 256
+  m_OverrideVoxelSize: 0
+  m_VoxelSize: 0.16666667
+  m_MinRegionArea: 2
+  m_NavMeshData: {fileID: 0}
+  m_BuildHeightMesh: 0
 --- !u!850595691 &1671578930
 LightingSettings:
   m_ObjectHideFlags: 0
@@ -1040,7 +1074,7 @@ PrefabInstance:
       objectReference: {fileID: 191641129}
     - target: {fileID: 4026393600420885624, guid: 6109664f69c5dc6419104103d44e9410, type: 3}
       propertyPath: m_VersionIndex
-      value: 1770
+      value: 1773
       objectReference: {fileID: 0}
     - target: {fileID: 4026393600420885628, guid: 6109664f69c5dc6419104103d44e9410, type: 3}
       propertyPath: m_Mesh
@@ -1054,5 +1088,6 @@ PrefabInstance:
       propertyPath: isRoot
       value: 1
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 2901331533860472279, guid: 6109664f69c5dc6419104103d44e9410, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 6109664f69c5dc6419104103d44e9410, type: 3}
diff --git a/Assets/Scripts/CorridorScript.cs b/Assets/Scripts/CorridorScript.cs
new file mode 100644
index 0000000..c1bfc4a
--- /dev/null
+++ b/Assets/Scripts/CorridorScript.cs
@@ -0,0 +1,9 @@
+using UnityEngine;
+
+public class CorridorScript : MonoBehaviour
+{
+  [SerializeField]
+  Vector3 dimensions;
+
+  public Vector3 GetDimensions => dimensions;
+}
diff --git a/Assets/Scripts/CorridorScript.cs.meta b/Assets/Scripts/CorridorScript.cs.meta
new file mode 100644
index 0000000..72fabf9
--- /dev/null
+++ b/Assets/Scripts/CorridorScript.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 805fdd402844143449c117db608dd1af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/GameManagerScript.cs b/Assets/Scripts/GameManagerScript.cs
index 668398a..dcbf02f 100644
--- a/Assets/Scripts/GameManagerScript.cs
+++ b/Assets/Scripts/GameManagerScript.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using UnityEngine;
+using Unity.AI.Navigation;
 
 #nullable enable
 
@@ -9,12 +10,29 @@ public class GameManagerScript : MonoBehaviour
   GameObject? enemyPrefab;
   [SerializeField]
   List<GameObject>? roomPrefabs;
+  [SerializeField]
+  GameObject? corridorPrefab;
+  [SerializeField]
+  GameObject? deadEndPrefab;
+
+  [SerializeField]
+  int minRoomCount;
 
   List<GameObject> enemies = new List<GameObject>();
+  List<GameObject> rooms = new List<GameObject>();
 
-  public static GameManagerScript instance = new GameManagerScript();
+  public static GameManagerScript instance = default!;
   public List<GameObject> GetRoomPrefabs =>
     roomPrefabs ?? new List<GameObject> { };
+  public GameObject GetCorridorPrefab => corridorPrefab ?? default!;
+  public GameObject GetDeadEndPrefab => deadEndPrefab ?? default!;
+  public List<GameObject> GetRooms => rooms;
+  public int GetMinRoomCount => minRoomCount;
+
+  public void BakeNavMesh()
+  {
+    GetComponent<NavMeshSurface>().BuildNavMesh();
+  }
 
   public void KillEnemy(GameObject enemy)
   {
diff --git a/Assets/Scripts/RoomScript.cs b/Assets/Scripts/RoomScript.cs
index 37332b7..df16b96 100644
--- a/Assets/Scripts/RoomScript.cs
+++ b/Assets/Scripts/RoomScript.cs
@@ -8,24 +8,84 @@ public class RoomScript : MonoBehaviour
   [SerializeField]
   Vector3 dimensions;
 
-  void GenerateRooms()
+  public Vector3 GetDimensions => dimensions;
+
+  public void GenerateRooms()
   {
+    var manager = GameManagerScript.instance;
+
     var attachments = GetAttachments();
 
-    var roomPrefabs = GameManagerScript.instance.GetRoomPrefabs;
+    var roomPrefabs = manager.GetRoomPrefabs;
+
+    var corridorPrefab = manager.GetCorridorPrefab;
+
+    var deadEndPrefab = manager.GetDeadEndPrefab;
+
+    void GenerateDeadEnd(GameObject attachment)
+    {
+      Instantiate(
+        deadEndPrefab,
+        attachment.transform.position,
+        attachment.transform.rotation
+      );
+    }
 
     foreach (var attachment in attachments)
     {
+      if (manager.GetRooms.Count >= manager.GetMinRoomCount)
+      {
+        // TODO: Trabalhar probabilidade de geração de cada attachment.
+        if (Random.value > 0.2f)
+        {
+          GenerateDeadEnd(attachment: attachment);
+
+          continue;
+        }
+      }
+
       var roomPrefab = roomPrefabs[0];
 
       var attachmentRoomScript = roomPrefab.GetComponent<RoomScript>();
 
+      var attachmentCorridorScript =
+        corridorPrefab.GetComponent<CorridorScript>();
+
+      var corridorLength = attachmentCorridorScript.GetDimensions.z;
+
+      var roomLength = attachmentRoomScript.GetDimensions.z;
+
+      if (
+        !IsRoomPlacementAvailable(
+          checkArea: attachmentRoomScript.GetDimensions +
+            attachmentCorridorScript.GetDimensions,
+          attachment.transform
+        )
+      )
+      {
+        GenerateDeadEnd(attachment: attachment);
+
+        continue;
+      }
+
+      // TODO: Usar ou remover corredor.
+      var corridor = Instantiate(
+        corridorPrefab,
+        attachment.transform.position + attachment.transform.forward *
+          corridorLength / 2f,
+        attachment.transform.rotation
+      );
+
       var room = Instantiate(
         roomPrefab,
-        attachment.transform.position +
-          attachment.transform.forward * attachmentRoomScript.dimensions.z / 2,
+        attachment.transform.position + attachment.transform.forward *
+          (roomLength / 2f + corridorLength),
         attachment.transform.rotation
       );
+
+      manager.GetRooms.Add(room);
+
+      room.GetComponent<RoomScript>().GenerateRooms();
     }
   }
 
@@ -53,11 +113,21 @@ List<GameObject> GetAttachments()
     return attachments;
   }
 
+  bool IsRoomPlacementAvailable(Vector3 checkArea, Transform origin)
+  {
+    return !Physics.CheckBox(
+      origin.position + origin.forward * checkArea.z / 2f,
+      checkArea / 2.01f
+    );
+  }
+
   void Start()
   {
     if (isRoot)
     {
       GenerateRooms();
+
+      GameManagerScript.instance.BakeNavMesh();
     }
   }
 }
diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta
deleted file mode 100644
index 030195c..0000000
--- a/Assets/StreamingAssets.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4007344e041cb534db9e7e06cd5fe6ac
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
index 81b42a1..6f52faf 100644
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -166,7 +166,7 @@
             {
                 "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.LastSize",
-                "value": "{\"m_Value\":{\"x\":6.0,\"y\":1.0,\"z\":8.0}}"
+                "value": "{\"m_Value\":{\"x\":6.0,\"y\":2.0,\"z\":1.0}}"
             },
             {
                 "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 0d91b36..302b7da 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -12,7 +12,7 @@ TagManager:
   - Water
   - UI
   - Enemy
-  - 
+  - Geometry
   - 
   - 
   -