diff --git a/source/common/animatedsprite.cpp b/source/animatedsprite.cpp
similarity index 100%
rename from source/common/animatedsprite.cpp
rename to source/animatedsprite.cpp
diff --git a/source/common/animatedsprite.h b/source/animatedsprite.h
similarity index 100%
rename from source/common/animatedsprite.h
rename to source/animatedsprite.h
diff --git a/source/common/asset.cpp b/source/asset.cpp
similarity index 100%
rename from source/common/asset.cpp
rename to source/asset.cpp
diff --git a/source/common/asset.h b/source/asset.h
similarity index 100%
rename from source/common/asset.h
rename to source/asset.h
diff --git a/source/background.h b/source/background.h
index 7038658..51b8ff9 100644
--- a/source/background.h
+++ b/source/background.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/movingsprite.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "movingsprite.h"
+#include "utils.h"
 
 /*
     Esta clase es la encargada de dibujar el fondo que aparece durante la sección
diff --git a/source/balloon.h b/source/balloon.h
index 5c5e563..d2b3a28 100644
--- a/source/balloon.h
+++ b/source/balloon.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/utils.h"
+#include "animatedsprite.h"
+#include "utils.h"
 #include <sstream>
 #include <vector>
 
diff --git a/source/bullet.h b/source/bullet.h
index e88bb74..8418ca2 100644
--- a/source/bullet.h
+++ b/source/bullet.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "sprite.h"
+#include "utils.h"
 
 // Tipos de bala
 #define BULLET_UP 1
diff --git a/source/const.h b/source/const.h
index 684e446..d6ec898 100644
--- a/source/const.h
+++ b/source/const.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "utils.h"
 
 // Tamaño de bloque
 #define BLOCK 8
diff --git a/source/common/dbgtxt.h b/source/dbgtxt.h
similarity index 100%
rename from source/common/dbgtxt.h
rename to source/dbgtxt.h
diff --git a/source/common/dbhtxt.cpp b/source/dbhtxt.cpp
similarity index 100%
rename from source/common/dbhtxt.cpp
rename to source/dbhtxt.cpp
diff --git a/source/define_buttons.h b/source/define_buttons.h
index 5ed52f9..7c47dbf 100644
--- a/source/define_buttons.h
+++ b/source/define_buttons.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/input.h"
-#include "common/text.h"
+#include "input.h"
+#include "text.h"
 #include "const.h"
 #include "lang.h"
 
diff --git a/source/director.cpp b/source/director.cpp
index 451ad0d..1baa5bd 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -1,4 +1,4 @@
-#include "common/utils.h"
+#include "utils.h"
 #include "const.h"
 #include "director.h"
 #include <iostream>
@@ -6,7 +6,7 @@
 #include <string>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "common/dbgtxt.h"
+#include "dbgtxt.h"
 
 #ifndef _WIN32
 #include <pwd.h>
diff --git a/source/director.h b/source/director.h
index 0e71a83..4e1e3a2 100644
--- a/source/director.h
+++ b/source/director.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/screen.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "fade.h"
 #include "game.h"
diff --git a/source/enemy_formations.h b/source/enemy_formations.h
index 7b1e521..5a3b986 100644
--- a/source/enemy_formations.h
+++ b/source/enemy_formations.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "utils.h"
 #include "const.h"
 #include "balloon.h"
 
diff --git a/source/explosions.h b/source/explosions.h
index 83eef83..86e033d 100644
--- a/source/explosions.h
+++ b/source/explosions.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/texture.h"
-#include "common/animatedsprite.h"
+#include "texture.h"
+#include "animatedsprite.h"
 #include <vector>
 
 struct explosion_texture_t
diff --git a/source/fade.h b/source/fade.h
index b8da925..f7782a8 100644
--- a/source/fade.h
+++ b/source/fade.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/texture.h"
-#include "common/utils.h"
+#include "texture.h"
+#include "utils.h"
 
 // Tipos de fundido
 #define FADE_FULLSCREEN 0
diff --git a/source/game.h b/source/game.h
index 9e62448..135ca31 100644
--- a/source/game.h
+++ b/source/game.h
@@ -3,15 +3,15 @@
 #include <SDL2/SDL.h>
 #include "balloon.h"
 #include "bullet.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/movingsprite.h"
-#include "common/screen.h"
-#include "common/smartsprite.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "movingsprite.h"
+#include "screen.h"
+#include "smartsprite.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "fade.h"
 #include "item.h"
diff --git a/source/game_logo.h b/source/game_logo.h
index 7ed039e..86f38da 100644
--- a/source/game_logo.h
+++ b/source/game_logo.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/screen.h"
-#include "common/smartsprite.h"
-#include "common/jail_audio.h"
+#include "asset.h"
+#include "screen.h"
+#include "smartsprite.h"
+#include "jail_audio.h"
 #include "const.h"
 
 // Clase GameLogo
diff --git a/source/common/gif.c b/source/gif.c
similarity index 100%
rename from source/common/gif.c
rename to source/gif.c
diff --git a/source/hiscore_table.h b/source/hiscore_table.h
index 4851eb8..07956d7 100644
--- a/source/hiscore_table.h
+++ b/source/hiscore_table.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/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "lang.h"
 #include "fade.h"
diff --git a/source/common/input.cpp b/source/input.cpp
similarity index 100%
rename from source/common/input.cpp
rename to source/input.cpp
diff --git a/source/common/input.h b/source/input.h
similarity index 100%
rename from source/common/input.h
rename to source/input.h
diff --git a/source/instructions.h b/source/instructions.h
index edbac0a..641f9a5 100644
--- a/source/instructions.h
+++ b/source/instructions.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/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "lang.h"
 #include "tiledbg.h"
diff --git a/source/intro.h b/source/intro.h
index 900a251..1205000 100644
--- a/source/intro.h
+++ b/source/intro.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/screen.h"
-#include "common/smartsprite.h"
-#include "common/utils.h"
-#include "common/writer.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "smartsprite.h"
+#include "utils.h"
+#include "writer.h"
 #include "const.h"
 #include "lang.h"
 #include <vector>
diff --git a/source/item.h b/source/item.h
index 64243a3..0e2a76a 100644
--- a/source/item.h
+++ b/source/item.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/utils.h"
+#include "animatedsprite.h"
+#include "utils.h"
 
 // Tipos de objetos
 #define ITEM_POINTS_1_DISK 1
diff --git a/source/common/jail_audio.cpp b/source/jail_audio.cpp
similarity index 100%
rename from source/common/jail_audio.cpp
rename to source/jail_audio.cpp
diff --git a/source/common/jail_audio.h b/source/jail_audio.h
similarity index 100%
rename from source/common/jail_audio.h
rename to source/jail_audio.h
diff --git a/source/common/jail_audio_sdlmixer.cpp b/source/jail_audio_sdlmixer.cpp
similarity index 100%
rename from source/common/jail_audio_sdlmixer.cpp
rename to source/jail_audio_sdlmixer.cpp
diff --git a/source/common/jshader.cpp b/source/jshader.cpp
similarity index 100%
rename from source/common/jshader.cpp
rename to source/jshader.cpp
diff --git a/source/common/jshader.h b/source/jshader.h
similarity index 100%
rename from source/common/jshader.h
rename to source/jshader.h
diff --git a/source/logo.h b/source/logo.h
index c149931..96f2856 100644
--- a/source/logo.h
+++ b/source/logo.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/jail_audio.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "screen.h"
+#include "sprite.h"
+#include "utils.h"
 #include "const.h"
 #include "lang.h"
 #include <vector>
diff --git a/source/manage_hiscore_table.h b/source/manage_hiscore_table.h
index 5243a8d..398da7f 100644
--- a/source/manage_hiscore_table.h
+++ b/source/manage_hiscore_table.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <algorithm>
-#include "common/utils.h"
+#include "utils.h"
 
 /*
     Esta clase sirve para añadir elementos hiScoreEntry_r a un vector (tabla), de manera
diff --git a/source/common/movingsprite.cpp b/source/movingsprite.cpp
similarity index 100%
rename from source/common/movingsprite.cpp
rename to source/movingsprite.cpp
diff --git a/source/common/movingsprite.h b/source/movingsprite.h
similarity index 100%
rename from source/common/movingsprite.h
rename to source/movingsprite.h
diff --git a/source/common/notify.cpp b/source/notify.cpp
similarity index 100%
rename from source/common/notify.cpp
rename to source/notify.cpp
diff --git a/source/common/notify.h b/source/notify.h
similarity index 100%
rename from source/common/notify.h
rename to source/notify.h
diff --git a/source/param.h b/source/param.h
index 7261464..80e15b3 100644
--- a/source/param.h
+++ b/source/param.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/utils.h"
+#include "utils.h"
 #include "const.h"
 
 extern param_t param;
diff --git a/source/player.h b/source/player.h
index fbb44f8..9b1f542 100644
--- a/source/player.h
+++ b/source/player.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/animatedsprite.h"
-#include "common/asset.h"
-#include "common/input.h"
-#include "common/texture.h"
-#include "common/utils.h"
+#include "animatedsprite.h"
+#include "asset.h"
+#include "input.h"
+#include "texture.h"
+#include "utils.h"
 
 // Estados del jugador
 #define PLAYER_STATUS_WALKING_LEFT 0
diff --git a/source/scoreboard.h b/source/scoreboard.h
index e71bca1..39eb5e2 100644
--- a/source/scoreboard.h
+++ b/source/scoreboard.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/screen.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "screen.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "lang.h"
 
diff --git a/source/common/screen.cpp b/source/screen.cpp
similarity index 100%
rename from source/common/screen.cpp
rename to source/screen.cpp
diff --git a/source/common/screen.h b/source/screen.h
similarity index 99%
rename from source/common/screen.h
rename to source/screen.h
index 90eee9d..b40ef1f 100644
--- a/source/common/screen.h
+++ b/source/screen.h
@@ -5,7 +5,7 @@
 #include "utils.h"
 #include "notify.h"
 #include "input.h"
-#include "../const.h"
+#include "const.h"
 #include <vector>
 
 #define SCREEN_FILTER_NEAREST 0
diff --git a/source/common/smartsprite.cpp b/source/smartsprite.cpp
similarity index 100%
rename from source/common/smartsprite.cpp
rename to source/smartsprite.cpp
diff --git a/source/common/smartsprite.h b/source/smartsprite.h
similarity index 100%
rename from source/common/smartsprite.h
rename to source/smartsprite.h
diff --git a/source/common/sprite.cpp b/source/sprite.cpp
similarity index 100%
rename from source/common/sprite.cpp
rename to source/sprite.cpp
diff --git a/source/common/sprite.h b/source/sprite.h
similarity index 100%
rename from source/common/sprite.h
rename to source/sprite.h
diff --git a/source/common/stb_image.h b/source/stb_image.h
similarity index 100%
rename from source/common/stb_image.h
rename to source/stb_image.h
diff --git a/source/common/stb_vorbis.c b/source/stb_vorbis.c
similarity index 100%
rename from source/common/stb_vorbis.c
rename to source/stb_vorbis.c
diff --git a/source/common/text.cpp b/source/text.cpp
similarity index 100%
rename from source/common/text.cpp
rename to source/text.cpp
diff --git a/source/common/text.h b/source/text.h
similarity index 100%
rename from source/common/text.h
rename to source/text.h
diff --git a/source/common/texture.cpp b/source/texture.cpp
similarity index 100%
rename from source/common/texture.cpp
rename to source/texture.cpp
diff --git a/source/common/texture.h b/source/texture.h
similarity index 100%
rename from source/common/texture.h
rename to source/texture.h
diff --git a/source/tiledbg.h b/source/tiledbg.h
index 8b0d429..01f55f9 100644
--- a/source/tiledbg.h
+++ b/source/tiledbg.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <SDL2/SDL.h>
-#include "common/asset.h"
-#include "common/screen.h"
-#include "common/sprite.h"
+#include "asset.h"
+#include "screen.h"
+#include "sprite.h"
 #include "const.h"
 
 // Modos de funcionamiento para el tileado de fondo
diff --git a/source/title.h b/source/title.h
index 151f3cb..4c40714 100644
--- a/source/title.h
+++ b/source/title.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/movingsprite.h"
-#include "common/screen.h"
-#include "common/smartsprite.h"
-#include "common/sprite.h"
-#include "common/text.h"
-#include "common/utils.h"
+#include "asset.h"
+#include "input.h"
+#include "jail_audio.h"
+#include "movingsprite.h"
+#include "screen.h"
+#include "smartsprite.h"
+#include "sprite.h"
+#include "text.h"
+#include "utils.h"
 #include "const.h"
 #include "fade.h"
 #include "game.h"
diff --git a/source/common/utils.cpp b/source/utils.cpp
similarity index 100%
rename from source/common/utils.cpp
rename to source/utils.cpp
diff --git a/source/common/utils.h b/source/utils.h
similarity index 100%
rename from source/common/utils.h
rename to source/utils.h
diff --git a/source/common/writer.cpp b/source/writer.cpp
similarity index 100%
rename from source/common/writer.cpp
rename to source/writer.cpp
diff --git a/source/common/writer.h b/source/writer.h
similarity index 100%
rename from source/common/writer.h
rename to source/writer.h