diff --git a/Makefile b/Makefile
index 4ff491c..c56c9dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 executable = jaildoctors_dilemma
-source = source/*.cpp source/common/*.cpp
+source = source/*.cpp source/jail_engine/*.cpp
 appName = JailDoctor's Dilemma
 releaseFolder = jdd_release
 version = v1.08
diff --git a/source/cheevos.h b/source/cheevos.h
index 71ed116..0aab3cf 100644
--- a/source/cheevos.h
+++ b/source/cheevos.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/screen.h"
-#include "common/utils.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/utils.h"
 #include <string>
 #include <vector>
 
diff --git a/source/const.h b/source/const.h
index dd30b2f..95db648 100644
--- a/source/const.h
+++ b/source/const.h
@@ -2,7 +2,7 @@
 
 #include <SDL2/SDL.h>
 #include <string>
-#include "common/utils.h"
+#include "jail_engine/utils.h"
 
 #ifndef CONST_H
 #define CONST_H
diff --git a/source/credits.h b/source/credits.h
index 3b866b5..7e8e4c9 100644
--- a/source/credits.h
+++ b/source/credits.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>
 
diff --git a/source/demo.h b/source/demo.h
index cf5b6ef..f9d9b21 100644
--- a/source/demo.h
+++ b/source/demo.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/debug.h"
-#include "common/input.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/input.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "item_tracker.h"
 #include "room_tracker.h"
diff --git a/source/director.cpp b/source/director.cpp
index 19ad032..da5f309 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -1,5 +1,5 @@
-#include "common/jscore.h"
-#include "common/utils.h"
+#include "jail_engine/jscore.h"
+#include "jail_engine/utils.h"
 #include "director.h"
 #include <errno.h>
 #include <iostream>
diff --git a/source/director.h b/source/director.h
index ea361d8..60c0ccd 100644
--- a/source/director.h
+++ b/source/director.h
@@ -1,14 +1,14 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/debug.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/movingsprite.h"
-#include "common/resource.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/movingsprite.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "credits.h"
 #include "demo.h"
diff --git a/source/ending.h b/source/ending.h
index c50b1f2..8f95383 100644
--- a/source/ending.h
+++ b/source/ending.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <string>
 #include <vector>
diff --git a/source/ending2.h b/source/ending2.h
index 9911c1c..21e5262 100644
--- a/source/ending2.h
+++ b/source/ending2.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>
 #include <string>
diff --git a/source/enemy.h b/source/enemy.h
index 96b0a11..6520647 100644
--- a/source/enemy.h
+++ b/source/enemy.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/utils.h"
 #include <string>
 
 #ifndef ENEMY_H
diff --git a/source/enter_id.cpp b/source/enter_id.cpp
index 5a3b869..87f97fc 100644
--- a/source/enter_id.cpp
+++ b/source/enter_id.cpp
@@ -1,5 +1,5 @@
-#include "common/jail_audio.h"
-#include "common/jscore.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/jscore.h"
 #include "const.h"
 #include "enter_id.h"
 #include <iostream>
diff --git a/source/enter_id.h b/source/enter_id.h
index c10f4e2..c60dca9 100644
--- a/source/enter_id.h
+++ b/source/enter_id.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/screen.h"
-#include "common/utils.h"
-#include "common/text.h"
-#include "common/texture.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/utils.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
 #include <string>
 #include <vector>
 
diff --git a/source/game.h b/source/game.h
index 9753ed7..5420f81 100644
--- a/source/game.h
+++ b/source/game.h
@@ -2,16 +2,16 @@
 
 #include <SDL2/SDL.h>
 #include "cheevos.h"
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/debug.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "item_tracker.h"
 #include "player.h"
diff --git a/source/game_over.h b/source/game_over.h
index ef64f61..5a86491 100644
--- a/source/game_over.h
+++ b/source/game_over.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/texture.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>
 
diff --git a/source/intro.h b/source/intro.h
index d0a7219..6ffc86c 100644
--- a/source/intro.h
+++ b/source/intro.h
@@ -1,18 +1,18 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>
 
 #include <string>
-#include "common/text.h"
+#include "jail_engine/text.h"
 
 #ifndef INTRO_H
 #define INTRO_H
diff --git a/source/item.h b/source/item.h
index 1df9e61..e194f1c 100644
--- a/source/item.h
+++ b/source/item.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/utils.h"
 #include <string>
 
 #ifndef ITEM_H
diff --git a/source/item_tracker.h b/source/item_tracker.h
index 05c20e7..fed3dc6 100644
--- a/source/item_tracker.h
+++ b/source/item_tracker.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "jail_engine/utils.h"
 #include <string>
 #include <vector>
 
diff --git a/source/common/animatedsprite.cpp b/source/jail_engine/animatedsprite.cpp
similarity index 100%
rename from source/common/animatedsprite.cpp
rename to source/jail_engine/animatedsprite.cpp
diff --git a/source/common/animatedsprite.h b/source/jail_engine/animatedsprite.h
similarity index 100%
rename from source/common/animatedsprite.h
rename to source/jail_engine/animatedsprite.h
diff --git a/source/common/asset.cpp b/source/jail_engine/asset.cpp
similarity index 100%
rename from source/common/asset.cpp
rename to source/jail_engine/asset.cpp
diff --git a/source/common/asset.h b/source/jail_engine/asset.h
similarity index 100%
rename from source/common/asset.h
rename to source/jail_engine/asset.h
diff --git a/source/common/debug.cpp b/source/jail_engine/debug.cpp
similarity index 100%
rename from source/common/debug.cpp
rename to source/jail_engine/debug.cpp
diff --git a/source/common/debug.h b/source/jail_engine/debug.h
similarity index 100%
rename from source/common/debug.h
rename to source/jail_engine/debug.h
diff --git a/source/common/input.cpp b/source/jail_engine/input.cpp
similarity index 100%
rename from source/common/input.cpp
rename to source/jail_engine/input.cpp
diff --git a/source/common/input.h b/source/jail_engine/input.h
similarity index 100%
rename from source/common/input.h
rename to source/jail_engine/input.h
diff --git a/source/common/jail_audio.cpp b/source/jail_engine/jail_audio.cpp
similarity index 100%
rename from source/common/jail_audio.cpp
rename to source/jail_engine/jail_audio.cpp
diff --git a/source/common/jail_audio.h b/source/jail_engine/jail_audio.h
similarity index 100%
rename from source/common/jail_audio.h
rename to source/jail_engine/jail_audio.h
diff --git a/source/common/jail_audio_sdlmixer.cpp b/source/jail_engine/jail_audio_sdlmixer.cpp
similarity index 100%
rename from source/common/jail_audio_sdlmixer.cpp
rename to source/jail_engine/jail_audio_sdlmixer.cpp
diff --git a/source/common/jscore.cpp b/source/jail_engine/jscore.cpp
similarity index 100%
rename from source/common/jscore.cpp
rename to source/jail_engine/jscore.cpp
diff --git a/source/common/jscore.h b/source/jail_engine/jscore.h
similarity index 100%
rename from source/common/jscore.h
rename to source/jail_engine/jscore.h
diff --git a/source/common/menu.cpp b/source/jail_engine/menu.cpp
similarity index 100%
rename from source/common/menu.cpp
rename to source/jail_engine/menu.cpp
diff --git a/source/common/menu.h b/source/jail_engine/menu.h
similarity index 100%
rename from source/common/menu.h
rename to source/jail_engine/menu.h
diff --git a/source/common/movingsprite.cpp b/source/jail_engine/movingsprite.cpp
similarity index 100%
rename from source/common/movingsprite.cpp
rename to source/jail_engine/movingsprite.cpp
diff --git a/source/common/movingsprite.h b/source/jail_engine/movingsprite.h
similarity index 100%
rename from source/common/movingsprite.h
rename to source/jail_engine/movingsprite.h
diff --git a/source/common/notify.cpp b/source/jail_engine/notify.cpp
similarity index 100%
rename from source/common/notify.cpp
rename to source/jail_engine/notify.cpp
diff --git a/source/common/notify.h b/source/jail_engine/notify.h
similarity index 100%
rename from source/common/notify.h
rename to source/jail_engine/notify.h
diff --git a/source/common/resource.cpp b/source/jail_engine/resource.cpp
similarity index 100%
rename from source/common/resource.cpp
rename to source/jail_engine/resource.cpp
diff --git a/source/common/resource.h b/source/jail_engine/resource.h
similarity index 100%
rename from source/common/resource.h
rename to source/jail_engine/resource.h
diff --git a/source/common/screen.cpp b/source/jail_engine/screen.cpp
similarity index 100%
rename from source/common/screen.cpp
rename to source/jail_engine/screen.cpp
diff --git a/source/common/screen.h b/source/jail_engine/screen.h
similarity index 100%
rename from source/common/screen.h
rename to source/jail_engine/screen.h
diff --git a/source/common/sprite.cpp b/source/jail_engine/sprite.cpp
similarity index 100%
rename from source/common/sprite.cpp
rename to source/jail_engine/sprite.cpp
diff --git a/source/common/sprite.h b/source/jail_engine/sprite.h
similarity index 100%
rename from source/common/sprite.h
rename to source/jail_engine/sprite.h
diff --git a/source/common/stb_image.h b/source/jail_engine/stb_image.h
similarity index 100%
rename from source/common/stb_image.h
rename to source/jail_engine/stb_image.h
diff --git a/source/common/stb_vorbis.c b/source/jail_engine/stb_vorbis.c
similarity index 100%
rename from source/common/stb_vorbis.c
rename to source/jail_engine/stb_vorbis.c
diff --git a/source/common/text.cpp b/source/jail_engine/text.cpp
similarity index 100%
rename from source/common/text.cpp
rename to source/jail_engine/text.cpp
diff --git a/source/common/text.h b/source/jail_engine/text.h
similarity index 100%
rename from source/common/text.h
rename to source/jail_engine/text.h
diff --git a/source/common/texture.cpp b/source/jail_engine/texture.cpp
similarity index 100%
rename from source/common/texture.cpp
rename to source/jail_engine/texture.cpp
diff --git a/source/common/texture.h b/source/jail_engine/texture.h
similarity index 100%
rename from source/common/texture.h
rename to source/jail_engine/texture.h
diff --git a/source/common/utils.cpp b/source/jail_engine/utils.cpp
similarity index 100%
rename from source/common/utils.cpp
rename to source/jail_engine/utils.cpp
diff --git a/source/common/utils.h b/source/jail_engine/utils.h
similarity index 100%
rename from source/common/utils.h
rename to source/jail_engine/utils.h
diff --git a/source/logo.h b/source/logo.h
index d7a5828..1c28d17 100644
--- a/source/logo.h
+++ b/source/logo.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>
 
diff --git a/source/player.h b/source/player.h
index e614fc1..3bea553 100644
--- a/source/player.h
+++ b/source/player.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/debug.h"
-#include "common/input.h"
-#include "common/resource.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/input.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "room.h"
 #include <string>
diff --git a/source/room.h b/source/room.h
index e3d2efd..7d97f11 100644
--- a/source/room.h
+++ b/source/room.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/debug.h"
-#include "common/jail_audio.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/debug.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include "enemy.h"
 #include "item_tracker.h"
diff --git a/source/room_tracker.h b/source/room_tracker.h
index f680117..c8da537 100644
--- a/source/room_tracker.h
+++ b/source/room_tracker.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "jail_engine/utils.h"
 #include <string>
 #include <vector>
 
diff --git a/source/scoreboard.h b/source/scoreboard.h
index 742d028..463fc52 100644
--- a/source/scoreboard.h
+++ b/source/scoreboard.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/resource.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/animatedsprite.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <string>
 
diff --git a/source/stats.cpp b/source/stats.cpp
index 85e39e7..5d44256 100644
--- a/source/stats.cpp
+++ b/source/stats.cpp
@@ -1,4 +1,4 @@
-#include "common/jscore.h"
+#include "jail_engine/jscore.h"
 #include "stats.h"
 #include <algorithm>
 #include <fstream>
diff --git a/source/stats.h b/source/stats.h
index e75a898..f6a81bc 100644
--- a/source/stats.h
+++ b/source/stats.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "jail_engine/utils.h"
 #include <string>
 #include <vector>
 
diff --git a/source/title.h b/source/title.h
index d32e5e7..dd7a064 100644
--- a/source/title.h
+++ b/source/title.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/resource.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "jail_engine/asset.h"
+#include "jail_engine/input.h"
+#include "jail_engine/jail_audio.h"
+#include "jail_engine/resource.h"
+#include "jail_engine/screen.h"
+#include "jail_engine/sprite.h"
+#include "jail_engine/text.h"
+#include "jail_engine/utils.h"
 #include "const.h"
 #include <vector>