11 files changed, 23 insertions, 21 deletions
diff --git a/src/libjin/Input/Event.cpp b/src/libjin/Input/Event.cpp
deleted file mode 100644
index c8eb78c..0000000
--- a/src/libjin/Input/Event.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "event.h"
-#include "SDL2\SDL.h"
-
-namespace jin
-{
-
-} // namespace jin
-\ No newline at end of file
diff --git a/src/libjin/Input/Input.h b/src/libjin/Input/Input.h
deleted file mode 100644
index a828ac7..0000000
--- a/src/libjin/Input/Input.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __LIBJIN_INPUT_H
-#define __LIBJIN_INPUT_H
-
-#include "event.h"
-#include "keyboard.h"
-#include "mouse.h"
-#include "joypad.h"
-
-#endif
-\ No newline at end of file
diff --git a/src/libjin/Input/je_event.cpp b/src/libjin/Input/je_event.cpp
new file mode 100644
index 0000000..4f55839
--- /dev/null
+++ b/src/libjin/Input/je_event.cpp
@@ -0,0 +1,8 @@
+#include "SDL2\SDL.h"
+
+#include "je_event.h"
+
+namespace jin
+{
+
+} // namespace jin
+\ No newline at end of file
diff --git a/src/libjin/Input/Event.h b/src/libjin/Input/je_event.h
index 3f2bc8e..d8ceda0 100644
--- a/src/libjin/Input/Event.h
+++ b/src/libjin/Input/je_event.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_EVENT_H
 #define __LIBJIN_EVENT_H
-#include "../configuration.h"
+#include "../core/je_configuration.h"
 #if LIBJIN_MODULES_INPUT   
 
 namespace jin
diff --git a/src/libjin/Input/je_input.h b/src/libjin/Input/je_input.h
new file mode 100644
index 0000000..2f6a895
--- /dev/null
+++ b/src/libjin/Input/je_input.h
@@ -0,0 +1,9 @@
+#ifndef __LIBJIN_INPUT_H
+#define __LIBJIN_INPUT_H
+
+#include "je_event.h"
+#include "je_keyboard.h"
+#include "je_mouse.h"
+#include "je_joypad.h"
+
+#endif
+\ No newline at end of file
diff --git a/src/libjin/Input/Joypad.cpp b/src/libjin/Input/je_joypad.cpp
index e69de29..e69de29 100644
--- a/src/libjin/Input/Joypad.cpp
+++ b/src/libjin/Input/je_joypad.cpp
diff --git a/src/libjin/Input/Joypad.h b/src/libjin/Input/je_joypad.h
index 570699e..570699e 100644
--- a/src/libjin/Input/Joypad.h
+++ b/src/libjin/Input/je_joypad.h
diff --git a/src/libjin/Input/Keyboard.cpp b/src/libjin/Input/je_keyboard.cpp
index e69de29..e69de29 100644
--- a/src/libjin/Input/Keyboard.cpp
+++ b/src/libjin/Input/je_keyboard.cpp
diff --git a/src/libjin/Input/Keyboard.h b/src/libjin/Input/je_keyboard.h
index 60f1169..60f1169 100644
--- a/src/libjin/Input/Keyboard.h
+++ b/src/libjin/Input/je_keyboard.h
diff --git a/src/libjin/Input/Mouse.cpp b/src/libjin/Input/je_mouse.cpp
index dcaa771..21e59fb 100644
--- a/src/libjin/Input/Mouse.cpp
+++ b/src/libjin/Input/je_mouse.cpp
@@ -1,8 +1,9 @@
-#include "../configuration.h"
+#include "../core/je_configuration.h"
 #ifdef LIBJIN_MODULES_INPUT    
 
 #include "SDL.h"
-#include "Mouse.h"
+
+#include "je_mouse.h"
 
 namespace jin
 {
diff --git a/src/libjin/Input/Mouse.h b/src/libjin/Input/je_mouse.h
index 7e93792..e9fab42 100644
--- a/src/libjin/Input/Mouse.h
+++ b/src/libjin/Input/je_mouse.h
@@ -1,9 +1,9 @@
 #ifndef __LIBJIN_MOUSE_H
 #define __LIBJIN_MOUSE_H
-#include "../configuration.h"
+#include "../core/je_configuration.h"
 #ifdef LIBJIN_MODULES_INPUT
 
-#include "../Common/Singleton.hpp"
+#include "../common/je_singleton.hpp"
 
 namespace jin
 {