diff --git a/dungeonGenerator/dungeon.gd b/dungeon.gd
similarity index 100%
rename from dungeonGenerator/dungeon.gd
rename to dungeon.gd
diff --git a/dungeonGenerator/dungeon.gd.uid b/dungeon.gd.uid
similarity index 100%
rename from dungeonGenerator/dungeon.gd.uid
rename to dungeon.gd.uid
diff --git a/dungeonGenerator/dungeonGenerator.tscn b/dungeonGenerator/dungeonGenerator.tscn
deleted file mode 100644
index 94a4537..0000000
--- a/dungeonGenerator/dungeonGenerator.tscn
+++ /dev/null
@@ -1,12 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://cerkgsgcxogxa"]
-
-[ext_resource type="Script" uid="uid://bj1iov1sgi7bo" path="res://dungeonGenerator/dungeon.gd" id="1_bt1uu"]
-
-[node name="Main" type="Control"]
-layout_mode = 3
-anchors_preset = 0
-
-[node name="Dungeon" type="Node" parent="."]
-script = ExtResource("1_bt1uu")
-init = true
-metadata/_custom_type_script = "uid://bj1iov1sgi7bo"
diff --git a/dungeonRoom/dungeonRoom.gd b/dungeonRoom/dungeonRoom.gd
index d8bf730..4a25830 100644
--- a/dungeonRoom/dungeonRoom.gd
+++ b/dungeonRoom/dungeonRoom.gd
@@ -1,7 +1,6 @@
 extends Node3D
 
 func updateRoom() -> void:
-	var dungeon: Dungeon = get_node("/root/Main/Dungeon")
 	var currentRoomData: int = dungeon.grid[dungeon.currentRoom]
 	
 	if currentRoomData & dungeon.BitDoorNorth:
@@ -17,15 +16,15 @@ func updateRoom() -> void:
 		setDoor("west")
 	
 	if currentRoomData & dungeon.BitStairBelow:
-		(get_node("/root/Main/DungeonRoom/stair-down") as Node3D).visible = true
-		(get_node("/root/Main/DungeonRoom/no-stair-down") as Node3D).visible = false
+		(get_node("/root/DungeonRoom/stair-down") as Node3D).visible = true
+		(get_node("/root/DungeonRoom/no-stair-down") as Node3D).visible = false
 	
 	if currentRoomData & dungeon.BitStairUp:
-		(get_node("/root/Main/DungeonRoom/stair-up") as Node3D).visible = true
+		(get_node("/root/DungeonRoom/stair-up") as Node3D).visible = true
 
 func setDoor(doorName: String) -> void:
-	(get_node("/root/Main/DungeonRoom/" + doorName + "-door") as Node3D).visible = true
-	(get_node("/root/Main/DungeonRoom/no-" + doorName + "-door") as Node3D).visible = false
+	(get_node("/root/DungeonRoom/" + doorName + "-door") as Node3D).visible = true
+	(get_node("/root/DungeonRoom/no-" + doorName + "-door") as Node3D).visible = false
 
 func _ready() -> void:
 	updateRoom()
diff --git a/project.godot b/project.godot
index 51d6d8e..2208231 100644
--- a/project.godot
+++ b/project.godot
@@ -15,6 +15,10 @@ run/main_scene="uid://dk700xxolt8x6"
 config/features=PackedStringArray("4.4", "Forward Plus")
 config/icon="res://icon.svg"
 
+[autoload]
+
+dungeon="*res://dungeon.gd"
+
 [editor]
 
 version_control/plugin_name="GitPlugin"
diff --git a/start/start.gd b/start/start.gd
index d0a2710..35bb4a3 100644
--- a/start/start.gd
+++ b/start/start.gd
@@ -2,7 +2,9 @@ extends Node
 
 
 func _on_new_game_pressed() -> void:
-	get_tree().change_scene_to_file("res://dungeonGenerator/dungeonGenerator.tscn")
+	dungeon.generate()
+	dungeon.currentRoom = dungeon.entrance
+	get_tree().change_scene_to_file("res://dungeonRoom/dungeonRoom.tscn")
 
 func _on_quit_pressed() -> void:
 	get_tree().quit()