diff --git a/lagueirtofile b/lagueirtofile
index 89f1858..85380de 100644
--- a/lagueirtofile
+++ b/lagueirtofile
@@ -1,5 +1,5 @@
 libs = -lSDL3 -lGL
 cppflags = -D DEBUG -D VERBOSE -g  -Wall
 executable = arounders
-sourcepath = source
+sourcepath = source source/aux source/japi source/gamestates source/entities
 buildpath = build
diff --git a/source/aux_font.cpp b/source/aux/font.cpp
similarity index 97%
rename from source/aux_font.cpp
rename to source/aux/font.cpp
index 30db07c..7c5b06b 100644
--- a/source/aux_font.cpp
+++ b/source/aux/font.cpp
@@ -1,5 +1,5 @@
-#include "aux_font.h"
-#include "jgame.h"
+#include "font.h"
+#include "../japi/game.h"
 
 namespace font
 {
diff --git a/source/aux_font.h b/source/aux/font.h
similarity index 100%
rename from source/aux_font.h
rename to source/aux/font.h
diff --git a/source/aux_textfile.cpp b/source/aux/textfile.cpp
similarity index 96%
rename from source/aux_textfile.cpp
rename to source/aux/textfile.cpp
index 69385b6..508df80 100644
--- a/source/aux_textfile.cpp
+++ b/source/aux/textfile.cpp
@@ -1,6 +1,6 @@
-#include "aux_textfile.h"
+#include "textfile.h"
 
-#include "jgame.h"
+#include "../japi/game.h"
 #include <stdlib.h>
 
 namespace textfile
diff --git a/source/aux_textfile.h b/source/aux/textfile.h
similarity index 100%
rename from source/aux_textfile.h
rename to source/aux/textfile.h
diff --git a/source/proc_arounders.cpp b/source/entities/arounders.cpp
similarity index 99%
rename from source/proc_arounders.cpp
rename to source/entities/arounders.cpp
index 125644d..204f991 100644
--- a/source/proc_arounders.cpp
+++ b/source/entities/arounders.cpp
@@ -1,7 +1,7 @@
-#include "proc_arounders.h"
-#include "jgame.h"
-#include "proc_mapa.h"
-#include "proc_explosio.h"
+#include "arounders.h"
+#include "../japi/game.h"
+#include "mapa.h"
+#include "explosio.h"
 
 namespace arounders
 {
diff --git a/source/proc_arounders.h b/source/entities/arounders.h
similarity index 100%
rename from source/proc_arounders.h
rename to source/entities/arounders.h
diff --git a/source/proc_explosio.cpp b/source/entities/explosio.cpp
similarity index 97%
rename from source/proc_explosio.cpp
rename to source/entities/explosio.cpp
index c1e49f5..901ea99 100644
--- a/source/proc_explosio.cpp
+++ b/source/entities/explosio.cpp
@@ -1,6 +1,6 @@
-#include "proc_explosio.h"
+#include "explosio.h"
 #include <stdlib.h>
-#include "jgame.h"
+#include "../japi/game.h"
 
 namespace explosio
 {
diff --git a/source/proc_explosio.h b/source/entities/explosio.h
similarity index 100%
rename from source/proc_explosio.h
rename to source/entities/explosio.h
diff --git a/source/proc_mapa.cpp b/source/entities/mapa.cpp
similarity index 98%
rename from source/proc_mapa.cpp
rename to source/entities/mapa.cpp
index a3cea2c..11a3c77 100644
--- a/source/proc_mapa.cpp
+++ b/source/entities/mapa.cpp
@@ -1,7 +1,7 @@
-#include "proc_mapa.h"
-#include "jgame.h"
-#include "aux_textfile.h"
-#include "aux_font.h"
+#include "mapa.h"
+#include "../japi/game.h"
+#include "../aux/textfile.h"
+#include "../aux/font.h"
 namespace mapa
 {    
 	namespace botons
diff --git a/source/proc_mapa.h b/source/entities/mapa.h
similarity index 95%
rename from source/proc_mapa.h
rename to source/entities/mapa.h
index ba44ff4..09470bd 100644
--- a/source/proc_mapa.h
+++ b/source/entities/mapa.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "jgame.h"
+#include "../japi/game.h"
 #include <stdint.h>
 namespace mapa
 {
diff --git a/source/gamestates.h b/source/gamestates/gamestates.h
similarity index 100%
rename from source/gamestates.h
rename to source/gamestates/gamestates.h
diff --git a/source/gamestate_menu.cpp b/source/gamestates/menu.cpp
similarity index 97%
rename from source/gamestate_menu.cpp
rename to source/gamestates/menu.cpp
index abd8498..0421872 100644
--- a/source/gamestate_menu.cpp
+++ b/source/gamestates/menu.cpp
@@ -1,6 +1,6 @@
 #include "gamestates.h"
-#include "jgame.h"
-#include "aux_font.h"
+#include "../japi/game.h"
+#include "../aux/font.h"
 
 namespace gamestate
 {
diff --git a/source/gamestate_mort.cpp b/source/gamestates/mort.cpp
similarity index 98%
rename from source/gamestate_mort.cpp
rename to source/gamestates/mort.cpp
index 0ae2bb1..b74bbb0 100644
--- a/source/gamestate_mort.cpp
+++ b/source/gamestates/mort.cpp
@@ -1,5 +1,5 @@
 #include "gamestates.h"
-#include "jgame.h"
+#include "../japi/game.h"
 
 namespace gamestate
 {
diff --git a/source/gamestate_password.cpp b/source/gamestates/password.cpp
similarity index 98%
rename from source/gamestate_password.cpp
rename to source/gamestates/password.cpp
index 9fca910..d307534 100644
--- a/source/gamestate_password.cpp
+++ b/source/gamestates/password.cpp
@@ -1,8 +1,8 @@
 #include "gamestates.h"
-#include "jgame.h"
+#include "../japi/game.h"
 #include <string>
-#include "aux_font.h"
-#include "proc_mapa.h"
+#include "../aux/font.h"
+#include "../entities/mapa.h"
 #include <SDL3/SDL.h>
 
 namespace gamestate
diff --git a/source/gamestate_play.cpp b/source/gamestates/play.cpp
similarity index 99%
rename from source/gamestate_play.cpp
rename to source/gamestates/play.cpp
index 07defb3..dffa6c1 100644
--- a/source/gamestate_play.cpp
+++ b/source/gamestates/play.cpp
@@ -1,10 +1,10 @@
 #include "gamestates.h"
-#include "jgame.h"
+#include "../japi/game.h"
 #include <SDL3/SDL.h>
 #include <string>
-#include "aux_font.h"
-#include "proc_mapa.h"
-#include "proc_arounders.h"
+#include "../aux/font.h"
+#include "../entities/mapa.h"
+#include "../entities/arounders.h"
 
 namespace gamestate
 {
diff --git a/source/gamestate_postfase.cpp b/source/gamestates/postfase.cpp
similarity index 98%
rename from source/gamestate_postfase.cpp
rename to source/gamestates/postfase.cpp
index 74e4e61..46d3547 100644
--- a/source/gamestate_postfase.cpp
+++ b/source/gamestates/postfase.cpp
@@ -1,7 +1,7 @@
 #include "gamestates.h"
-#include "jgame.h"
+#include "../japi/game.h"
 #include <string>
-#include "aux_font.h"
+#include "../aux/font.h"
 
 namespace gamestate
 {
diff --git a/source/gamestate_prefase.cpp b/source/gamestates/prefase.cpp
similarity index 95%
rename from source/gamestate_prefase.cpp
rename to source/gamestates/prefase.cpp
index 3dd6984..6f5577e 100644
--- a/source/gamestate_prefase.cpp
+++ b/source/gamestates/prefase.cpp
@@ -1,8 +1,8 @@
 #include "gamestates.h"
-#include "jgame.h"
+#include "../japi/game.h"
 #include <string>
-#include "aux_font.h"
-#include "proc_mapa.h"
+#include "../aux/font.h"
+#include "../entities/mapa.h"
 
 namespace gamestate
 {
diff --git a/source/gamestate_sequence.cpp b/source/gamestates/sequence.cpp
similarity index 98%
rename from source/gamestate_sequence.cpp
rename to source/gamestates/sequence.cpp
index ef4416a..5626df7 100644
--- a/source/gamestate_sequence.cpp
+++ b/source/gamestates/sequence.cpp
@@ -1,8 +1,8 @@
 #include "gamestates.h"
-#include "jgame.h"
+#include "../japi/game.h"
 #include <string>
 #include <SDL3/SDL.h>
-#include "aux_font.h"
+#include "../aux/font.h"
 
 namespace gamestate
 {
diff --git a/source/jaudio.cpp b/source/japi/audio.cpp
similarity index 99%
rename from source/jaudio.cpp
rename to source/japi/audio.cpp
index ced852b..209ad2d 100644
--- a/source/jaudio.cpp
+++ b/source/japi/audio.cpp
@@ -1,5 +1,5 @@
-#include "jaudio.h"
-#include "jfile.h"
+#include "audio.h"
+#include "file.h"
 #include "stb_vorbis.h"
 #include <SDL3/SDL.h>
 #include <stdio.h>
diff --git a/source/jaudio.h b/source/japi/audio.h
similarity index 100%
rename from source/jaudio.h
rename to source/japi/audio.h
diff --git a/source/jdraw.cpp b/source/japi/draw.cpp
similarity index 99%
rename from source/jdraw.cpp
rename to source/japi/draw.cpp
index 2a069ff..71feb43 100644
--- a/source/jdraw.cpp
+++ b/source/japi/draw.cpp
@@ -1,8 +1,8 @@
-#include "jdraw.h"
+#include "draw.h"
 #include "SDL3/SDL.h"
 #include "gif.h"
-#include "jfile.h"
-#include "jshader.h"
+#include "file.h"
+#include "shader.h"
 
 namespace draw
 {
diff --git a/source/jdraw.h b/source/japi/draw.h
similarity index 100%
rename from source/jdraw.h
rename to source/japi/draw.h
diff --git a/source/jfile.cpp b/source/japi/file.cpp
similarity index 99%
rename from source/jfile.cpp
rename to source/japi/file.cpp
index 623eca5..4fbbdc7 100644
--- a/source/jfile.cpp
+++ b/source/japi/file.cpp
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdint.h>
-#include "jfile.h"
+#include "file.h"
 #include <sys/stat.h>
 #include <unistd.h>
 #include <iostream>
diff --git a/source/jfile.h b/source/japi/file.h
similarity index 100%
rename from source/jfile.h
rename to source/japi/file.h
diff --git a/source/jgame.cpp b/source/japi/game.cpp
similarity index 98%
rename from source/jgame.cpp
rename to source/japi/game.cpp
index 679e940..51a6736 100644
--- a/source/jgame.cpp
+++ b/source/japi/game.cpp
@@ -1,6 +1,6 @@
-#include "jgame.h"
-#include "jdraw.h"
-#include "jinput.h"
+#include "game.h"
+#include "draw.h"
+#include "input.h"
 #include <SDL3/SDL.h>
 #include <map>
 #include <string>
diff --git a/source/jgame.h b/source/japi/game.h
similarity index 80%
rename from source/jgame.h
rename to source/japi/game.h
index f906555..4adb5a3 100644
--- a/source/jgame.h
+++ b/source/japi/game.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "jdraw.h"
-#include "jinput.h"
-#include "jaudio.h"
-#include "jfile.h"
+#include "draw.h"
+#include "input.h"
+#include "audio.h"
+#include "file.h"
 
 #define JAPI_VERSION "0.8"
 
diff --git a/source/gif.h b/source/japi/gif.h
similarity index 100%
rename from source/gif.h
rename to source/japi/gif.h
diff --git a/source/jinput.cpp b/source/japi/input.cpp
similarity index 98%
rename from source/jinput.cpp
rename to source/japi/input.cpp
index c0f870c..7e78cba 100644
--- a/source/jinput.cpp
+++ b/source/japi/input.cpp
@@ -1,6 +1,6 @@
-#include "jinput.h"
+#include "input.h"
 #include <SDL3/SDL.h>
-#include "jdraw.h"
+#include "draw.h"
 
 namespace input
 {
diff --git a/source/jinput.h b/source/japi/input.h
similarity index 100%
rename from source/jinput.h
rename to source/japi/input.h
diff --git a/source/jshader.cpp b/source/japi/shader.cpp
similarity index 99%
rename from source/jshader.cpp
rename to source/japi/shader.cpp
index 68f87bd..c8d8e4f 100644
--- a/source/jshader.cpp
+++ b/source/japi/shader.cpp
@@ -1,4 +1,4 @@
-#include "jshader.h"
+#include "shader.h"
 
 #include <iostream>
 
diff --git a/source/jshader.h b/source/japi/shader.h
similarity index 100%
rename from source/jshader.h
rename to source/japi/shader.h
diff --git a/source/stb_vorbis.h b/source/japi/stb_vorbis.h
similarity index 100%
rename from source/stb_vorbis.h
rename to source/japi/stb_vorbis.h
diff --git a/source/main.cpp b/source/main.cpp
index cfde117..8472305 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,6 +1,6 @@
-#include "jgame.h"
-#include "gamestates.h"
-#include "aux_font.h"
+#include "japi/game.h"
+#include "gamestates/gamestates.h"
+#include "aux/font.h"
 
 void game::init()
 {