58 files changed, 225 insertions, 225 deletions

diff --git a/src/libjin/graphics/animations/je_animation.cpp b/src/libjin/graphics/animations/animation.cpp
index 3168026..168c3e3 100644
--- a/src/libjin/graphics/animations/je_animation.cpp
+++ b/src/libjin/graphics/animations/animation.cpp
@@ -1,5 +1,5 @@
-#include "../../math/je_vector2.hpp"
-#include "je_animation.h"
+#include "../../math/vector2.hpp"
+#include "animation.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/animations/je_animation.h b/src/libjin/graphics/animations/animation.h
index fd22049..72565fc 100644
--- a/src/libjin/graphics/animations/je_animation.h
+++ b/src/libjin/graphics/animations/animation.h
@@ -4,9 +4,9 @@
 #include <vector>
 #include <string>
 
-#include "../../common/je_object.h"
+#include "../../common/object.h"
 
-#include "../je_sprite.h"
+#include "../sprite.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/animations/je_animator.cpp b/src/libjin/graphics/animations/animator.cpp
index 1e25639..8db3bc2 100644
--- a/src/libjin/graphics/animations/je_animator.cpp
+++ b/src/libjin/graphics/animations/animator.cpp
@@ -1,5 +1,5 @@
-#include "../../math/je_vector2.hpp"
-#include "je_animator.h"
+#include "../../math/vector2.hpp"
+#include "animator.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/animations/je_animator.h b/src/libjin/graphics/animations/animator.h
index e2369cf..263c7cb 100644
--- a/src/libjin/graphics/animations/je_animator.h
+++ b/src/libjin/graphics/animations/animator.h
@@ -3,10 +3,10 @@
 
 #include <string>
 
-#include "../../common/je_object.h"
-#include "../../utils/je_log.h"
+#include "../../common/object.h"
+#include "../../utils/log.h"
 
-#include "je_animation.h"
+#include "animation.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_bitmap.cpp b/src/libjin/graphics/bitmap.cpp
index eadd6d1..cae6f0b 100644
--- a/src/libjin/graphics/je_bitmap.cpp
+++ b/src/libjin/graphics/bitmap.cpp
@@ -1,11 +1,11 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb/stb_image.h"
 
-#include "../common/je_exception.h"
-#include "../filesystem/je_asset_database.h"
-#include "../math/je_math.h"
+#include "../common/exception.h"
+#include "../filesystem/asset_database.h"
+#include "../math/math.h"
 
-#include "je_bitmap.h"
+#include "bitmap.h"
 
 using namespace JinEngine::Filesystem;
 using namespace JinEngine::Math;
diff --git a/src/libjin/graphics/je_bitmap.h b/src/libjin/graphics/bitmap.h
index ad4ab05..17dca40 100644
--- a/src/libjin/graphics/je_bitmap.h
+++ b/src/libjin/graphics/bitmap.h
@@ -1,14 +1,14 @@
 #ifndef __JE_BITMAP_H__
 #define __JE_BITMAP_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <functional>
 
-#include "../common/je_types.h"
-#include "../math/je_vector2.hpp"
+#include "../common/types.h"
+#include "../math/vector2.hpp"
 
-#include "je_color.h"
+#include "color.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_canvas.cpp b/src/libjin/graphics/canvas.cpp
index bb1e2a9..db02110 100644
--- a/src/libjin/graphics/je_canvas.cpp
+++ b/src/libjin/graphics/canvas.cpp
@@ -1,9 +1,9 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "../utils/je_macros.h"
-#include "je_canvas.h" 
-#include "je_window.h"
+#include "../utils/macros.h"
+#include "canvas.h" 
+#include "window.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_canvas.h b/src/libjin/graphics/canvas.h
index dc0a59e..302764a 100644
--- a/src/libjin/graphics/je_canvas.h
+++ b/src/libjin/graphics/canvas.h
@@ -1,9 +1,9 @@
 #ifndef __JE_CANVAS_H__
 #define __JE_CANVAS_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "je_graphic.h"
+#include "graphic.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_color.cpp b/src/libjin/graphics/color.cpp
index ea936fa..92f61c6 100644
--- a/src/libjin/graphics/je_color.cpp
+++ b/src/libjin/graphics/color.cpp
@@ -1,4 +1,4 @@
-#include "je_color.h"
+#include "color.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_color.h b/src/libjin/graphics/color.h
index 96120e3..0f7d6dd 100644
--- a/src/libjin/graphics/je_color.h
+++ b/src/libjin/graphics/color.h
@@ -3,13 +3,13 @@
 */
 #ifndef __JE_COLOR_H__
 #define __JE_COLOR_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "../math/je_math.h"
+#include "../math/math.h"
 
-#include "../common/je_types.h"
-#include "../utils/je_endian.h"
+#include "../common/types.h"
+#include "../utils/endian.h"
 
 namespace JinEngine 
 {
diff --git a/src/libjin/graphics/fonts/je_decoder.cpp b/src/libjin/graphics/fonts/decoder.cpp
index a7f4f32..5c74258 100644
--- a/src/libjin/graphics/fonts/je_decoder.cpp
+++ b/src/libjin/graphics/fonts/decoder.cpp
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "je_decoder.h"
+#include "decoder.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_decoder.h b/src/libjin/graphics/fonts/decoder.h
index 43fa155..8ff7bd7 100644
--- a/src/libjin/graphics/fonts/je_decoder.h
+++ b/src/libjin/graphics/fonts/decoder.h
@@ -3,9 +3,9 @@
 
 #include <vector>
 
-#include "../../common/je_object.h"
+#include "../../common/object.h"
 
-#include "je_text.h"
+#include "text.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_font.h b/src/libjin/graphics/fonts/font.h
index 9c231de..166cd6b 100644
--- a/src/libjin/graphics/fonts/je_font.h
+++ b/src/libjin/graphics/fonts/font.h
@@ -3,9 +3,9 @@
 
 #include <vector>
 
-#include "../je_renderable.h"
+#include "../renderable.h"
 
-#include "je_text.h"
+#include "text.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_page.h b/src/libjin/graphics/fonts/page.h
index d831691..75f1840 100644
--- a/src/libjin/graphics/fonts/je_page.h
+++ b/src/libjin/graphics/fonts/page.h
@@ -1,9 +1,9 @@
 #ifndef __JE_PAGE_H__
 #define __JE_PAGE_H__
 
-#include "../../math/je_vector2.hpp"
+#include "../../math/vector2.hpp"
 
-#include "je_font.h"
+#include "font.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_text.cpp b/src/libjin/graphics/fonts/text.cpp
index f9909a6..9684b81 100644
--- a/src/libjin/graphics/fonts/je_text.cpp
+++ b/src/libjin/graphics/fonts/text.cpp
@@ -1,7 +1,7 @@
 #include <cstring>
 
-#include "je_text.h"
-#include "je_decoder.h"
+#include "text.h"
+#include "decoder.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_text.h b/src/libjin/graphics/fonts/text.h
index 6837bfc..c3bb8db 100644
--- a/src/libjin/graphics/fonts/je_text.h
+++ b/src/libjin/graphics/fonts/text.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "../../common/je_object.h"
+#include "../../common/object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/texture_font.cpp
index 542fe7d..31e5293 100644
--- a/src/libjin/graphics/fonts/je_texture_font.cpp
+++ b/src/libjin/graphics/fonts/texture_font.cpp
@@ -1,10 +1,10 @@
 #include <vector>
 
-#include "../../math/je_vector2.hpp"
+#include "../../math/vector2.hpp"
 
-#include "../shaders/je_shader.h"
+#include "../shaders/shader.h"
 
-#include "je_texture_font.h"
+#include "texture_font.h"
 
 using namespace std;
 using namespace JinEngine::Math;
diff --git a/src/libjin/graphics/fonts/je_texture_font.h b/src/libjin/graphics/fonts/texture_font.h
index 9192276..1d7f0d2 100644
--- a/src/libjin/graphics/fonts/je_texture_font.h
+++ b/src/libjin/graphics/fonts/texture_font.h
@@ -4,14 +4,14 @@
 #include <map>
 #include <vector>
 
-#include "../../math/je_vector4.hpp"
+#include "../../math/vector4.hpp"
 
-#include "../je_graphic.h"
-#include "../je_bitmap.h"
+#include "../graphic.h"
+#include "../bitmap.h"
 
-#include "je_page.h"
-#include "je_font.h"
-#include "je_text.h"
+#include "page.h"
+#include "font.h"
+#include "text.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/ttf.cpp
index d145395..f47e7e4 100644
--- a/src/libjin/graphics/fonts/je_ttf.cpp
+++ b/src/libjin/graphics/fonts/ttf.cpp
@@ -1,16 +1,16 @@
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <stdio.h>
 
-#include "../../common/je_array.hpp"
+#include "../../common/array.hpp"
 
-#include "../je_gl.h"
-#include "../je_color.h"
-#include "../shaders/je_shader.h"
+#include "../gl.h"
+#include "../color.h"
+#include "../shaders/shader.h"
 
-#include "je_ttf.h"
-#include "je_page.h"
+#include "ttf.h"
+#include "page.h"
 
 #define STB_TRUETYPE_IMPLEMENTATION
 #include "stb/stb_truetype.h"
@@ -134,7 +134,7 @@ namespace JinEngine
             // TTF
             //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "../shaders/built-in/je_font.shader.h"
+#include "../shaders/built-in/font.shader.h"
 
             using namespace std;
             using namespace JinEngine::Math;
diff --git a/src/libjin/graphics/fonts/je_ttf.h b/src/libjin/graphics/fonts/ttf.h
index feabf33..8439cd7 100644
--- a/src/libjin/graphics/fonts/je_ttf.h
+++ b/src/libjin/graphics/fonts/ttf.h
@@ -1,6 +1,6 @@
 #ifndef __JE_TTF_H__
 #define __JE_TTF_H__
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <vector>
@@ -8,14 +8,14 @@
 
 #include "stb/stb_truetype.h"
 
-#include "../../math/je_quad.h"
+#include "../../math/quad.h"
 
-#include "../je_color.h"
-#include "../je_graphic.h"
+#include "../color.h"
+#include "../graphic.h"
 
-#include "je_page.h"
-#include "je_font.h"
-#include "je_text.h"
+#include "page.h"
+#include "font.h"
+#include "text.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_gl.cpp b/src/libjin/graphics/gl.cpp
index 1783ef1..a5d1043 100644
--- a/src/libjin/graphics/je_gl.cpp
+++ b/src/libjin/graphics/gl.cpp
@@ -1,13 +1,13 @@
 #define OGL2D_IMPLEMENT
-#include "../utils/je_log.h"
-
-#include "je_gl.h"
-#include "je_color.h"
-#include "je_canvas.h"
-#include "je_texture.h"
-#include "je_window.h"
-#include "shaders/je_shader.h"
-#include "fonts/je_font.h"
+#include "../utils/log.h"
+
+#include "gl.h"
+#include "color.h"
+#include "canvas.h"
+#include "texture.h"
+#include "window.h"
+#include "shaders/shader.h"
+#include "fonts/font.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics;
diff --git a/src/libjin/graphics/je_gl.h b/src/libjin/graphics/gl.h
index 6f88ba1..7876ffd 100644
--- a/src/libjin/graphics/je_gl.h
+++ b/src/libjin/graphics/gl.h
@@ -3,13 +3,13 @@
 
 #include <vector>
 
-#include "../math/je_matrix.h"
-#include "../math/je_transform.h"
+#include "../math/matrix.h"
+#include "../math/transform.h"
 
 //#include "GLee/GLee.h"
 #include "glad/glad.h"
 
-#include "je_color.h"
+#include "color.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/graphic.cpp
index e097230..7659e4e 100644
--- a/src/libjin/graphics/je_graphic.cpp
+++ b/src/libjin/graphics/graphic.cpp
@@ -1,13 +1,13 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <stdlib.h>
 
-#include "../math/je_matrix.h"
-#include "../math/je_vector2.hpp"
+#include "../math/matrix.h"
+#include "../math/vector2.hpp"
 
-#include "shaders/je_shader.h"
-#include "je_graphic.h"
+#include "shaders/shader.h"
+#include "graphic.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics::Shaders;
diff --git a/src/libjin/graphics/je_graphic.h b/src/libjin/graphics/graphic.h
index 92c7c46..ac2bc0e 100644
--- a/src/libjin/graphics/je_graphic.h
+++ b/src/libjin/graphics/graphic.h
@@ -1,16 +1,16 @@
 #ifndef __JE_GRAPHIC_H__
 #define __JE_GRAPHIC_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "../common/je_object.h"
-#include "../math/je_quad.h"
-#include "../math/je_vector2.hpp"
-#include "../math/je_transform.h"
+#include "../common/object.h"
+#include "../math/quad.h"
+#include "../math/vector2.hpp"
+#include "../math/transform.h"
 
-#include "je_renderable.h"
-#include "je_gl.h"
-#include "je_bitmap.h"
+#include "renderable.h"
+#include "gl.h"
+#include "bitmap.h"
 
 namespace JinEngine 
 {
diff --git a/src/libjin/graphics/graphics.h b/src/libjin/graphics/graphics.h
new file mode 100644
index 0000000..f3b0f45
--- /dev/null
+++ b/src/libjin/graphics/graphics.h
@@ -0,0 +1,29 @@
+#ifndef __JE_GRAPHICS_H__
+#define __JE_GRAPHICS_H__
+#include "../core/configuration.h"
+#if defined(jin_graphics)
+
+#include "canvas.h"
+#include "color.h"
+#include "shapes.h"
+#include "texture.h"
+#include "window.h"
+#include "bitmap.h"
+#include "image.h"
+#include "sprite.h"
+#include "sprite_sheet.h"
+#include "mesh.h"
+
+#include "shaders/shader.h"
+
+#include "fonts/ttf.h"
+#include "fonts/text.h"
+#include "fonts/texture_font.h"
+
+#include "particles/particle_system.h"
+
+#include "animations/animation.h"
+#include "animations/animator.h"
+
+#endif // defined(jin_graphics)
+#endif // __JE_GRAPHICS_H__
\ No newline at end of file
diff --git a/src/libjin/graphics/je_image.cpp b/src/libjin/graphics/image.cpp
index 98f6fcf..42d717d 100644
--- a/src/libjin/graphics/je_image.cpp
+++ b/src/libjin/graphics/image.cpp
@@ -1,8 +1,8 @@
-#include "../filesystem/je_asset_database.h"
+#include "../filesystem/asset_database.h"
 
 #include "stb/stb_image.h"
 
-#include "je_image.h"
+#include "image.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_image.h b/src/libjin/graphics/image.h
index f23e8c6..05a40e1 100644
--- a/src/libjin/graphics/je_image.h
+++ b/src/libjin/graphics/image.h
@@ -1,7 +1,7 @@
 #ifndef __JE_IMAGE_H__
 #define __JE_IMAGE_H__
 
-#include "je_bitmap.h"
+#include "bitmap.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_graphics.h b/src/libjin/graphics/je_graphics.h
deleted file mode 100644
index 519c5d0..0000000
--- a/src/libjin/graphics/je_graphics.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __JE_GRAPHICS_H__
-#define __JE_GRAPHICS_H__
-#include "../core/je_configuration.h"
-#if defined(jin_graphics)
-
-#include "je_canvas.h"
-#include "je_color.h"
-#include "je_shapes.h"
-#include "je_texture.h"
-#include "je_window.h"
-#include "je_bitmap.h"
-#include "je_image.h"
-#include "je_sprite.h"
-#include "je_sprite_sheet.h"
-#include "je_mesh.h"
-
-#include "shaders/je_shader.h"
-
-#include "fonts/je_ttf.h"
-#include "fonts/je_text.h"
-#include "fonts/je_texture_font.h"
-
-#include "particles/je_particle_system.h"
-
-#include "animations/je_animation.h"
-#include "animations/je_animator.h"
-
-#endif // defined(jin_graphics)
-#endif // __JE_GRAPHICS_H__
\ No newline at end of file
diff --git a/src/libjin/graphics/je_mesh.cpp b/src/libjin/graphics/mesh.cpp
index dc67f1e..71ebf62 100644
--- a/src/libjin/graphics/je_mesh.cpp
+++ b/src/libjin/graphics/mesh.cpp
@@ -1,7 +1,7 @@
-#include "../math/je_math.h"
+#include "../math/math.h"
 
-#include "je_mesh.h"
-#include "shaders/je_shader.h"
+#include "mesh.h"
+#include "shaders/shader.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics::Shaders;
diff --git a/src/libjin/graphics/je_mesh.h b/src/libjin/graphics/mesh.h
index 1dbf3a4..d17fcea 100644
--- a/src/libjin/graphics/je_mesh.h
+++ b/src/libjin/graphics/mesh.h
@@ -3,10 +3,10 @@
 
 #include <vector>
 
-#include "../math/je_bbox.h"
+#include "../math/bbox.h"
 
-#include "je_vertex.h"
-#include "je_graphic.h"
+#include "vertex.h"
+#include "graphic.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle.cpp b/src/libjin/graphics/particles/particle.cpp
index c6bbf42..74600e0 100644
--- a/src/libjin/graphics/particles/je_particle.cpp
+++ b/src/libjin/graphics/particles/particle.cpp
@@ -1,11 +1,11 @@
-#include "../../utils/je_log.h"
-#include "../../common/je_array.hpp"
-#include "../../math/je_math.h"
-#include "../../math/je_random.h"
+#include "../../utils/log.h"
+#include "../../common/array.hpp"
+#include "../../math/math.h"
+#include "../../math/random.h"
 
-#include "../je_sprite.h"
+#include "../sprite.h"
 
-#include "je_particle.h"
+#include "particle.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/particles/je_particle.h b/src/libjin/graphics/particles/particle.h
index 2b5966b..081ad26 100644
--- a/src/libjin/graphics/particles/je_particle.h
+++ b/src/libjin/graphics/particles/particle.h
@@ -1,14 +1,14 @@
 #ifndef __JE_PARTICLE_H__
 #define __JE_PARTICLE_H__
 
-#include "../../game/je_gameobject.h"
-#include "../../math/je_ranged_value.h"
-#include "../../math/je_transform.h"
-#include "../../math/je_vector2.hpp"
-#include "../../math/je_percentage.h"
-
-#include "../je_color.h"
-#include "../je_sprite.h"
+#include "../../game/gameobject.h"
+#include "../../math/ranged_value.h"
+#include "../../math/transform.h"
+#include "../../math/vector2.hpp"
+#include "../../math/percentage.h"
+
+#include "../color.h"
+#include "../sprite.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle_emitter.cpp b/src/libjin/graphics/particles/particle_emitter.cpp
index 644fd6e..725b826 100644
--- a/src/libjin/graphics/particles/je_particle_emitter.cpp
+++ b/src/libjin/graphics/particles/particle_emitter.cpp
@@ -1,9 +1,9 @@
 #include <time.h>
 
-#include "../../math/je_random.h"
+#include "../../math/random.h"
 
-#include "je_particle_emitter.h"
-#include "je_particle_system.h"
+#include "particle_emitter.h"
+#include "particle_system.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/particles/je_particle_emitter.h b/src/libjin/graphics/particles/particle_emitter.h
index 03f83be..9f9465a 100644
--- a/src/libjin/graphics/particles/je_particle_emitter.h
+++ b/src/libjin/graphics/particles/particle_emitter.h
@@ -1,10 +1,10 @@
 #ifndef __JE_PARTICLE_EMITTER_H__
 #define __JE_PARTICLE_EMITTER_H__
 
-#include "../../common/je_temporary.h"
-#include "../../math/je_vector2.hpp"
+#include "../../common/temporary.h"
+#include "../../math/vector2.hpp"
 
-#include "je_particle.h"
+#include "particle.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle_pool.h b/src/libjin/graphics/particles/particle_pool.h
index 46cd73a..618a965 100644
--- a/src/libjin/graphics/particles/je_particle_pool.h
+++ b/src/libjin/graphics/particles/particle_pool.h
@@ -1,9 +1,9 @@
 #ifndef __JE_PARTICLE_BATCH_H__
 #define __JE_PARTICLE_BATCH_H__
 
-#include "../../common/je_pool.hpp"
+#include "../../common/pool.hpp"
 
-#include "je_particle.h"
+#include "particle.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle_system.cpp b/src/libjin/graphics/particles/particle_system.cpp
index ec25163..984f42b 100644
--- a/src/libjin/graphics/particles/je_particle_system.cpp
+++ b/src/libjin/graphics/particles/particle_system.cpp
@@ -1,8 +1,8 @@
 #include <stdarg.h>
 
-#include "../../utils/je_log.h"
+#include "../../utils/log.h"
 
-#include "je_particle_system.h"
+#include "particle_system.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle_system.h b/src/libjin/graphics/particles/particle_system.h
index 4734313..83351a9 100644
--- a/src/libjin/graphics/particles/je_particle_system.h
+++ b/src/libjin/graphics/particles/particle_system.h
@@ -3,14 +3,14 @@
 
 #include <vector>
 
-#include "../../common/je_temporary.h"
-#include "../../game/je_gameobject.h"
+#include "../../common/temporary.h"
+#include "../../game/gameobject.h"
 
-#include "../je_sprite.h"
+#include "../sprite.h"
 
-#include "je_particle_emitter.h"
-#include "je_particle_pool.h"
-#include "je_particle.h"
+#include "particle_emitter.h"
+#include "particle_pool.h"
+#include "particle.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_renderable.h b/src/libjin/graphics/renderable.h
index ca9888e..ca9888e 100644
--- a/src/libjin/graphics/je_renderable.h
+++ b/src/libjin/graphics/renderable.h
diff --git a/src/libjin/graphics/shaders/built-in/je_default.shader.h b/src/libjin/graphics/shaders/built-in/default.shader.h
index 3f57c44..3f57c44 100644
--- a/src/libjin/graphics/shaders/built-in/je_default.shader.h
+++ b/src/libjin/graphics/shaders/built-in/default.shader.h
diff --git a/src/libjin/graphics/shaders/built-in/je_font.shader.h b/src/libjin/graphics/shaders/built-in/font.shader.h
index e04c225..e04c225 100644
--- a/src/libjin/graphics/shaders/built-in/je_font.shader.h
+++ b/src/libjin/graphics/shaders/built-in/font.shader.h
diff --git a/src/libjin/graphics/shaders/built-in/je_texture.shader.h b/src/libjin/graphics/shaders/built-in/texture.shader.h
index d1fc86f..d1fc86f 100644
--- a/src/libjin/graphics/shaders/built-in/je_texture.shader.h
+++ b/src/libjin/graphics/shaders/built-in/texture.shader.h
diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.cpp b/src/libjin/graphics/shaders/jsl_compiler.cpp
index 4b48a85..44908e8 100644
--- a/src/libjin/graphics/shaders/je_jsl_compiler.cpp
+++ b/src/libjin/graphics/shaders/jsl_compiler.cpp
@@ -1,10 +1,10 @@
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
-#include "../../common/je_string.h"
-#include "../../Filesystem/je_buffer.h"
+#include "../../common/string.h"
+#include "../../Filesystem/buffer.h"
 
-#include "je_jsl_compiler.h"
+#include "jsl_compiler.h"
 
 using namespace std;
 using namespace JinEngine::Filesystem;
diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.h b/src/libjin/graphics/shaders/jsl_compiler.h
index c61e152..ad3bdbb 100644
--- a/src/libjin/graphics/shaders/je_jsl_compiler.h
+++ b/src/libjin/graphics/shaders/jsl_compiler.h
@@ -1,13 +1,13 @@
 #ifndef __JE_JSL_COMPILER_H__
 #define __JE_JSL_COMPILER_H__
 
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #include <string>
 
-#include "../../common/je_string.h"
-#include "../../common/je_singleton.hpp"
+#include "../../common/string.h"
+#include "../../common/singleton.hpp"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/shader.cpp
index 65ad8c7..c7f6f11 100644
--- a/src/libjin/graphics/shaders/je_shader.cpp
+++ b/src/libjin/graphics/shaders/shader.cpp
@@ -1,18 +1,18 @@
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #include <iostream>
 
-#include "../../time/je_timer.h"
-#include "../../filesystem/je_buffer.h"
-#include "../../utils/je_log.h"
-#include "../../utils/je_macros.h"
+#include "../../time/timer.h"
+#include "../../filesystem/buffer.h"
+#include "../../utils/log.h"
+#include "../../utils/macros.h"
 
-#include "../je_gl.h"
-#include "../je_window.h"
+#include "../gl.h"
+#include "../window.h"
 
-#include "je_jsl_compiler.h"
-#include "je_shader.h"
+#include "jsl_compiler.h"
+#include "shader.h"
 
 using namespace std;
 using namespace JinEngine::Filesystem;
@@ -31,7 +31,7 @@ namespace JinEngine
             // SHADER_FORMAT_SIZE
             // formatShader
             // 
-            #include "built-in/je_default.shader.h"
+            #include "built-in/default.shader.h"
 
             // 
             // https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value
diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/shader.h
index 240f24f..e8756ac 100644
--- a/src/libjin/graphics/shaders/je_shader.h
+++ b/src/libjin/graphics/shaders/shader.h
@@ -1,19 +1,19 @@
 #ifndef __JE_SHADER_H__
 #define __JE_SHADER_H__
 
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #include <string>
 #include <map>
 
-#include "../../common/je_string.h"
+#include "../../common/string.h"
 
-#include "../je_color.h"
-#include "../je_texture.h"
-#include "../je_canvas.h"
+#include "../color.h"
+#include "../texture.h"
+#include "../canvas.h"
 
-#include "je_jsl_compiler.h"
+#include "jsl_compiler.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_shapes.cpp b/src/libjin/graphics/shapes.cpp
index 493e173..23fc888 100644
--- a/src/libjin/graphics/je_shapes.cpp
+++ b/src/libjin/graphics/shapes.cpp
@@ -1,13 +1,13 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <string>
 
-#include "../math/je_matrix.h"
-#include "../math/je_constant.h"
+#include "../math/matrix.h"
+#include "../math/constant.h"
 
-#include "shaders/je_shader.h"
-#include "je_shapes.h" 
+#include "shaders/shader.h"
+#include "shapes.h" 
 
 using namespace JinEngine::Graphics::Shaders;
 
diff --git a/src/libjin/graphics/je_shapes.h b/src/libjin/graphics/shapes.h
index dcc134d..6c25eeb 100644
--- a/src/libjin/graphics/je_shapes.h
+++ b/src/libjin/graphics/shapes.h
@@ -1,11 +1,11 @@
 #ifndef __JE_GEOMETRY_H__
 #define __JE_GEOMETRY_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "je_color.h"
-#include "je_canvas.h"
-#include "je_texture.h"
+#include "color.h"
+#include "canvas.h"
+#include "texture.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_sprite.cpp b/src/libjin/graphics/sprite.cpp
index bddb353..d74c1ef 100644
--- a/src/libjin/graphics/je_sprite.cpp
+++ b/src/libjin/graphics/sprite.cpp
@@ -1,5 +1,5 @@
-#include "je_graphic.h"
-#include "je_sprite.h"
+#include "graphic.h"
+#include "sprite.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics;
diff --git a/src/libjin/graphics/je_sprite.h b/src/libjin/graphics/sprite.h
index fe38a4a..2acebe0 100644
--- a/src/libjin/graphics/je_sprite.h
+++ b/src/libjin/graphics/sprite.h
@@ -1,12 +1,12 @@
 #ifndef __JE_SPRITE_H__
 #define __JE_SPRITE_H__
 
-#include "../common/je_types.h"
-#include "../math/je_vector2.hpp"
+#include "../common/types.h"
+#include "../math/vector2.hpp"
 
-#include "je_color.h"
-#include "je_graphic.h"
-#include "je_renderable.h"
+#include "color.h"
+#include "graphic.h"
+#include "renderable.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_sprite_batch.cpp b/src/libjin/graphics/sprite_batch.cpp
index f339715..82e480f 100644
--- a/src/libjin/graphics/je_sprite_batch.cpp
+++ b/src/libjin/graphics/sprite_batch.cpp
@@ -1,4 +1,4 @@
-#include "je_sprite_batch.h"
+#include "sprite_batch.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_sprite_batch.h b/src/libjin/graphics/sprite_batch.h
index a8109cc..0aad172 100644
--- a/src/libjin/graphics/je_sprite_batch.h
+++ b/src/libjin/graphics/sprite_batch.h
@@ -1,10 +1,10 @@
 #ifndef __JE_GRAPHICS_SPRITE_BATCH_H__
 #define __JE_GRAPHICS_SPRITE_BATCH_H__
 
-#include "../common/je_object.h"
+#include "../common/object.h"
 
-#include "shaders/je_shader.h"
-#include "je_renderable.h"
+#include "shaders/shader.h"
+#include "renderable.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_sprite_sheet.cpp b/src/libjin/graphics/sprite_sheet.cpp
index 6129da7..24ec4fd 100644
--- a/src/libjin/graphics/je_sprite_sheet.cpp
+++ b/src/libjin/graphics/sprite_sheet.cpp
@@ -1,8 +1,8 @@
 #include <vector>
 
-#include "../math/je_quad.h"
+#include "../math/quad.h"
 
-#include "je_sprite_sheet.h"
+#include "sprite_sheet.h"
 
 using namespace std;
 
diff --git a/src/libjin/graphics/je_sprite_sheet.h b/src/libjin/graphics/sprite_sheet.h
index a71ea04..eb50b2c 100644
--- a/src/libjin/graphics/je_sprite_sheet.h
+++ b/src/libjin/graphics/sprite_sheet.h
@@ -3,9 +3,9 @@
 
 #include <vector>
 
-#include "../math/je_quad.h"
+#include "../math/quad.h"
 
-#include "je_sprite.h"
+#include "sprite.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_texture.cpp b/src/libjin/graphics/texture.cpp
index c83e776..ba8a33a 100644
--- a/src/libjin/graphics/je_texture.cpp
+++ b/src/libjin/graphics/texture.cpp
@@ -1,12 +1,12 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <fstream>
 
-#include "../utils/je_utils.h"
-#include "../math/je_math.h"
+#include "../utils/utils.h"
+#include "../math/math.h"
 
-#include "je_texture.h"
+#include "texture.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/je_texture.h b/src/libjin/graphics/texture.h
index 6b8fa54..7bba557 100644
--- a/src/libjin/graphics/je_texture.h
+++ b/src/libjin/graphics/texture.h
@@ -1,11 +1,11 @@
 #ifndef __JE_TEXTURE_H__
 #define __JE_TEXTURE_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "je_color.h"
-#include "je_graphic.h"
-#include "je_bitmap.h"
+#include "color.h"
+#include "graphic.h"
+#include "bitmap.h"
 
 namespace JinEngine 
 { 
diff --git a/src/libjin/graphics/je_vertex.h b/src/libjin/graphics/vertex.h
index d2b482c..192117e 100644
--- a/src/libjin/graphics/je_vertex.h
+++ b/src/libjin/graphics/vertex.h
@@ -1,9 +1,9 @@
 #ifndef __JE_MATH_VERTEX_H__
 #define __JE_MATH_VERTEX_H__
 
-#include "../math/je_vector2.hpp"
+#include "../math/vector2.hpp"
 
-#include "je_color.h"
+#include "color.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_window.cpp b/src/libjin/graphics/window.cpp
index fcca1b7..5701772 100644
--- a/src/libjin/graphics/je_window.cpp
+++ b/src/libjin/graphics/window.cpp
@@ -1,17 +1,17 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <iostream>
 
-#include "../common/je_exception.h"
-#include "../utils/je_utils.h"
-#include "../audio/sdl/je_sdl_audio.h"
-#include "../utils/je_log.h"
+#include "../common/exception.h"
+#include "../utils/utils.h"
+#include "../audio/sdl/sdl_audio.h"
+#include "../utils/log.h"
 
-#include "shaders/je_shader.h"
-#include "je_window.h"
-#include "je_gl.h"
-#include "je_canvas.h"
+#include "shaders/shader.h"
+#include "window.h"
+#include "gl.h"
+#include "canvas.h"
 
 using namespace JinEngine::Graphics::Shaders;
 
diff --git a/src/libjin/graphics/je_window.h b/src/libjin/graphics/window.h
index f9fe5df..c279e9b 100644
--- a/src/libjin/graphics/je_window.h
+++ b/src/libjin/graphics/window.h
@@ -1,13 +1,13 @@
 #ifndef __JE_RENDER_WINDOW
 #define __JE_RENDER_WINDOW
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include "SDL2/SDL.h"
 
-#include "../utils/je_utils.h"
-#include "../math/je_vector2.hpp"
-#include "../common/je_subsystem.hpp"
+#include "../utils/utils.h"
+#include "../math/vector2.hpp"
+#include "../common/subsystem.hpp"
 
 namespace JinEngine
 {