diff --git a/02_mazes_and_enemies/main.go b/02_mazes_and_enemies/main.go
index bb2471a..26450ac 100644
--- a/02_mazes_and_enemies/main.go
+++ b/02_mazes_and_enemies/main.go
@@ -3,7 +3,7 @@ package main
 func main() {
   DebugInit()
 
-  game := NewGame(27, 17)
+  game := NewGame(17, 11)
   game.InitScreen()
 
   game.NewMap()
@@ -11,7 +11,7 @@ func main() {
   game.PlaceEnemies(dead_ends)
   game.Render()
 
-  for game.HandleEvents() && game.Player.HP > 0 {
+  for game.HandleEvents() {
     game.Render()
   }
 
diff --git a/03_pathing_enemies/main.go b/03_pathing_enemies/main.go
index 0625366..112ae32 100644
--- a/03_pathing_enemies/main.go
+++ b/03_pathing_enemies/main.go
@@ -3,7 +3,7 @@ package main
 func main() {
   DebugInit()
 
-  game := NewGame(27, 17)
+  game := NewGame(17, 11)
   game.InitScreen()
 
   for {
diff --git a/04_combat/04_combat_multifile/Makefile b/04_combat/Makefile
similarity index 100%
rename from 04_combat/04_combat_multifile/Makefile
rename to 04_combat/Makefile
diff --git a/04_combat/04_combat_multifile/combat.go b/04_combat/combat.go
similarity index 100%
rename from 04_combat/04_combat_multifile/combat.go
rename to 04_combat/combat.go
diff --git a/04_combat/04_combat_multifile/data.go b/04_combat/data.go
similarity index 100%
rename from 04_combat/04_combat_multifile/data.go
rename to 04_combat/data.go
diff --git a/04_combat/04_combat_multifile/debug.go b/04_combat/debug.go
similarity index 100%
rename from 04_combat/04_combat_multifile/debug.go
rename to 04_combat/debug.go
diff --git a/04_combat/04_combat_multifile/game.go b/04_combat/game.go
similarity index 100%
rename from 04_combat/04_combat_multifile/game.go
rename to 04_combat/game.go
diff --git a/04_combat/04_combat_multifile/go.mod b/04_combat/go.mod
similarity index 100%
rename from 04_combat/04_combat_multifile/go.mod
rename to 04_combat/go.mod
diff --git a/04_combat/04_combat_multifile/go.sum b/04_combat/go.sum
similarity index 100%
rename from 04_combat/04_combat_multifile/go.sum
rename to 04_combat/go.sum
diff --git a/04_combat/04_combat_multifile/main.go b/04_combat/main.go
similarity index 100%
rename from 04_combat/04_combat_multifile/main.go
rename to 04_combat/main.go
diff --git a/04_combat/04_combat_multifile/map.go b/04_combat/map.go
similarity index 100%
rename from 04_combat/04_combat_multifile/map.go
rename to 04_combat/map.go
diff --git a/04_combat/04_combat_multifile/maze.go b/04_combat/maze.go
similarity index 100%
rename from 04_combat/04_combat_multifile/maze.go
rename to 04_combat/maze.go
diff --git a/04_combat/04_combat_multifile/movement.go b/04_combat/movement.go
similarity index 100%
rename from 04_combat/04_combat_multifile/movement.go
rename to 04_combat/movement.go
diff --git a/04_combat/04_combat_multifile/pathing.go b/04_combat/pathing.go
similarity index 100%
rename from 04_combat/04_combat_multifile/pathing.go
rename to 04_combat/pathing.go
diff --git a/04_combat/04_combat_multifile/ui.go b/04_combat/ui.go
similarity index 100%
rename from 04_combat/04_combat_multifile/ui.go
rename to 04_combat/ui.go