diff --git a/Makefile b/Makefile
index a14a3c5..ac77c43 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,4 @@ GO = go
 .PHONY: build/pacman
 
 build/pacman:
-	$(GO) build -o $@ ./pacman
+	$(GO) build -o $@ ./cmd/main
diff --git a/pacman/game.go b/cmd/main/game.go
similarity index 90%
rename from pacman/game.go
rename to cmd/main/game.go
index 02bdc66..2e95eb7 100644
--- a/pacman/game.go
+++ b/cmd/main/game.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"pacman/assets"
-	"pacman/render"
-	"pacman/world"
+	"pacman/engine/render"
+	"pacman/game/assets"
+	"pacman/game/world"
 
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
diff --git a/render/constants.go b/engine/render/constants.go
similarity index 100%
rename from render/constants.go
rename to engine/render/constants.go
diff --git a/render/render.go b/engine/render/render.go
similarity index 100%
rename from render/render.go
rename to engine/render/render.go
diff --git a/render/tile.go b/engine/render/tile.go
similarity index 97%
rename from render/tile.go
rename to engine/render/tile.go
index 2aab1aa..2332f6c 100644
--- a/render/tile.go
+++ b/engine/render/tile.go
@@ -1,7 +1,7 @@
 package render
 
 import (
-	"pacman/assets"
+	"pacman/game/assets"
 
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
diff --git a/assets/def.go b/game/assets/def.go
similarity index 100%
rename from assets/def.go
rename to game/assets/def.go
diff --git a/assets/level1.dat b/game/assets/level1.dat
similarity index 100%
rename from assets/level1.dat
rename to game/assets/level1.dat
diff --git a/assets/levels.go b/game/assets/levels.go
similarity index 100%
rename from assets/levels.go
rename to game/assets/levels.go
diff --git a/world/maze.go b/game/world/maze.go
similarity index 97%
rename from world/maze.go
rename to game/world/maze.go
index fde5281..b56ee18 100644
--- a/world/maze.go
+++ b/game/world/maze.go
@@ -1,7 +1,7 @@
 package world
 
 import (
-	"pacman/assets"
+	"pacman/game/assets"
 )
 
 const (