6 files changed, 15 insertions, 10 deletions
diff --git a/src/libjin/Graphics/Shader/base.shader.h b/src/libjin/Graphics/Shader/je_base.shader.h
index 45b63cd..45b63cd 100644
--- a/src/libjin/Graphics/Shader/base.shader.h
+++ b/src/libjin/Graphics/Shader/je_base.shader.h
diff --git a/src/libjin/Graphics/Shader/default.shader.h b/src/libjin/Graphics/Shader/je_default.shader.h
index f0175d7..f0175d7 100644
--- a/src/libjin/Graphics/Shader/default.shader.h
+++ b/src/libjin/Graphics/Shader/je_default.shader.h
diff --git a/src/libjin/Graphics/Shader/font.shader.h b/src/libjin/Graphics/Shader/je_font.shader.h
index e04c225..e04c225 100644
--- a/src/libjin/Graphics/Shader/font.shader.h
+++ b/src/libjin/Graphics/Shader/je_font.shader.h
diff --git a/src/libjin/Graphics/Shader/Shader.cpp b/src/libjin/Graphics/Shader/je_shader.cpp
index a075d7d..686f2b9 100644
--- a/src/libjin/Graphics/Shader/Shader.cpp
+++ b/src/libjin/Graphics/Shader/je_shader.cpp
@@ -1,12 +1,14 @@
 #include <regex>
-#include "../../configuration.h"
+#include "../../core/je_configuration.h"
 #if defined(jin_graphics_shader)
 
 #include <iostream>
 
-#include "../../Filesystem/Buffer.h"
-#include "../../utils/macros.h"
-#include "Shader.h"
+#include "../../filesystem/je_buffer.h"
+#include "../../utils/je_macros.h"
+
+#include "je_shader.h"
+
 namespace jin
 {
 	namespace graphics
@@ -21,7 +23,7 @@ namespace jin
 		// SHADER_FORMAT_SIZE
 		// formatShader
 		// 
-		#include "default.shader.h"
+		#include "je_default.shader.h"
 
 		// 
 		// https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value
diff --git a/src/libjin/Graphics/Shader/Shader.h b/src/libjin/Graphics/Shader/je_shader.h
index 71579a9..bcee584 100644
--- a/src/libjin/Graphics/Shader/Shader.h
+++ b/src/libjin/Graphics/Shader/je_shader.h
@@ -1,22 +1,25 @@
 #ifndef __LIBJIN_SHADER_H
 #define __LIBJIN_SHADER_H
 
-#include "../../configuration.h"
+#include "../../core/je_configuration.h"
 #if defined(jin_graphics) && defined(jin_graphics_shader)
 
 #include <string>
 #include <map>
 
 #include "../../3rdparty/GLee/GLee.h"
-#include "../color.h"
-#include "../texture.h"
-#include "../canvas.h"
-#include "base.shader.h"
+
+#include "../je_color.h"
+#include "../je_texture.h"
+#include "../je_canvas.h"
+
+#include "je_base.shader.h"
 
 namespace jin
 {
 	namespace graphics
 	{
+
 		/// 
 		/// Built in shader program.
 		/// 
diff --git a/src/libjin/Graphics/Shader/texture.shader.h b/src/libjin/Graphics/Shader/je_texture.shader.h
index d1fc86f..d1fc86f 100644
--- a/src/libjin/Graphics/Shader/texture.shader.h
+++ b/src/libjin/Graphics/Shader/je_texture.shader.h