diff --git a/makefile b/makefile
index cbc054d..6c4a6dc 100644
--- a/makefile
+++ b/makefile
@@ -22,41 +22,41 @@ format:
 	@ clang-format -i src/porporo.c src/devices/*
 
 lint:
-	@ ${CLI} ~/roms/uxnlin.rom src/utils/menu.tal
-	@ ${CLI} ~/roms/uxnlin.rom src/utils/wallpaper.tal
-	@ ${CLI} ~/roms/uxnlin.rom src/utils/potato.tal
-	@ ${CLI} ~/roms/uxnlin.rom src/utils/log.tal
+	@ ${CLI} ~/roms/uxnlin.rom src/core/menu.tal
+	@ ${CLI} ~/roms/uxnlin.rom src/core/wallpaper.tal
+	@ ${CLI} ~/roms/uxnlin.rom src/core/potato.tal
+	@ ${CLI} ~/roms/uxnlin.rom src/core/log.tal
 
 clean:
 	@ rm -f bin/*
 	@ rm -f src/roms/*
 
-bin/uxnasm: src/uxnasm.c
+bin/uxnasm: src/utils/uxnasm.c
 	@ mkdir -p bin
-	@ cc ${RELEASE_flags} src/uxnasm.c -o ${ASM}
-
+	@ cc ${RELEASE_flags} src/utils/uxnasm.c -o ${ASM}
+	
 bin/uxncli: src/uxncli.c
 	@ mkdir -p src/roms
 	@ cc ${RELEASE_flags} ${SRC} src/uxncli.c -o ${CLI}
 
 bin/format-c.rom: src/utils/format-c.tal
 	@ ${ASM} src/utils/format-c.tal bin/format-c.rom
-
-src/roms/menu.c: bin/format-c.rom src/utils/menu.tal src/utils/menu.assets.tal
-	@ ${ASM} src/utils/menu.tal bin/menu.rom
+	
+src/roms/menu.c: bin/format-c.rom src/core/menu.tal src/core/menu.assets.tal
+	@ ${ASM} src/core/menu.tal bin/menu.rom
 	@ ${CLI} bin/format-c.rom bin/menu.rom > src/roms/menu.c
-
-src/roms/potato.c: bin/format-c.rom src/utils/potato.tal src/utils/potato.assets.tal
-	@ ${ASM} src/utils/potato.tal bin/potato.rom
+	
+src/roms/potato.c: bin/format-c.rom src/core/potato.tal src/core/potato.assets.tal
+	@ ${ASM} src/core/potato.tal bin/potato.rom
 	@ ${CLI} bin/format-c.rom bin/potato.rom > src/roms/potato.c
-
-src/roms/wallpaper.c: bin/format-c.rom src/utils/wallpaper.tal
-	@ ${ASM} src/utils/wallpaper.tal bin/wallpaper.rom
+	
+src/roms/wallpaper.c: bin/format-c.rom src/core/wallpaper.tal
+	@ ${ASM} src/core/wallpaper.tal bin/wallpaper.rom
 	@ ${CLI} bin/format-c.rom bin/wallpaper.rom > src/roms/wallpaper.c
-
+	
 bin/porporo: ${SRC} ${TMP} src/porporo.c
 	@ cc ${RELEASE_flags} ${SRC} src/porporo.c -L/usr/local/lib -lSDL2 -o bin/porporo
-
-bin/log.rom: src/utils/log.tal src/utils/log.assets.tal
-	@ ${ASM} src/utils/log.tal bin/log.rom
+	
+bin/log.rom: src/core/log.tal src/core/log.assets.tal
+	@ ${ASM} src/core/log.tal bin/log.rom
 	
\ No newline at end of file
diff --git a/src/utils/log.assets.tal b/src/core/log.assets.tal
similarity index 100%
rename from src/utils/log.assets.tal
rename to src/core/log.assets.tal
diff --git a/src/utils/log.tal b/src/core/log.tal
similarity index 99%
rename from src/utils/log.tal
rename to src/core/log.tal
index 74cfe95..c39acbc 100644
--- a/src/utils/log.tal
+++ b/src/core/log.tal
@@ -306,5 +306,5 @@
 	aa55 805f 9057 9455 aa55 02f9 0ae9 2aa9
 	9554 9750 9f40 aa55 aa29 ea09 fa01 aa55 ]
 
-~src/utils/log.assets.tal
+~src/core/log.assets.tal
 
diff --git a/src/utils/menu.assets.tal b/src/core/menu.assets.tal
similarity index 100%
rename from src/utils/menu.assets.tal
rename to src/core/menu.assets.tal
diff --git a/src/utils/menu.tal b/src/core/menu.tal
similarity index 99%
rename from src/utils/menu.tal
rename to src/core/menu.tal
index 1a798f1..3f8146c 100644
--- a/src/utils/menu.tal
+++ b/src/core/menu.tal
@@ -393,5 +393,5 @@
 	&rom-ext "rom $1
 	&empty "(empty) $1
 
-~src/utils/menu.assets.tal
+~src/core/menu.assets.tal
 
diff --git a/src/utils/potato.assets.tal b/src/core/potato.assets.tal
similarity index 100%
rename from src/utils/potato.assets.tal
rename to src/core/potato.assets.tal
diff --git a/src/utils/potato.tal b/src/core/potato.tal
similarity index 99%
rename from src/utils/potato.tal
rename to src/core/potato.tal
index 6361483..ece0c79 100644
--- a/src/utils/potato.tal
+++ b/src/core/potato.tal
@@ -251,5 +251,5 @@
 
 @actions-lut [ =dict/default =dict/move =dict/draw ]
 
-~src/utils/potato.assets.tal
+~src/core/potato.assets.tal
 
diff --git a/src/utils/wallpaper.tal b/src/core/wallpaper.tal
similarity index 100%
rename from src/utils/wallpaper.tal
rename to src/core/wallpaper.tal
diff --git a/src/uxnasm.c b/src/utils/uxnasm.c
similarity index 100%
rename from src/uxnasm.c
rename to src/utils/uxnasm.c