diff --git a/Makefile b/Makefile
index f7ba212..bd53dd0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 executable = jaildoctors_dilemma
-source = source/*.cpp source/jail_engine/*.cpp
+source = source/*.cpp
 appName = JailDoctor's Dilemma
 releaseFolder = jdd_release
 version = v1.09
diff --git a/source/jail_engine/animatedsprite.cpp b/source/animatedsprite.cpp
similarity index 100%
rename from source/jail_engine/animatedsprite.cpp
rename to source/animatedsprite.cpp
diff --git a/source/jail_engine/animatedsprite.h b/source/animatedsprite.h
similarity index 100%
rename from source/jail_engine/animatedsprite.h
rename to source/animatedsprite.h
diff --git a/source/jail_engine/asset.cpp b/source/asset.cpp
similarity index 100%
rename from source/jail_engine/asset.cpp
rename to source/asset.cpp
diff --git a/source/jail_engine/asset.h b/source/asset.h
similarity index 100%
rename from source/jail_engine/asset.h
rename to source/asset.h
diff --git a/source/cheevos.h b/source/cheevos.h
index 7f4d9bb..69955e3 100644
--- a/source/cheevos.h
+++ b/source/cheevos.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "jail_engine/screen.h"
-#include "jail_engine/utils.h"
+#include "screen.h"
+#include "utils.h"
 #include <string>
 #include <vector>
 
diff --git a/source/const.h b/source/const.h
index a9f6930..186226c 100644
--- a/source/const.h
+++ b/source/const.h
@@ -2,7 +2,7 @@
 
 #include <SDL2/SDL.h>
 #include <string>
-#include "jail_engine/utils.h"
+#include "utils.h"
 
 #ifndef CONST_H
 #define CONST_H
diff --git a/source/jail_engine/debug.cpp b/source/debug.cpp
similarity index 100%
rename from source/jail_engine/debug.cpp
rename to source/debug.cpp
diff --git a/source/jail_engine/debug.h b/source/debug.h
similarity index 98%
rename from source/jail_engine/debug.h
rename to source/debug.h
index 3d6f396..04a5f11 100644
--- a/source/jail_engine/debug.h
+++ b/source/debug.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "../const.h"
+#include "const.h"
 #include "asset.h"
 #include "screen.h"
 #include "text.h"
diff --git a/source/director.cpp b/source/director.cpp
index 47f9b18..54c24f7 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -1,4 +1,4 @@
-#include "jail_engine/utils.h"
+#include "utils.h"
 #include "director.h"
 #include <errno.h>
 #include <iostream>
diff --git a/source/director.h b/source/director.h
index 24daf60..4fb737e 100644
--- a/source/director.h
+++ b/source/director.h
@@ -1,14 +1,14 @@
 #pragma once
 #include <SDL2/SDL.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 "asset.h"
+#include "debug.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "movingsprite.h"
+#include "resource.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "gamestate_credits.h"
 #include "gamestate_demo.h"
diff --git a/source/enemy.h b/source/enemy.h
index 6520647..9f2dbe4 100644
--- a/source/enemy.h
+++ b/source/enemy.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/animatedsprite.h"
-#include "jail_engine/asset.h"
-#include "jail_engine/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "utils.h"
 #include <string>
 
 #ifndef ENEMY_H
diff --git a/source/gamestate_credits.h b/source/gamestate_credits.h
index 3acee3e..d7e1f04 100644
--- a/source/gamestate_credits.h
+++ b/source/gamestate_credits.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <SDL2/SDL.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 "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "texture.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 
diff --git a/source/gamestate_demo.h b/source/gamestate_demo.h
index b373b17..2c383b4 100644
--- a/source/gamestate_demo.h
+++ b/source/gamestate_demo.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <SDL2/SDL.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 "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "debug.h"
+#include "input.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "item_tracker.h"
 #include "room_tracker.h"
diff --git a/source/gamestate_ending.h b/source/gamestate_ending.h
index c514992..459edae 100644
--- a/source/gamestate_ending.h
+++ b/source/gamestate_ending.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.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 "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "sprite.h"
+#include "text.h"
+#include "texture.h"
+#include "utils.h"
 #include "const.h"
 #include <string>
 #include <vector>
diff --git a/source/gamestate_ending2.h b/source/gamestate_ending2.h
index bfee7d2..9f6cde7 100644
--- a/source/gamestate_ending2.h
+++ b/source/gamestate_ending2.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.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 "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "texture.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 #include <string>
diff --git a/source/gamestate_game.h b/source/gamestate_game.h
index 30c7be0..9418ec2 100644
--- a/source/gamestate_game.h
+++ b/source/gamestate_game.h
@@ -2,16 +2,16 @@
 
 #include <SDL2/SDL.h>
 #include "cheevos.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 "animatedsprite.h"
+#include "asset.h"
+#include "debug.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "item_tracker.h"
 #include "player.h"
diff --git a/source/gamestate_game_over.h b/source/gamestate_game_over.h
index a34bc8e..17e0bdb 100644
--- a/source/gamestate_game_over.h
+++ b/source/gamestate_game_over.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <SDL2/SDL.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 "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "texture.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 
diff --git a/source/gamestate_loading_screen.h b/source/gamestate_loading_screen.h
index 2a6ea2d..837c9d2 100644
--- a/source/gamestate_loading_screen.h
+++ b/source/gamestate_loading_screen.h
@@ -1,18 +1,18 @@
 #pragma once
 
 #include <SDL2/SDL.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 "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 
 #include <string>
-#include "jail_engine/text.h"
+#include "text.h"
 
 #ifndef LOADING_SCREEN_H
 #define LOADING_SCREEN_H
diff --git a/source/gamestate_logo.h b/source/gamestate_logo.h
index 7b66903..0263b56 100644
--- a/source/gamestate_logo.h
+++ b/source/gamestate_logo.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <SDL2/SDL.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 "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "screen.h"
+#include "sprite.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 
diff --git a/source/gamestate_title.h b/source/gamestate_title.h
index 2695270..e92b8db 100644
--- a/source/gamestate_title.h
+++ b/source/gamestate_title.h
@@ -2,15 +2,15 @@
 
 #include <SDL2/SDL.h>
 #include "cheevos.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/paleta.h"
-#include "jail_engine/screen.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/text.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "resource.h"
+#include "paleta.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include <vector>
 
diff --git a/source/jail_engine/gif.c b/source/gif.c
similarity index 100%
rename from source/jail_engine/gif.c
rename to source/gif.c
diff --git a/source/jail_engine/input.cpp b/source/input.cpp
similarity index 100%
rename from source/jail_engine/input.cpp
rename to source/input.cpp
diff --git a/source/jail_engine/input.h b/source/input.h
similarity index 100%
rename from source/jail_engine/input.h
rename to source/input.h
diff --git a/source/item.h b/source/item.h
index e194f1c..e95e1a6 100644
--- a/source/item.h
+++ b/source/item.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/asset.h"
-#include "jail_engine/sprite.h"
-#include "jail_engine/utils.h"
+#include "asset.h"
+#include "sprite.h"
+#include "utils.h"
 #include <string>
 
 #ifndef ITEM_H
diff --git a/source/item_tracker.h b/source/item_tracker.h
index fed3dc6..d45a041 100644
--- a/source/item_tracker.h
+++ b/source/item_tracker.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "jail_engine/utils.h"
+#include "utils.h"
 #include <string>
 #include <vector>
 
diff --git a/source/jail_engine/jail_audio.cpp b/source/jail_audio.cpp
similarity index 100%
rename from source/jail_engine/jail_audio.cpp
rename to source/jail_audio.cpp
diff --git a/source/jail_engine/jail_audio.h b/source/jail_audio.h
similarity index 100%
rename from source/jail_engine/jail_audio.h
rename to source/jail_audio.h
diff --git a/source/jail_engine/jail_shader.cpp b/source/jail_shader.cpp
similarity index 100%
rename from source/jail_engine/jail_shader.cpp
rename to source/jail_shader.cpp
diff --git a/source/jail_engine/jail_shader.h b/source/jail_shader.h
similarity index 100%
rename from source/jail_engine/jail_shader.h
rename to source/jail_shader.h
diff --git a/source/jail_engine/menu.cpp b/source/menu.cpp
similarity index 99%
rename from source/jail_engine/menu.cpp
rename to source/menu.cpp
index f29f8ac..2cc88e6 100644
--- a/source/jail_engine/menu.cpp
+++ b/source/menu.cpp
@@ -1,4 +1,4 @@
-#include "../const.h"
+#include "const.h"
 #include "menu.h"
 
 // Constructor
diff --git a/source/jail_engine/menu.h b/source/menu.h
similarity index 100%
rename from source/jail_engine/menu.h
rename to source/menu.h
diff --git a/source/jail_engine/movingsprite.cpp b/source/movingsprite.cpp
similarity index 99%
rename from source/jail_engine/movingsprite.cpp
rename to source/movingsprite.cpp
index 80e4fba..ae1c189 100644
--- a/source/jail_engine/movingsprite.cpp
+++ b/source/movingsprite.cpp
@@ -1,4 +1,4 @@
-#include "../const.h"
+#include "const.h"
 #include "movingsprite.h"
 
 // Constructor
diff --git a/source/jail_engine/movingsprite.h b/source/movingsprite.h
similarity index 100%
rename from source/jail_engine/movingsprite.h
rename to source/movingsprite.h
diff --git a/source/jail_engine/notify.cpp b/source/notify.cpp
similarity index 100%
rename from source/jail_engine/notify.cpp
rename to source/notify.cpp
diff --git a/source/jail_engine/notify.h b/source/notify.h
similarity index 100%
rename from source/jail_engine/notify.h
rename to source/notify.h
diff --git a/source/jail_engine/paleta.cpp b/source/paleta.cpp
similarity index 100%
rename from source/jail_engine/paleta.cpp
rename to source/paleta.cpp
diff --git a/source/jail_engine/paleta.h b/source/paleta.h
similarity index 100%
rename from source/jail_engine/paleta.h
rename to source/paleta.h
diff --git a/source/player.h b/source/player.h
index 3bea553..1184048 100644
--- a/source/player.h
+++ b/source/player.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.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 "animatedsprite.h"
+#include "asset.h"
+#include "debug.h"
+#include "input.h"
+#include "resource.h"
+#include "utils.h"
 #include "const.h"
 #include "room.h"
 #include <string>
@@ -81,8 +81,8 @@ public:
 	SDL_Rect lastPosition;				   // Contiene la ultima posición del jugador, por si hay que deshacer algun movimiento
 	int jumpIni;						   // Valor del eje Y en el que se inicia el salto
 	float maxVY;						   // Velocidad máxima que puede alcanzar al desplazarse en vertical
-	std::vector<JA_Sound_t*> jumpSound;	   // Vecor con todos los sonidos del salto
-	std::vector<JA_Sound_t*> fallSound;	   // Vecor con todos los sonidos de la caída
+	std::vector<JA_Sound_t *> jumpSound;   // Vecor con todos los sonidos del salto
+	std::vector<JA_Sound_t *> fallSound;   // Vecor con todos los sonidos de la caída
 	int jumpCounter;					   // Cuenta el tiempo de salto
 	int fallCounter;					   // Cuenta el tiempo de caida
 	bool alive;							   // Indica si el jugador esta vivo o no
diff --git a/source/jail_engine/resource.cpp b/source/resource.cpp
similarity index 100%
rename from source/jail_engine/resource.cpp
rename to source/resource.cpp
diff --git a/source/jail_engine/resource.h b/source/resource.h
similarity index 99%
rename from source/jail_engine/resource.h
rename to source/resource.h
index bcc96c4..123c2a4 100644
--- a/source/jail_engine/resource.h
+++ b/source/resource.h
@@ -3,7 +3,7 @@
 #include <SDL2/SDL.h>
 #include "animatedsprite.h"
 #include "asset.h"
-#include "../room.h"
+#include "room.h"
 #include "text.h"
 #include "texture.h"
 #include "utils.h"
diff --git a/source/room.h b/source/room.h
index 7d97f11..002f39e 100644
--- a/source/room.h
+++ b/source/room.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.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 "asset.h"
+#include "debug.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "sprite.h"
+#include "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 c8da537..c41a66f 100644
--- a/source/room_tracker.h
+++ b/source/room_tracker.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "jail_engine/utils.h"
+#include "utils.h"
 #include <string>
 #include <vector>
 
diff --git a/source/scoreboard.h b/source/scoreboard.h
index 463fc52..1d70a31 100644
--- a/source/scoreboard.h
+++ b/source/scoreboard.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL.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 "animatedsprite.h"
+#include "asset.h"
+#include "resource.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include <string>
 
diff --git a/source/jail_engine/screen.cpp b/source/screen.cpp
similarity index 100%
rename from source/jail_engine/screen.cpp
rename to source/screen.cpp
diff --git a/source/jail_engine/screen.h b/source/screen.h
similarity index 99%
rename from source/jail_engine/screen.h
rename to source/screen.h
index 27cfbbd..a025dba 100644
--- a/source/jail_engine/screen.h
+++ b/source/screen.h
@@ -4,7 +4,7 @@
 #include "asset.h"
 #include "notify.h"
 #include "utils.h"
-#include "../const.h"
+#include "const.h"
 #include <vector>
 
 #ifndef SCREEN_H
diff --git a/source/jail_engine/sprite.cpp b/source/sprite.cpp
similarity index 100%
rename from source/jail_engine/sprite.cpp
rename to source/sprite.cpp
diff --git a/source/jail_engine/sprite.h b/source/sprite.h
similarity index 100%
rename from source/jail_engine/sprite.h
rename to source/sprite.h
diff --git a/source/stats.h b/source/stats.h
index b4fabf9..93e8e3f 100644
--- a/source/stats.h
+++ b/source/stats.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <SDL2/SDL.h>
-#include "jail_engine/utils.h"
+#include "utils.h"
 #include <string>
 #include <vector>
 
diff --git a/source/jail_engine/stb_image.h b/source/stb_image.h
similarity index 100%
rename from source/jail_engine/stb_image.h
rename to source/stb_image.h
diff --git a/source/jail_engine/stb_vorbis.c b/source/stb_vorbis.c
similarity index 100%
rename from source/jail_engine/stb_vorbis.c
rename to source/stb_vorbis.c
diff --git a/source/jail_engine/text.cpp b/source/text.cpp
similarity index 100%
rename from source/jail_engine/text.cpp
rename to source/text.cpp
diff --git a/source/jail_engine/text.h b/source/text.h
similarity index 100%
rename from source/jail_engine/text.h
rename to source/text.h
diff --git a/source/jail_engine/texture.cpp b/source/texture.cpp
similarity index 100%
rename from source/jail_engine/texture.cpp
rename to source/texture.cpp
diff --git a/source/jail_engine/texture.h b/source/texture.h
similarity index 100%
rename from source/jail_engine/texture.h
rename to source/texture.h
diff --git a/source/jail_engine/utils.cpp b/source/utils.cpp
similarity index 100%
rename from source/jail_engine/utils.cpp
rename to source/utils.cpp
diff --git a/source/jail_engine/utils.h b/source/utils.h
similarity index 100%
rename from source/jail_engine/utils.h
rename to source/utils.h