diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca88fd0..65cf5fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -223,6 +223,8 @@ endif()
 
 add_library(EHS ${EHS_SOURCES})
 
+target_include_directories(EHS PUBLIC ${PROJECT_SOURCE_DIR}/include)
+
 add_executable(StrToHash src/StrToHash.cpp)
 
 set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/Libraries/EHS")
diff --git a/include/Database/DVar.h b/include/Database/DVar.h
index 4673492..da6ba6e 100644
--- a/include/Database/DVar.h
+++ b/include/Database/DVar.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../BaseObj.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "BaseObj.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/include/IO/Audio/Audio.h b/include/IO/Audio/Audio.h
index e51bd91..297108a 100644
--- a/include/IO/Audio/Audio.h
+++ b/include/IO/Audio/Audio.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../DataType.h"
-#include "../../Str.h"
-#include "../../Serializer.h"
-#include "../../Vector.h"
-#include "../../Array.h"
+#include "EHS.h"
+#include "DataType.h"
+#include "Str.h"
+#include "Serializer.h"
+#include "Vector.h"
+#include "Array.h"
 #include "AudioCodec.h"
 
 namespace lwe
diff --git a/include/IO/Audio/AudioCodec.h b/include/IO/Audio/AudioCodec.h
index 2c145d5..fda3edc 100644
--- a/include/IO/Audio/AudioCodec.h
+++ b/include/IO/Audio/AudioCodec.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../File.h"
+#include "EHS.h"
+#include "Str.h"
+#include "IO/File.h"
 
 namespace lwe
 {
diff --git a/include/IO/Audio/AudioDevice.h b/include/IO/Audio/AudioDevice.h
index 1ff482e..26a2a04 100644
--- a/include/IO/Audio/AudioDevice.h
+++ b/include/IO/Audio/AudioDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../EHS.h"
+#include "EHS.h"
 
 #if defined(LWE_OS_WINDOWS)
 #include "AudioDevice_W32.h"
diff --git a/include/IO/Audio/AudioDevice_ALSA.h b/include/IO/Audio/AudioDevice_ALSA.h
index 99db262..604604a 100644
--- a/include/IO/Audio/AudioDevice_ALSA.h
+++ b/include/IO/Audio/AudioDevice_ALSA.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../EHS.h"
+#include "EHS.h"
 #include "BaseAudioDevice.h"
 
 #include <alsa/asoundlib.h>
diff --git a/include/IO/Audio/AudioDevice_W32.h b/include/IO/Audio/AudioDevice_W32.h
index 88c03ea..9f0fdb7 100644
--- a/include/IO/Audio/AudioDevice_W32.h
+++ b/include/IO/Audio/AudioDevice_W32.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../EHS.h"
+#include "EHS.h"
 #include "BaseAudioDevice.h"
 
 #include <initguid.h>
diff --git a/include/IO/Audio/BaseAudioDevice.h b/include/IO/Audio/BaseAudioDevice.h
index 4143483..ab29a3d 100644
--- a/include/IO/Audio/BaseAudioDevice.h
+++ b/include/IO/Audio/BaseAudioDevice.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../../Vector.h"
-#include "../../Array.h"
-#include "../../DataType.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Vector.h"
+#include "Array.h"
+#include "DataType.h"
 
 namespace lwe
 {
diff --git a/include/IO/BaseFile.h b/include/IO/BaseFile.h
index 38d2d98..c532e9b 100644
--- a/include/IO/BaseFile.h
+++ b/include/IO/BaseFile.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
-#include "../Vector.h"
-#include "../Array.h"
-#include "../Serializer.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Vector.h"
+#include "Array.h"
+#include "Serializer.h"
 
 namespace lwe
 {
diff --git a/include/IO/BaseFileMonitor.h b/include/IO/BaseFileMonitor.h
index 7c85a2a..d8f0e01 100644
--- a/include/IO/BaseFileMonitor.h
+++ b/include/IO/BaseFileMonitor.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 #define LWE_FE_NONE 0x00
 #define LWE_FE_MODIFIED 0x01
diff --git a/include/IO/BaseWindow.h b/include/IO/BaseWindow.h
index de156fa..5429438 100644
--- a/include/IO/BaseWindow.h
+++ b/include/IO/BaseWindow.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
-#include "../Vec2.h"
-#include "../Rect.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Vec2.h"
+#include "Rect.h"
 #include "HID/Input.h"
 
 namespace lwe
diff --git a/include/IO/COM.h b/include/IO/COM.h
index f112662..680fe53 100644
--- a/include/IO/COM.h
+++ b/include/IO/COM.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 
 namespace lwe
 {
diff --git a/include/IO/Console.h b/include/IO/Console.h
index a9c14be..041bed6 100644
--- a/include/IO/Console.h
+++ b/include/IO/Console.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../Str.h"
-#include "../UTF.h"
-#include "../Array.h"
+#include "Str.h"
+#include "UTF.h"
+#include "Array.h"
 
 namespace lwe
 {
diff --git a/include/IO/File.h b/include/IO/File.h
index f0c9e3d..edb15b9 100644
--- a/include/IO/File.h
+++ b/include/IO/File.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 
 #if defined(LWE_OS_WINDOWS)
 #include "File_W32.h"
diff --git a/include/IO/FileMonitor_UNX.h b/include/IO/FileMonitor_UNX.h
index 324e231..2fe48a7 100644
--- a/include/IO/FileMonitor_UNX.h
+++ b/include/IO/FileMonitor_UNX.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 #include "BaseFileMonitor.h"
 
 namespace lwe
diff --git a/include/IO/FileMonitor_W32.h b/include/IO/FileMonitor_W32.h
index 48d8bc6..c84afe3 100644
--- a/include/IO/FileMonitor_W32.h
+++ b/include/IO/FileMonitor_W32.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 #include "BaseFileMonitor.h"
 
 namespace lwe
diff --git a/include/IO/File_UNX.h b/include/IO/File_UNX.h
index 011ff85..06a6fe6 100644
--- a/include/IO/File_UNX.h
+++ b/include/IO/File_UNX.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
-#include "../UTF.h"
-#include "../Vector.h"
-#include "../Array.h"
-#include "../Serializer.h"
+#include "EHS.h"
+#include "Str.h"
+#include "UTF.h"
+#include "Vector.h"
+#include "Array.h"
+#include "Serializer.h"
 #include "BaseFile.h"
 
 namespace lwe
diff --git a/include/IO/File_W32.h b/include/IO/File_W32.h
index ba83a32..91ea2df 100644
--- a/include/IO/File_W32.h
+++ b/include/IO/File_W32.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
-#include "../UTF.h"
-#include "../Vector.h"
-#include "../Array.h"
-#include "../Serializer.h"
+#include "EHS.h"
+#include "Str.h"
+#include "UTF.h"
+#include "Vector.h"
+#include "Array.h"
+#include "Serializer.h"
 #include "BaseFile.h"
 
 namespace lwe
diff --git a/include/IO/FontAtlas.h b/include/IO/FontAtlas.h
index d9a7fcc..32db8f9 100644
--- a/include/IO/FontAtlas.h
+++ b/include/IO/FontAtlas.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Array.h"
+#include "EHS.h"
+#include "Array.h"
 
 #include "Glyph.h"
-#include "../Anchor.h"
+#include "Anchor.h"
 #include "Img/Img.h"
 #include "Model/Mesh.h"
 
diff --git a/include/IO/Glyph.h b/include/IO/Glyph.h
index 21ea75a..7863771 100644
--- a/include/IO/Glyph.h
+++ b/include/IO/Glyph.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Vec2.h"
-#include "../Rect.h"
-#include "../Serializer.h"
+#include "EHS.h"
+#include "Vec2.h"
+#include "Rect.h"
+#include "Serializer.h"
 
 namespace lwe
 {
diff --git a/include/IO/HID/Button.h b/include/IO/HID/Button.h
index f3e1362..bb60211 100644
--- a/include/IO/HID/Button.h
+++ b/include/IO/HID/Button.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/include/IO/HID/ButtonState.h b/include/IO/HID/ButtonState.h
index 150e06b..4ef2af9 100644
--- a/include/IO/HID/ButtonState.h
+++ b/include/IO/HID/ButtonState.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../EHS.h"
+#include "EHS.h"
 #include "Button.h"
 
 namespace lwe
diff --git a/include/IO/HID/HID.h b/include/IO/HID/HID.h
index c057824..9223b5e 100644
--- a/include/IO/HID/HID.h
+++ b/include/IO/HID/HID.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Array.h"
+#include "Array.h"
 #include "ButtonState.h"
 
 #define LWE_HID_UNKNOWN 0
diff --git a/include/IO/HID/Input.h b/include/IO/HID/Input.h
index 950cfea..a7b32d0 100644
--- a/include/IO/HID/Input.h
+++ b/include/IO/HID/Input.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../Array.h"
-#include "../../Serializer.h"
+#include "Array.h"
+#include "Serializer.h"
 #include "InputHandler.h"
 
 namespace lwe
diff --git a/include/IO/HID/InputHandler.h b/include/IO/HID/InputHandler.h
index f5ea1a4..0a4acab 100644
--- a/include/IO/HID/InputHandler.h
+++ b/include/IO/HID/InputHandler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Array.h"
+#include "Array.h"
 #include "HID.h"
 
 namespace lwe
diff --git a/include/IO/HID/Keyboard.h b/include/IO/HID/Keyboard.h
index ffe7195..bc5becb 100644
--- a/include/IO/HID/Keyboard.h
+++ b/include/IO/HID/Keyboard.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Types.h"
+#include "Types.h"
 #include "Button.h"
 #include "HID.h"
 
diff --git a/include/IO/HID/Mouse.h b/include/IO/HID/Mouse.h
index 7c5b1ca..2dd7e2d 100644
--- a/include/IO/HID/Mouse.h
+++ b/include/IO/HID/Mouse.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../Types.h"
-#include "../../Vec2.h"
+#include "Types.h"
+#include "Vec2.h"
 #include "Button.h"
 #include "HID.h"
 
diff --git a/include/IO/Img/Img.h b/include/IO/Img/Img.h
index a20baa3..18d3573 100644
--- a/include/IO/Img/Img.h
+++ b/include/IO/Img/Img.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "ImgCodec.h"
 
 namespace lwe
diff --git a/include/IO/Img/ImgCodec.h b/include/IO/Img/ImgCodec.h
index 153d24d..9279e71 100644
--- a/include/IO/Img/ImgCodec.h
+++ b/include/IO/Img/ImgCodec.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../File.h"
+#include "EHS.h"
+#include "Str.h"
+#include "IO/File.h"
 
 namespace lwe
 {
diff --git a/include/IO/Img/PNG.h b/include/IO/Img/PNG.h
index 57776c7..636dee6 100644
--- a/include/IO/Img/PNG.h
+++ b/include/IO/Img/PNG.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Serializer.h"
+#include "EHS.h"
+#include "Serializer.h"
 #include "PNG_Chunk.h"
 #include "Img.h"
 
diff --git a/include/IO/Img/PNG_Chunk.h b/include/IO/Img/PNG_Chunk.h
index 1f46755..0a19ac8 100644
--- a/include/IO/Img/PNG_Chunk.h
+++ b/include/IO/Img/PNG_Chunk.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../../Serializer.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Serializer.h"
 
 namespace lwe
 {
diff --git a/include/IO/Model/AnimBone.h b/include/IO/Model/AnimBone.h
index ed04f44..78ce863 100644
--- a/include/IO/Model/AnimBone.h
+++ b/include/IO/Model/AnimBone.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Array.h"
+#include "EHS.h"
+#include "Array.h"
 #include "KeyFrame.h"
 
 namespace lwe
diff --git a/include/IO/Model/Animation.h b/include/IO/Model/Animation.h
index 78c3519..2b87edb 100644
--- a/include/IO/Model/Animation.h
+++ b/include/IO/Model/Animation.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../../Array.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Array.h"
 #include "AnimBone.h"
 
 namespace lwe
diff --git a/include/IO/Model/Bone.h b/include/IO/Model/Bone.h
index 62a6f9b..8a10cd2 100644
--- a/include/IO/Model/Bone.h
+++ b/include/IO/Model/Bone.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Quat.h"
-#include "../../Mat4.h"
+#include "EHS.h"
+#include "Quat.h"
+#include "Mat4.h"
 
 namespace lwe
 {
diff --git a/include/IO/Model/KeyFrame.h b/include/IO/Model/KeyFrame.h
index df598f1..908bcd9 100644
--- a/include/IO/Model/KeyFrame.h
+++ b/include/IO/Model/KeyFrame.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Array.h"
-#include "../../Vec3.h"
-#include "../../Quat.h"
-#include "../../Mat4.h"
+#include "EHS.h"
+#include "Array.h"
+#include "Vec3.h"
+#include "Quat.h"
+#include "Mat4.h"
 #include "PropertyChange.h"
 
 namespace lwe
diff --git a/include/IO/Model/Mesh.h b/include/IO/Model/Mesh.h
index 5a89178..a270555 100644
--- a/include/IO/Model/Mesh.h
+++ b/include/IO/Model/Mesh.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Array.h"
+#include "EHS.h"
+#include "Array.h"
 #include "Vertex.h"
 
 namespace lwe
diff --git a/include/IO/Model/Model.h b/include/IO/Model/Model.h
index 57d742e..fe9e7ae 100644
--- a/include/IO/Model/Model.h
+++ b/include/IO/Model/Model.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Array.h"
-#include "../File.h"
+#include "EHS.h"
+#include "Array.h"
+#include "IO/File.h"
 #include "Mesh.h"
 #include "Bone.h"
 #include "Animation.h"
diff --git a/include/IO/Model/PropertyChange.h b/include/IO/Model/PropertyChange.h
index df3d757..d31f820 100644
--- a/include/IO/Model/PropertyChange.h
+++ b/include/IO/Model/PropertyChange.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../EHS.h"
+#include "EHS.h"
 
 namespace lwe
 {
diff --git a/include/IO/Model/Vertex.h b/include/IO/Model/Vertex.h
index 93567cc..738ccf0 100644
--- a/include/IO/Model/Vertex.h
+++ b/include/IO/Model/Vertex.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Vec3.h"
-#include "../../Vec2.h"
-#include "../../Color4.h"
+#include "EHS.h"
+#include "Vec3.h"
+#include "Vec2.h"
+#include "Color4.h"
 
 namespace lwe
 {
diff --git a/include/IO/RIFF.h b/include/IO/RIFF.h
index 865674c..066ee25 100644
--- a/include/IO/RIFF.h
+++ b/include/IO/RIFF.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
-#include "../Vector.h"
-#include "../Serializer.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Vector.h"
+#include "Serializer.h"
 #include "RIFF_Chunk.h"
 
 namespace lwe
diff --git a/include/IO/RIFF_Chunk.h b/include/IO/RIFF_Chunk.h
index 8636376..9d3ef73 100644
--- a/include/IO/RIFF_Chunk.h
+++ b/include/IO/RIFF_Chunk.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
-#include "../Serializer.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Serializer.h"
 
 namespace lwe
 {
diff --git a/include/IO/Socket/BaseTCP.h b/include/IO/Socket/BaseTCP.h
index f676e34..c0e1ea7 100644
--- a/include/IO/Socket/BaseTCP.h
+++ b/include/IO/Socket/BaseTCP.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "Request.h"
 #include "Response.h"
 
diff --git a/include/IO/Socket/BaseUDP.h b/include/IO/Socket/BaseUDP.h
index 4f71fe7..e878ff7 100644
--- a/include/IO/Socket/BaseUDP.h
+++ b/include/IO/Socket/BaseUDP.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "Socket.h"
 
 namespace lwe
diff --git a/include/IO/Socket/Comms.h b/include/IO/Socket/Comms.h
index 7ff360b..8bc76eb 100644
--- a/include/IO/Socket/Comms.h
+++ b/include/IO/Socket/Comms.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Log.h"
-#include "../../BaseObj.h"
-#include "../../Serializer.h"
-#include "../../Vector.h"
-#include "../../Array.h"
+#include "EHS.h"
+#include "Log.h"
+#include "BaseObj.h"
+#include "Serializer.h"
+#include "Vector.h"
+#include "Array.h"
 #include "Socket.h"
 #include "UDP.h"
 
diff --git a/include/IO/Socket/CommsSystem.h b/include/IO/Socket/CommsSystem.h
index 1d9805b..51da76e 100644
--- a/include/IO/Socket/CommsSystem.h
+++ b/include/IO/Socket/CommsSystem.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../../Array.h"
-#include "../../Serializer.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Array.h"
+#include "Serializer.h"
 
 namespace lwe
 {
diff --git a/include/IO/Socket/DNS.h b/include/IO/Socket/DNS.h
index e962e7c..d9c0929 100644
--- a/include/IO/Socket/DNS.h
+++ b/include/IO/Socket/DNS.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "Socket.h"
 
 namespace lwe
diff --git a/include/IO/Socket/Endpoint.h b/include/IO/Socket/Endpoint.h
index 4b0d31a..f0e8643 100644
--- a/include/IO/Socket/Endpoint.h
+++ b/include/IO/Socket/Endpoint.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../../BaseObj.h"
-#include "../../Vector.h"
-#include "../../Serializer.h"
-#include "../../IO/Socket/Socket.h"
+#include "EHS.h"
+#include "Str.h"
+#include "BaseObj.h"
+#include "Vector.h"
+#include "Serializer.h"
+#include "IO/Socket/Socket.h"
 
 #include "Utils.h"
 #include "Fragments.h"
diff --git a/include/IO/Socket/Fragments.h b/include/IO/Socket/Fragments.h
index 7631f5a..17e2204 100644
--- a/include/IO/Socket/Fragments.h
+++ b/include/IO/Socket/Fragments.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Serializer.h"
+#include "EHS.h"
+#include "Serializer.h"
 
 #include "Utils.h"
 
diff --git a/include/IO/Socket/Operation.h b/include/IO/Socket/Operation.h
index ac7a2f6..a9b32d6 100644
--- a/include/IO/Socket/Operation.h
+++ b/include/IO/Socket/Operation.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../../Serializer.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Serializer.h"
 
 namespace lwe
 {
diff --git a/include/IO/Socket/Request.h b/include/IO/Socket/Request.h
index 7d38913..890f03d 100644
--- a/include/IO/Socket/Request.h
+++ b/include/IO/Socket/Request.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Vector.h"
-#include "../../Str.h"
-#include "../../Json/Json.h"
+#include "EHS.h"
+#include "Vector.h"
+#include "Str.h"
+#include "Json/Json.h"
 #include "Socket.h"
 
 namespace lwe
diff --git a/include/IO/Socket/Response.h b/include/IO/Socket/Response.h
index 88dcb98..d5e156b 100644
--- a/include/IO/Socket/Response.h
+++ b/include/IO/Socket/Response.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Vector.h"
-#include "../../Str.h"
-#include "../../Json/Json.h"
+#include "EHS.h"
+#include "Vector.h"
+#include "Str.h"
+#include "Json/Json.h"
 #include "Socket.h"
 
 namespace lwe
diff --git a/include/IO/Socket/RestAPIs/Spotify.h b/include/IO/Socket/RestAPIs/Spotify.h
index 67b3735..fbbb76a 100644
--- a/include/IO/Socket/RestAPIs/Spotify.h
+++ b/include/IO/Socket/RestAPIs/Spotify.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../../EHS.h"
-#include "../../../Str.h"
-#include "../../../Array.h"
-#include "../SSL.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Array.h"
+#include "IO/Socket/SSL.h"
 
 namespace lwe
 {
diff --git a/include/IO/Socket/RestAPIs/Twitch.h b/include/IO/Socket/RestAPIs/Twitch.h
index 1964913..8ec1f0e 100644
--- a/include/IO/Socket/RestAPIs/Twitch.h
+++ b/include/IO/Socket/RestAPIs/Twitch.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../../EHS.h"
-#include "../../../Str.h"
-#include "../SSL.h"
+#include "EHS.h"
+#include "Str.h"
+#include "IO/Socket/SSL.h"
 
 namespace lwe
 {
diff --git a/include/IO/Socket/RestAPIs/TwitchChat.h b/include/IO/Socket/RestAPIs/TwitchChat.h
index 949d409..afcb316 100644
--- a/include/IO/Socket/RestAPIs/TwitchChat.h
+++ b/include/IO/Socket/RestAPIs/TwitchChat.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../../EHS.h"
-#include "../../../Str.h"
-#include "../TCP.h"
+#include "EHS.h"
+#include "Str.h"
+#include "IO/Socket/TCP.h"
 
 namespace lwe
 {
diff --git a/include/IO/Socket/SSL.h b/include/IO/Socket/SSL.h
index 38bb28a..aebe2e7 100644
--- a/include/IO/Socket/SSL.h
+++ b/include/IO/Socket/SSL.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "TCP.h"
 #include "Request.h"
 #include "Response.h"
diff --git a/include/IO/Socket/TCP_BSD.h b/include/IO/Socket/TCP_BSD.h
index 7bb2db3..a9f307d 100644
--- a/include/IO/Socket/TCP_BSD.h
+++ b/include/IO/Socket/TCP_BSD.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../../Log.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Log.h"
 
 #include "Socket.h"
 #include "BaseTCP.h"
diff --git a/include/IO/Socket/TCP_W32.h b/include/IO/Socket/TCP_W32.h
index 7bb2db3..a9f307d 100644
--- a/include/IO/Socket/TCP_W32.h
+++ b/include/IO/Socket/TCP_W32.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
-#include "../../Log.h"
+#include "EHS.h"
+#include "Str.h"
+#include "Log.h"
 
 #include "Socket.h"
 #include "BaseTCP.h"
diff --git a/include/IO/Socket/UDP_BSD.h b/include/IO/Socket/UDP_BSD.h
index a1fe9ca..7aaeb97 100644
--- a/include/IO/Socket/UDP_BSD.h
+++ b/include/IO/Socket/UDP_BSD.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "BaseUDP.h"
 
 namespace lwe
diff --git a/include/IO/Socket/UDP_W32.h b/include/IO/Socket/UDP_W32.h
index a1fe9ca..7aaeb97 100644
--- a/include/IO/Socket/UDP_W32.h
+++ b/include/IO/Socket/UDP_W32.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "BaseUDP.h"
 
 namespace lwe
diff --git a/include/IO/Socket/Utils.h b/include/IO/Socket/Utils.h
index 69c1af0..7c6b3d8 100644
--- a/include/IO/Socket/Utils.h
+++ b/include/IO/Socket/Utils.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../EHS.h"
-#include "../../Serializer.h"
+#include "EHS.h"
+#include "Serializer.h"
 
 namespace lwe
 {
diff --git a/include/IO/Window.h b/include/IO/Window.h
index 8e6e060..e9b3819 100644
--- a/include/IO/Window.h
+++ b/include/IO/Window.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 
 #if defined(LWE_OS_WINDOWS)
     #include "Window_W32.h"
diff --git a/include/IO/Window_W32.h b/include/IO/Window_W32.h
index fbea481..8a80b25 100644
--- a/include/IO/Window_W32.h
+++ b/include/IO/Window_W32.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Array.h"
-#include "../Str.h"
-#include "../Vec4.h"
+#include "EHS.h"
+#include "Array.h"
+#include "Str.h"
+#include "Vec4.h"
 #include "BaseWindow.h"
-#include "HID/InputHandler_RI.h"
+#include "HID/InputHandler.h"
 
 #define WM_HIDE (WM_APP + 1)
 #define WM_SHOW (WM_APP + 2)
diff --git a/include/IO/xdg-shell-client-protocol.h b/include/IO/xdg-shell-client-protocol.h
index ea75d47..5f79269 100644
--- a/include/IO/xdg-shell-client-protocol.h
+++ b/include/IO/xdg-shell-client-protocol.h
@@ -3,8 +3,8 @@
 #ifndef XDG_SHELL_CLIENT_PROTOCOL_H
 #define XDG_SHELL_CLIENT_PROTOCOL_H
 
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
+#include <cstddef>
 #include "wayland-client.h"
 
 #ifdef  __cplusplus
diff --git a/include/Json/Json.h b/include/Json/Json.h
index 277c2ba..6a1863f 100644
--- a/include/Json/Json.h
+++ b/include/Json/Json.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "JsonBase.h"
 #include "JsonObj.h"
 #include "JsonArray.h"
diff --git a/include/Json/JsonArray.h b/include/Json/JsonArray.h
index 01c4e20..819c0b5 100644
--- a/include/Json/JsonArray.h
+++ b/include/Json/JsonArray.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
-
+#include "EHS.h"
+#include "Str.h"
 #include "JsonBase.h"
 
 namespace lwe
diff --git a/include/Json/JsonBase.h b/include/Json/JsonBase.h
index 1360cac..84cf16f 100644
--- a/include/Json/JsonBase.h
+++ b/include/Json/JsonBase.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/include/Json/JsonBool.h b/include/Json/JsonBool.h
index 25ba72d..fd5f75c 100644
--- a/include/Json/JsonBool.h
+++ b/include/Json/JsonBool.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 #include "JsonBase.h"
 
diff --git a/include/Json/JsonNum.h b/include/Json/JsonNum.h
index badc746..2c6c480 100644
--- a/include/Json/JsonNum.h
+++ b/include/Json/JsonNum.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 #include "JsonBase.h"
 
diff --git a/include/Json/JsonObj.h b/include/Json/JsonObj.h
index 69c31f0..6fc8253 100644
--- a/include/Json/JsonObj.h
+++ b/include/Json/JsonObj.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 #include "JsonBase.h"
 
diff --git a/include/Json/JsonStr.h b/include/Json/JsonStr.h
index 4092070..a4b61b2 100644
--- a/include/Json/JsonStr.h
+++ b/include/Json/JsonStr.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 #include "JsonBase.h"
 
diff --git a/include/Json/JsonVar.h b/include/Json/JsonVar.h
index ddfb3bd..a4b8716 100644
--- a/include/Json/JsonVar.h
+++ b/include/Json/JsonVar.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/include/System/BaseMutex.h b/include/System/BaseMutex.h
index 6d7ab03..1c19340 100644
--- a/include/System/BaseMutex.h
+++ b/include/System/BaseMutex.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 
 namespace lwe
 {
diff --git a/include/System/BaseOpen.h b/include/System/BaseOpen.h
index b25f799..0a696e7 100644
--- a/include/System/BaseOpen.h
+++ b/include/System/BaseOpen.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Str.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/include/System/BaseSemaphore.h b/include/System/BaseSemaphore.h
index d3269da..8033f4e 100644
--- a/include/System/BaseSemaphore.h
+++ b/include/System/BaseSemaphore.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/include/System/BaseSystem.h b/include/System/BaseSystem.h
index 831b32c..a74ef0f 100644
--- a/include/System/BaseSystem.h
+++ b/include/System/BaseSystem.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/include/System/CPU.h b/include/System/CPU.h
index ab5fa76..b088f99 100644
--- a/include/System/CPU.h
+++ b/include/System/CPU.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../Types.h"
+#include "Types.h"
 #include "Architecture.h"
 #include "OS.h"
-#include "../Str.h"
-#include "../Array.h"
+#include "Str.h"
+#include "Array.h"
 
 namespace lwe
 {
diff --git a/include/System/FileSystem.h b/include/System/FileSystem.h
index 32681b8..d0643b2 100644
--- a/include/System/FileSystem.h
+++ b/include/System/FileSystem.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/include/System/Mutex.h b/include/System/Mutex.h
index 0f9c3dd..c6b664f 100644
--- a/include/System/Mutex.h
+++ b/include/System/Mutex.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 
 #if defined(LWE_OS_WINDOWS)
 	#include "Mutex_W32.h"
diff --git a/include/System/Mutex_PT.h b/include/System/Mutex_PT.h
index 3bb1c09..151fe1e 100644
--- a/include/System/Mutex_PT.h
+++ b/include/System/Mutex_PT.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 #include "BaseMutex.h"
 
 #include <pthread.h>
diff --git a/include/System/Mutex_W32.h b/include/System/Mutex_W32.h
index f6213c0..5f67b1c 100644
--- a/include/System/Mutex_W32.h
+++ b/include/System/Mutex_W32.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 #include "BaseMutex.h"
 
 namespace lwe
diff --git a/include/System/Semaphore_P.h b/include/System/Semaphore_P.h
index c140363..f72f7fe 100644
--- a/include/System/Semaphore_P.h
+++ b/include/System/Semaphore_P.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "BaseSemaphore.h"
 
 #include <semaphore.h>
diff --git a/include/System/Semaphore_W32.h b/include/System/Semaphore_W32.h
index 719eb6f..eb97b14 100644
--- a/include/System/Semaphore_W32.h
+++ b/include/System/Semaphore_W32.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 #include "BaseSemaphore.h"
 
 namespace lwe
diff --git a/include/System/System.h b/include/System/System.h
index d17d2be..bc8ec49 100644
--- a/include/System/System.h
+++ b/include/System/System.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 
 #if defined(LWE_OS_WINDOWS)
 #include "System_W32.h"
diff --git a/include/System/System_LNX.h b/include/System/System_LNX.h
index 62c3bcf..97998a3 100644
--- a/include/System/System_LNX.h
+++ b/include/System/System_LNX.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../EHS.h"
+#include "EHS.h"
 #include "BaseSystem.h"
 
 namespace lwe
diff --git a/include/System/Thread.h b/include/System/Thread.h
index 7e01a77..9ad7675 100644
--- a/include/System/Thread.h
+++ b/include/System/Thread.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Serializer.h"
-#include "../Array.h"
-#include "../Log.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Serializer.h"
+#include "Array.h"
+#include "Log.h"
+#include "Str.h"
 
 #ifdef LWE_OS_WINDOWS
 	#include <processthreadsapi.h>
diff --git a/include/System/User.h b/include/System/User.h
index 4cb5ecf..3ed533e 100644
--- a/include/System/User.h
+++ b/include/System/User.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../EHS.h"
-#include "../Str.h"
+#include "EHS.h"
+#include "Str.h"
 
 namespace lwe
 {
diff --git a/src/Base64.cpp b/src/Base64.cpp
index 1c65711..16d6c0a 100644
--- a/src/Base64.cpp
+++ b/src/Base64.cpp
@@ -1,4 +1,4 @@
-#include "../include/Base64.h"
+#include "Base64.h"
 
 namespace lwe
 {
diff --git a/src/BaseObj.cpp b/src/BaseObj.cpp
index cd9d793..8bd9ac4 100644
--- a/src/BaseObj.cpp
+++ b/src/BaseObj.cpp
@@ -1,4 +1,4 @@
-#include "../include/BaseObj.h"
+#include "BaseObj.h"
 
 namespace lwe
 {
diff --git a/src/Color3.cpp b/src/Color3.cpp
index 7fc604a..0fb66fc 100644
--- a/src/Color3.cpp
+++ b/src/Color3.cpp
@@ -1,5 +1,5 @@
-#include "../include/Color3.h"
-#include "../include/Math.h"
+#include "Color3.h"
+#include "Math.h"
 
 namespace lwe
 {
diff --git a/src/Color4.cpp b/src/Color4.cpp
index de82139..9043157 100644
--- a/src/Color4.cpp
+++ b/src/Color4.cpp
@@ -1,5 +1,5 @@
-#include "../include/Color4.h"
-#include "../include/Math.h"
+#include "Color4.h"
+#include "Math.h"
 
 namespace lwe
 {
diff --git a/src/Data.cpp b/src/Data.cpp
index 60ed9f7..eefde30 100644
--- a/src/Data.cpp
+++ b/src/Data.cpp
@@ -1,4 +1,4 @@
-#include "../include/Data.h"
+#include "Data.h"
 
 namespace lwe
 {
diff --git a/src/DataType.cpp b/src/DataType.cpp
index 7762ea4..da777c7 100644
--- a/src/DataType.cpp
+++ b/src/DataType.cpp
@@ -1,4 +1,4 @@
-#include "../include/DataType.h"
+#include "DataType.h"
 
 namespace lwe
 {
diff --git a/src/Database/DVar.cpp b/src/Database/DVar.cpp
index cde1679..e83a79f 100644
--- a/src/Database/DVar.cpp
+++ b/src/Database/DVar.cpp
@@ -1,4 +1,4 @@
-#include "../../include/Database/DVar.h"
+#include "Database/DVar.h"
 
 namespace lwe
 {
diff --git a/src/EHS.cpp b/src/EHS.cpp
index 720552c..c02dc19 100644
--- a/src/EHS.cpp
+++ b/src/EHS.cpp
@@ -1,11 +1,11 @@
-#include "../include/EHS.h"
-#include "../include/Log.h"
-#include "../include/Version.h"
-#include "../include/GarbageCollector.h"
-#include "../include/IO/Audio/Audio.h"
-#include "../include/IO/Img/Img.h"
-#include "../include/IO/Img/PNG.h"
-#include "../include/IO/RIFF.h"
+#include "EHS.h"
+#include "Log.h"
+#include "Version.h"
+#include "GarbageCollector.h"
+#include "IO/Audio/Audio.h"
+#include "IO/Img/Img.h"
+#include "IO/Img/PNG.h"
+#include "IO/RIFF.h"
 
 #include <zlib.h>
 
diff --git a/src/Encryption.cpp b/src/Encryption.cpp
index 87860dd..9ccd5da 100644
--- a/src/Encryption.cpp
+++ b/src/Encryption.cpp
@@ -1,5 +1,5 @@
-#include "../include/Encryption.h"
-#include "../include/PRNG.h"
+#include "Encryption.h"
+#include "PRNG.h"
 
 namespace lwe
 {
diff --git a/src/GarbageCollector.cpp b/src/GarbageCollector.cpp
index 5897791..96c5aba 100644
--- a/src/GarbageCollector.cpp
+++ b/src/GarbageCollector.cpp
@@ -1,4 +1,4 @@
-#include "../include/GarbageCollector.h"
+#include "GarbageCollector.h"
 
 namespace lwe
 {
diff --git a/src/HRNG_ARM64.cpp b/src/HRNG_ARM64.cpp
index 86fefdd..29626c4 100644
--- a/src/HRNG_ARM64.cpp
+++ b/src/HRNG_ARM64.cpp
@@ -1,4 +1,4 @@
-#include "../include/HRNG.h"
+#include "HRNG.h"
 
 namespace lwe
 {
diff --git a/src/IO/Audio/Audio.cpp b/src/IO/Audio/Audio.cpp
index 67ea8fa..d30c016 100644
--- a/src/IO/Audio/Audio.cpp
+++ b/src/IO/Audio/Audio.cpp
@@ -1,6 +1,6 @@
-#include "../../../include/IO/Audio/Audio.h"
-#include "../../../include/IO/File.h"
-#include "../../../include/IO/RIFF.h"
+#include "IO/Audio/Audio.h"
+#include "IO/File.h"
+#include "IO/RIFF.h"
 
 namespace lwe
 {
diff --git a/src/IO/Audio/AudioCodec.cpp b/src/IO/Audio/AudioCodec.cpp
index e081851..eb79a49 100644
--- a/src/IO/Audio/AudioCodec.cpp
+++ b/src/IO/Audio/AudioCodec.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Audio/AudioCodec.h"
+#include "IO/Audio/AudioCodec.h"
 
 namespace lwe
 {
diff --git a/src/IO/Audio/AudioDevice_ALSA.cpp b/src/IO/Audio/AudioDevice_ALSA.cpp
index 2d2199c..e1d9cbf 100644
--- a/src/IO/Audio/AudioDevice_ALSA.cpp
+++ b/src/IO/Audio/AudioDevice_ALSA.cpp
@@ -1,6 +1,6 @@
-#include "../../../include/IO/Audio/AudioDevice_ALSA.h"
-#include "../../../include/EHS.h"
-#include "../../../include/Log.h"
+#include "IO/Audio/AudioDevice_ALSA.h"
+#include "EHS.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/IO/Audio/AudioDevice_W32.cpp b/src/IO/Audio/AudioDevice_W32.cpp
index e968f26..df68c5b 100644
--- a/src/IO/Audio/AudioDevice_W32.cpp
+++ b/src/IO/Audio/AudioDevice_W32.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Audio/AudioDevice_W32.h"
-#include "../../../include/Log.h"
+#include "IO/Audio/AudioDevice_W32.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/IO/Audio/BaseAudioDevice.cpp b/src/IO/Audio/BaseAudioDevice.cpp
index d76d1bd..e691e64 100644
--- a/src/IO/Audio/BaseAudioDevice.cpp
+++ b/src/IO/Audio/BaseAudioDevice.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Audio/BaseAudioDevice.h"
+#include "IO/Audio/BaseAudioDevice.h"
 
 namespace lwe
 {
diff --git a/src/IO/BaseFile.cpp b/src/IO/BaseFile.cpp
index 9040475..0ab703e 100644
--- a/src/IO/BaseFile.cpp
+++ b/src/IO/BaseFile.cpp
@@ -1,4 +1,4 @@
-#include "../../include/IO/BaseFile.h"
+#include "IO/BaseFile.h"
 
 namespace lwe
 {
diff --git a/src/IO/BaseFileMonitor.cpp b/src/IO/BaseFileMonitor.cpp
index 2af315e..d4781bf 100644
--- a/src/IO/BaseFileMonitor.cpp
+++ b/src/IO/BaseFileMonitor.cpp
@@ -1,4 +1,4 @@
-#include "../../include/IO/BaseFileMonitor.h"
+#include "IO/BaseFileMonitor.h"
 
 namespace lwe
 {
diff --git a/src/IO/BaseWindow.cpp b/src/IO/BaseWindow.cpp
index 3a63f69..53e7961 100644
--- a/src/IO/BaseWindow.cpp
+++ b/src/IO/BaseWindow.cpp
@@ -1,4 +1,4 @@
-#include "../../include/IO/BaseWindow.h"
+#include "IO/BaseWindow.h"
 
 namespace lwe
 {
diff --git a/src/IO/COM.cpp b/src/IO/COM.cpp
index 932a2e2..b23f604 100644
--- a/src/IO/COM.cpp
+++ b/src/IO/COM.cpp
@@ -1,6 +1,6 @@
-#include "../../include/IO/COM.h"
-#include "../../include/Str.h"
-#include "../../include/Log.h"
+#include "IO/COM.h"
+#include "Str.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/IO/Console.cpp b/src/IO/Console.cpp
index d9c35d2..ef44083 100644
--- a/src/IO/Console.cpp
+++ b/src/IO/Console.cpp
@@ -1,6 +1,6 @@
-#include "../../include/IO/Console.h"
-#include "../../include/Log.h"
-#include "../../include/IO/File.h"
+#include "IO/Console.h"
+#include "Log.h"
+#include "IO/File.h"
 
 #if defined(LWE_OS_LINUX)
     #include <fcntl.h>
diff --git a/src/IO/FileMonitor_UNX.cpp b/src/IO/FileMonitor_UNX.cpp
index 1373c22..a12a1a5 100644
--- a/src/IO/FileMonitor_UNX.cpp
+++ b/src/IO/FileMonitor_UNX.cpp
@@ -1,5 +1,5 @@
-#include "../../include/IO/FileMonitor_UNX.h"
-#include "../../include/Log.h"
+#include "IO/FileMonitor_UNX.h"
+#include "Log.h"
 
 #include <sys/inotify.h>
 #include <cerrno>
diff --git a/src/IO/FileMonitor_W32.cpp b/src/IO/FileMonitor_W32.cpp
index e965117..ff5e8d9 100644
--- a/src/IO/FileMonitor_W32.cpp
+++ b/src/IO/FileMonitor_W32.cpp
@@ -1,6 +1,6 @@
-#include "../../include/IO/FileMonitor_W32.h"
-#include "../../include/Log.h"
-#include "../../include/UTF.h"
+#include "IO/FileMonitor_W32.h"
+#include "Log.h"
+#include "UTF.h"
 
 #include <chrono>
 
diff --git a/src/IO/File_UNX.cpp b/src/IO/File_UNX.cpp
index 7913fda..e9e10bb 100644
--- a/src/IO/File_UNX.cpp
+++ b/src/IO/File_UNX.cpp
@@ -1,4 +1,4 @@
-#include "../../include/IO/File_UNX.h"
+#include "IO/File_UNX.h"
 
 #include <cstring>
 #include <sys/stat.h>
diff --git a/src/IO/File_W32.cpp b/src/IO/File_W32.cpp
index 55cd3bc..6cec8af 100644
--- a/src/IO/File_W32.cpp
+++ b/src/IO/File_W32.cpp
@@ -1,4 +1,4 @@
-#include "../../include/IO/File_W32.h"
+#include "IO/File_W32.h"
 
 namespace lwe
 {
diff --git a/src/IO/FontAtlas.cpp b/src/IO/FontAtlas.cpp
index 0d8564a..21ddd44 100644
--- a/src/IO/FontAtlas.cpp
+++ b/src/IO/FontAtlas.cpp
@@ -1,6 +1,6 @@
-#include "../../include/IO/FontAtlas.h"
-#include "../../include/IO/File.h"
-#include "../../include/Serializer.h"
+#include "IO/FontAtlas.h"
+#include "IO/File.h"
+#include "Serializer.h"
 
 namespace lwe
 {
diff --git a/src/IO/Glyph.cpp b/src/IO/Glyph.cpp
index efcd0d8..5034d78 100644
--- a/src/IO/Glyph.cpp
+++ b/src/IO/Glyph.cpp
@@ -1,4 +1,4 @@
-#include "../../include/IO/Glyph.h"
+#include "IO/Glyph.h"
 
 namespace lwe
 {
diff --git a/src/IO/HID/Button.cpp b/src/IO/HID/Button.cpp
index 90a9fb4..d7c2ad0 100644
--- a/src/IO/HID/Button.cpp
+++ b/src/IO/HID/Button.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/HID/Button.h"
+#include "IO/HID/Button.h"
 
 namespace lwe
 {
diff --git a/src/IO/HID/ButtonState.cpp b/src/IO/HID/ButtonState.cpp
index 9a715c9..b391ae8 100644
--- a/src/IO/HID/ButtonState.cpp
+++ b/src/IO/HID/ButtonState.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/HID/ButtonState.h"
+#include "IO/HID/ButtonState.h"
 
 namespace lwe
 {
diff --git a/src/IO/HID/HID.cpp b/src/IO/HID/HID.cpp
index f77f301..e18a5ae 100644
--- a/src/IO/HID/HID.cpp
+++ b/src/IO/HID/HID.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/HID/HID.h"
+#include "IO/HID/HID.h"
 
 namespace lwe
 {
diff --git a/src/IO/HID/Input.cpp b/src/IO/HID/Input.cpp
index 3f510dd..d780ae1 100644
--- a/src/IO/HID/Input.cpp
+++ b/src/IO/HID/Input.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/HID/Input.h"
+#include "IO/HID/Input.h"
 
 namespace lwe
 {
diff --git a/src/IO/HID/InputHandler.cpp b/src/IO/HID/InputHandler.cpp
index ba14725..ab00470 100644
--- a/src/IO/HID/InputHandler.cpp
+++ b/src/IO/HID/InputHandler.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/HID/InputHandler.h"
+#include "IO/HID/InputHandler.h"
 
 namespace lwe
 {
diff --git a/src/IO/HID/Keyboard.cpp b/src/IO/HID/Keyboard.cpp
index 0268c36..70990fc 100644
--- a/src/IO/HID/Keyboard.cpp
+++ b/src/IO/HID/Keyboard.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/HID/Keyboard.h"
+#include "IO/HID/Keyboard.h"
 
 namespace lwe
 {
diff --git a/src/IO/HID/Mouse.cpp b/src/IO/HID/Mouse.cpp
index f56226d..a1be144 100644
--- a/src/IO/HID/Mouse.cpp
+++ b/src/IO/HID/Mouse.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/HID/Mouse.h"
+#include "IO/HID/Mouse.h"
 
 namespace lwe
 {
diff --git a/src/IO/Img/Img.cpp b/src/IO/Img/Img.cpp
index 356f7ed..79976a4 100644
--- a/src/IO/Img/Img.cpp
+++ b/src/IO/Img/Img.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Img/Img.h"
+#include "IO/Img/Img.h"
 
 namespace lwe
 {
diff --git a/src/IO/Img/ImgCodec.cpp b/src/IO/Img/ImgCodec.cpp
index f01c479..2e4f47a 100644
--- a/src/IO/Img/ImgCodec.cpp
+++ b/src/IO/Img/ImgCodec.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Img/ImgCodec.h"
-#include "../../../include/IO/Img/Img.h"
+#include "IO/Img/ImgCodec.h"
+#include "IO/Img/Img.h"
 
 namespace lwe
 {
diff --git a/src/IO/Img/PNG.cpp b/src/IO/Img/PNG.cpp
index 508c34a..b423814 100644
--- a/src/IO/Img/PNG.cpp
+++ b/src/IO/Img/PNG.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Img/PNG.h"
+#include "IO/Img/PNG.h"
 
 namespace lwe
 {
diff --git a/src/IO/Img/PNG_Chunk.cpp b/src/IO/Img/PNG_Chunk.cpp
index 8e837e1..fa21af2 100644
--- a/src/IO/Img/PNG_Chunk.cpp
+++ b/src/IO/Img/PNG_Chunk.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Img/PNG_Chunk.h"
+#include "IO/Img/PNG_Chunk.h"
 
 namespace lwe
 {
diff --git a/src/IO/Model/AnimBone.cpp b/src/IO/Model/AnimBone.cpp
index fa65fc0..7d583e1 100644
--- a/src/IO/Model/AnimBone.cpp
+++ b/src/IO/Model/AnimBone.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Model/AnimBone.h"
+#include "IO/Model/AnimBone.h"
 
 #include <algorithm>
 
diff --git a/src/IO/Model/Animation.cpp b/src/IO/Model/Animation.cpp
index 4a6dff8..52e23e1 100644
--- a/src/IO/Model/Animation.cpp
+++ b/src/IO/Model/Animation.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Model/Animation.h"
+#include "IO/Model/Animation.h"
 
 namespace lwe
 {
diff --git a/src/IO/Model/Bone.cpp b/src/IO/Model/Bone.cpp
index 03d6b15..9fa6223 100644
--- a/src/IO/Model/Bone.cpp
+++ b/src/IO/Model/Bone.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Model/Bone.h"
+#include "IO/Model/Bone.h"
 
 namespace lwe
 {
diff --git a/src/IO/Model/KeyFrame.cpp b/src/IO/Model/KeyFrame.cpp
index cabbf81..caa9bd8 100644
--- a/src/IO/Model/KeyFrame.cpp
+++ b/src/IO/Model/KeyFrame.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Model/KeyFrame.h"
+#include "IO/Model/KeyFrame.h"
 
 #include <algorithm>
 
diff --git a/src/IO/Model/Mesh.cpp b/src/IO/Model/Mesh.cpp
index 637e5d4..f9732a9 100644
--- a/src/IO/Model/Mesh.cpp
+++ b/src/IO/Model/Mesh.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Model/Mesh.h"
+#include "IO/Model/Mesh.h"
 
 namespace lwe
 {
diff --git a/src/IO/Model/Model.cpp b/src/IO/Model/Model.cpp
index 1becb4d..ce985b3 100644
--- a/src/IO/Model/Model.cpp
+++ b/src/IO/Model/Model.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Model/Model.h"
+#include "IO/Model/Model.h"
 
 namespace lwe
 {
diff --git a/src/IO/Model/PropertyChange.cpp b/src/IO/Model/PropertyChange.cpp
index 4c680ce..988c47e 100644
--- a/src/IO/Model/PropertyChange.cpp
+++ b/src/IO/Model/PropertyChange.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Model/PropertyChange.h"
+#include "IO/Model/PropertyChange.h"
 
 namespace lwe
 {
diff --git a/src/IO/RIFF.cpp b/src/IO/RIFF.cpp
index 8d7a961..2468eeb 100644
--- a/src/IO/RIFF.cpp
+++ b/src/IO/RIFF.cpp
@@ -1,5 +1,5 @@
-#include "../../include/IO/RIFF.h"
-#include "../../include/IO/File.h"
+#include "IO/RIFF.h"
+#include "IO/File.h"
 
 namespace lwe
 {
diff --git a/src/IO/RIFF_Chunk.cpp b/src/IO/RIFF_Chunk.cpp
index ebca806..7d3475b 100644
--- a/src/IO/RIFF_Chunk.cpp
+++ b/src/IO/RIFF_Chunk.cpp
@@ -1,4 +1,4 @@
-#include "../../include/IO/RIFF_Chunk.h"
+#include "IO/RIFF_Chunk.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/BaseTCP.cpp b/src/IO/Socket/BaseTCP.cpp
index f1c31bd..d1c0358 100644
--- a/src/IO/Socket/BaseTCP.cpp
+++ b/src/IO/Socket/BaseTCP.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Socket/BaseTCP.h"
-#include "../../../include/Log.h"
+#include "IO/Socket/BaseTCP.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/BaseUDP.cpp b/src/IO/Socket/BaseUDP.cpp
index 075c375..ee34e7c 100644
--- a/src/IO/Socket/BaseUDP.cpp
+++ b/src/IO/Socket/BaseUDP.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Socket/BaseUDP.h"
+#include "IO/Socket/BaseUDP.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/Comms.cpp b/src/IO/Socket/Comms.cpp
index d82678e..81bf346 100644
--- a/src/IO/Socket/Comms.cpp
+++ b/src/IO/Socket/Comms.cpp
@@ -1,7 +1,7 @@
-#include "../../../include/IO/Socket/Comms.h"
-#include "../../../include/IO/Socket/CommsSystem.h"
-#include "../../../include/IO/Socket/Endpoint.h"
-#include "../../../include/Encryption.h"
+#include "IO/Socket/Comms.h"
+#include "IO/Socket/CommsSystem.h"
+#include "IO/Socket/Endpoint.h"
+#include "Encryption.h"
 
 #if defined(LWE_OS_WINDOWS)
 	#include <WinSock2.h>
diff --git a/src/IO/Socket/CommsSystem.cpp b/src/IO/Socket/CommsSystem.cpp
index 519c9e7..fff1ea1 100644
--- a/src/IO/Socket/CommsSystem.cpp
+++ b/src/IO/Socket/CommsSystem.cpp
@@ -1,7 +1,7 @@
-#include "../../../include/IO/Socket/CommsSystem.h"
-#include "../../../include/IO/Socket/Comms.h"
-#include "../../../include/IO/Socket/Endpoint.h"
-#include "../../../include/IO/Socket/Operation.h"
+#include "IO/Socket/CommsSystem.h"
+#include "IO/Socket/Comms.h"
+#include "IO/Socket/Endpoint.h"
+#include "IO/Socket/Operation.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/DNS.cpp b/src/IO/Socket/DNS.cpp
index 72f2c95..8ae6bdb 100644
--- a/src/IO/Socket/DNS.cpp
+++ b/src/IO/Socket/DNS.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Socket/DNS.h"
-#include "../../../include/Log.h"
+#include "IO/Socket/DNS.h"
+#include "Log.h"
 
 #if defined(LWE_OS_WINDOWS)
     #include <WinSock2.h>
diff --git a/src/IO/Socket/Endpoint.cpp b/src/IO/Socket/Endpoint.cpp
index 62d340a..3eede38 100644
--- a/src/IO/Socket/Endpoint.cpp
+++ b/src/IO/Socket/Endpoint.cpp
@@ -1,7 +1,7 @@
-#include "../../../include/IO/Socket/Endpoint.h"
-#include "../../../include/IO/Socket/Comms.h"
-#include "../../../include/Encryption.h"
-#include "../../../include/System/CPU.h"
+#include "IO/Socket/Endpoint.h"
+#include "IO/Socket/Comms.h"
+#include "Encryption.h"
+#include "System/CPU.h"
 
 #if defined(LWE_OS_WINDOWS)
 	#include <WinSock2.h>
diff --git a/src/IO/Socket/Fragments.cpp b/src/IO/Socket/Fragments.cpp
index 9880d9d..77aa16b 100644
--- a/src/IO/Socket/Fragments.cpp
+++ b/src/IO/Socket/Fragments.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Socket/Fragments.h"
+#include "IO/Socket/Fragments.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/Operation.cpp b/src/IO/Socket/Operation.cpp
index 8ed09b7..bc112ca 100644
--- a/src/IO/Socket/Operation.cpp
+++ b/src/IO/Socket/Operation.cpp
@@ -1,7 +1,7 @@
-#include "../../../include/IO/Socket/Operation.h"
-#include "../../../include/IO/Socket/CommsSystem.h"
-#include "../../../include/IO/Socket/Comms.h"
-#include "../../../include/IO/Socket/Endpoint.h"
+#include "IO/Socket/Operation.h"
+#include "IO/Socket/CommsSystem.h"
+#include "IO/Socket/Comms.h"
+#include "IO/Socket/Endpoint.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/Request.cpp b/src/IO/Socket/Request.cpp
index 572226e..efa5bad 100644
--- a/src/IO/Socket/Request.cpp
+++ b/src/IO/Socket/Request.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Socket/Request.h"
-#include "../../../include/Base64.h"
+#include "IO/Socket/Request.h"
+#include "Base64.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/Response.cpp b/src/IO/Socket/Response.cpp
index 44ec880..f41523d 100644
--- a/src/IO/Socket/Response.cpp
+++ b/src/IO/Socket/Response.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Socket/Response.h"
+#include "IO/Socket/Response.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/RestAPIs/Spotify.cpp b/src/IO/Socket/RestAPIs/Spotify.cpp
index a80df1e..be685ce 100644
--- a/src/IO/Socket/RestAPIs/Spotify.cpp
+++ b/src/IO/Socket/RestAPIs/Spotify.cpp
@@ -1,7 +1,7 @@
-#include "../../../../include/IO/Socket/RestAPIs/Spotify.h"
-#include "../../../../include/IO/Socket/DNS.h"
-#include "../../../../include/System/System.h"
-#include "../../../../include/URI.h"
+#include "IO/Socket/RestAPIs/Spotify.h"
+#include "IO/Socket/DNS.h"
+#include "System/System.h"
+#include "URI.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/RestAPIs/Twitch.cpp b/src/IO/Socket/RestAPIs/Twitch.cpp
index 49b59bc..2e60d22 100644
--- a/src/IO/Socket/RestAPIs/Twitch.cpp
+++ b/src/IO/Socket/RestAPIs/Twitch.cpp
@@ -1,7 +1,7 @@
-#include "../../../../include/IO/Socket/RestAPIs/Twitch.h"
-#include "../../../../include/IO/Socket/DNS.h"
-#include "../../../../include/System/System.h"
-#include "../../../../include/URI.h"
+#include "IO/Socket/RestAPIs/Twitch.h"
+#include "IO/Socket/DNS.h"
+#include "System/System.h"
+#include "URI.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/RestAPIs/TwitchChat.cpp b/src/IO/Socket/RestAPIs/TwitchChat.cpp
index 9e9c9f4..cbe9a43 100644
--- a/src/IO/Socket/RestAPIs/TwitchChat.cpp
+++ b/src/IO/Socket/RestAPIs/TwitchChat.cpp
@@ -1,6 +1,6 @@
-#include "../../../../include/IO/Socket/RestAPIs/TwitchChat.h"
-#include "../../../../include/IO/Socket/DNS.h"
-#include "../../../../include/IO/Console.h"
+#include "IO/Socket/RestAPIs/TwitchChat.h"
+#include "IO/Socket/DNS.h"
+#include "IO/Console.h"
 
 namespace lwe
 {
diff --git a/src/IO/Socket/SSL.cpp b/src/IO/Socket/SSL.cpp
index 368b165..4ea0af9 100644
--- a/src/IO/Socket/SSL.cpp
+++ b/src/IO/Socket/SSL.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/IO/Socket/SSL.h"
+#include "IO/Socket/SSL.h"
 
 #include <openssl/ssl.h>
 #include <openssl/bio.h>
diff --git a/src/IO/Socket/Socket.cpp b/src/IO/Socket/Socket.cpp
index 8e2ae37..30e2585 100644
--- a/src/IO/Socket/Socket.cpp
+++ b/src/IO/Socket/Socket.cpp
@@ -1,7 +1,7 @@
-#include "../../../include/IO/Socket/Socket.h"
-#include "../../../include/IO/Socket/Endpoint.h"
-#include "../../../include/System/System.h"
-#include "../../../include/Encryption.h"
+#include "IO/Socket/Socket.h"
+#include "IO/Socket/Endpoint.h"
+#include "System/System.h"
+#include "Encryption.h"
 
 #if defined(LWE_OS_WINDOWS)
 	#include <WinSock2.h>
diff --git a/src/IO/Socket/TCP_BSD.cpp b/src/IO/Socket/TCP_BSD.cpp
index d100045..458e5d9 100644
--- a/src/IO/Socket/TCP_BSD.cpp
+++ b/src/IO/Socket/TCP_BSD.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Socket/TCP_BSD.h"
-#include "../../../include/IO/Socket/DNS.h"
+#include "IO/Socket/TCP_BSD.h"
+#include "IO/Socket/DNS.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/IO/Socket/TCP_W32.cpp b/src/IO/Socket/TCP_W32.cpp
index b627230..70b23f1 100644
--- a/src/IO/Socket/TCP_W32.cpp
+++ b/src/IO/Socket/TCP_W32.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Socket/TCP_W32.h"
-#include "../../../include/IO/Socket/DNS.h"
+#include "IO/Socket/TCP_W32.h"
+#include "IO/Socket/DNS.h"
 
 #include <WinSock2.h>
 #include <WS2tcpip.h>
diff --git a/src/IO/Socket/UDP_BSD.cpp b/src/IO/Socket/UDP_BSD.cpp
index 982002b..4d7189a 100644
--- a/src/IO/Socket/UDP_BSD.cpp
+++ b/src/IO/Socket/UDP_BSD.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Socket/UDP_BSD.h"
-#include "../../../include/Log.h"
+#include "IO/Socket/UDP_BSD.h"
+#include "Log.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/IO/Socket/UDP_W32.cpp b/src/IO/Socket/UDP_W32.cpp
index b8e6187..ff42307 100644
--- a/src/IO/Socket/UDP_W32.cpp
+++ b/src/IO/Socket/UDP_W32.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/IO/Socket/UDP_W32.h"
-#include "../../../include/Log.h"
+#include "IO/Socket/UDP_W32.h"
+#include "Log.h"
 
 #include <WinSock2.h>
 #include <WS2tcpip.h>
diff --git a/src/IO/Window_W32.cpp b/src/IO/Window_W32.cpp
index c57f454..172662c 100644
--- a/src/IO/Window_W32.cpp
+++ b/src/IO/Window_W32.cpp
@@ -1,7 +1,7 @@
-#include "../../include/IO/Window_W32.h"
-#include "../../include/IO/HID/Keyboard.h"
-#include "../../include/IO/HID/Mouse.h"
-#include "../../include/System/Thread.h"
+#include "IO/Window_W32.h"
+#include "IO/HID/Keyboard.h"
+#include "IO/HID/Mouse.h"
+#include "System/Thread.h"
 
 #include <hidusage.h>
 
diff --git a/src/IO/Window_Way.cpp b/src/IO/Window_Way.cpp
index c4366c7..f390bac 100644
--- a/src/IO/Window_Way.cpp
+++ b/src/IO/Window_Way.cpp
@@ -1,4 +1,4 @@
-#include "../../include/IO/Window_Way.h"
+#include "IO/Window_Way.h"
 
 namespace lwe
 {
diff --git a/src/IO/Window_XCB.cpp b/src/IO/Window_XCB.cpp
index 89ca268..5fe8625 100644
--- a/src/IO/Window_XCB.cpp
+++ b/src/IO/Window_XCB.cpp
@@ -1,8 +1,8 @@
-#include "../../include/IO/Window_XCB.h"
-#include "../../include/UTF.h"
-#include "../../include/IO/HID/Keyboard.h"
-#include "../../include/IO/HID/Mouse.h"
-#include "../../include/IO/Console.h"
+#include "IO/Window_XCB.h"
+#include "UTF.h"
+#include "IO/HID/Keyboard.h"
+#include "IO/HID/Mouse.h"
+#include "IO/Console.h"
 
 #include <cstdlib>
 #include <xcb/xfixes.h>
diff --git a/src/Json/Json.cpp b/src/Json/Json.cpp
index 356ee6d..410bccc 100644
--- a/src/Json/Json.cpp
+++ b/src/Json/Json.cpp
@@ -1,5 +1,5 @@
-#include "../../include/Json/Json.h"
-#include "../../include/Log.h"
+#include "Json/Json.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/Json/JsonArray.cpp b/src/Json/JsonArray.cpp
index 0084b12..1cfe56f 100644
--- a/src/Json/JsonArray.cpp
+++ b/src/Json/JsonArray.cpp
@@ -1,8 +1,8 @@
-#include "../../include/Json/JsonArray.h"
-#include "../../include/Json/JsonObj.h"
-#include "../../include/Json/JsonBool.h"
-#include "../../include/Json/JsonNum.h"
-#include "../../include/Json/JsonStr.h"
+#include "Json/JsonArray.h"
+#include "Json/JsonObj.h"
+#include "Json/JsonBool.h"
+#include "Json/JsonNum.h"
+#include "Json/JsonStr.h"
 
 namespace lwe
 {
diff --git a/src/Json/JsonBase.cpp b/src/Json/JsonBase.cpp
index 49162b0..c2bc1dd 100644
--- a/src/Json/JsonBase.cpp
+++ b/src/Json/JsonBase.cpp
@@ -1,4 +1,4 @@
-#include "../../include/Json/JsonBase.h"
+#include "Json/JsonBase.h"
 
 namespace lwe
 {
diff --git a/src/Json/JsonBool.cpp b/src/Json/JsonBool.cpp
index ec48b3e..59ae2f2 100644
--- a/src/Json/JsonBool.cpp
+++ b/src/Json/JsonBool.cpp
@@ -1,4 +1,4 @@
-#include "../../include/Json/JsonBool.h"
+#include "Json/JsonBool.h"
 
 namespace lwe
 {
diff --git a/src/Json/JsonNum.cpp b/src/Json/JsonNum.cpp
index 60d556c..3fe2e70 100644
--- a/src/Json/JsonNum.cpp
+++ b/src/Json/JsonNum.cpp
@@ -1,4 +1,4 @@
-#include "../../include/Json/JsonNum.h"
+#include "Json/JsonNum.h"
 
 namespace lwe
 {
diff --git a/src/Json/JsonObj.cpp b/src/Json/JsonObj.cpp
index 97cef6c..97bf69e 100644
--- a/src/Json/JsonObj.cpp
+++ b/src/Json/JsonObj.cpp
@@ -1,5 +1,5 @@
-#include "../../include/Json/JsonObj.h"
-#include "../../include/Json/JsonVar.h"
+#include "Json/JsonObj.h"
+#include "Json/JsonVar.h"
 
 namespace lwe
 {
diff --git a/src/Json/JsonStr.cpp b/src/Json/JsonStr.cpp
index 3afb8ea..1bae390 100644
--- a/src/Json/JsonStr.cpp
+++ b/src/Json/JsonStr.cpp
@@ -1,4 +1,4 @@
-#include "../../include/Json/JsonStr.h"
+#include "Json/JsonStr.h"
 
 namespace lwe
 {
diff --git a/src/Json/JsonVar.cpp b/src/Json/JsonVar.cpp
index 6d430ad..e8e8554 100644
--- a/src/Json/JsonVar.cpp
+++ b/src/Json/JsonVar.cpp
@@ -1,10 +1,10 @@
-#include "../../include/Json/JsonVar.h"
-#include "../../include/Json/JsonBase.h"
-#include "../../include/Json/JsonObj.h"
-#include "../../include/Json/JsonArray.h"
-#include "../../include/Json/JsonBool.h"
-#include "../../include/Json/JsonNum.h"
-#include "../../include/Json/JsonStr.h"
+#include "Json/JsonVar.h"
+#include "Json/JsonBase.h"
+#include "Json/JsonObj.h"
+#include "Json/JsonArray.h"
+#include "Json/JsonBool.h"
+#include "Json/JsonNum.h"
+#include "Json/JsonStr.h"
 
 namespace lwe
 {
diff --git a/src/Log.cpp b/src/Log.cpp
index 41bd191..4b0432f 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -1,4 +1,4 @@
-#include "../include/Log.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/Math.cpp b/src/Math.cpp
index 35cad53..671ce15 100644
--- a/src/Math.cpp
+++ b/src/Math.cpp
@@ -1,5 +1,5 @@
-#include "../include/Math.h"
-#include "../include/System/Architecture.h"
+#include "Math.h"
+#include "System/Architecture.h"
 
 namespace lwe
 {
diff --git a/src/PtrData.cpp b/src/PtrData.cpp
index 298a6fc..acc624d 100644
--- a/src/PtrData.cpp
+++ b/src/PtrData.cpp
@@ -1,4 +1,4 @@
-#include "../include/PtrData.h"
+#include "PtrData.h"
 
 namespace lwe
 {
diff --git a/src/Range.cpp b/src/Range.cpp
index eccfb48..1bae7a6 100644
--- a/src/Range.cpp
+++ b/src/Range.cpp
@@ -2,4 +2,4 @@
 // Created by Nelso on 3/29/2022.
 //
 
-#include "../include/Range.h"
+#include "Range.h"
diff --git a/src/StrToHash.cpp b/src/StrToHash.cpp
index 71c0cb8..63a07fb 100644
--- a/src/StrToHash.cpp
+++ b/src/StrToHash.cpp
@@ -1,6 +1,6 @@
-#include "../include/EHS.h"
-#include "../include/Str.h"
-#include "../include/IO/Console.h"
+#include "EHS.h"
+#include "Str.h"
+#include "IO/Console.h"
 
 lwe::Int_32 Main(lwe::Str_8* appName, lwe::Str_8* appVerId, lwe::Version* appVer)
 {
diff --git a/src/System/BaseMutex.cpp b/src/System/BaseMutex.cpp
index bbc29a2..a4d7d57 100644
--- a/src/System/BaseMutex.cpp
+++ b/src/System/BaseMutex.cpp
@@ -1,4 +1,4 @@
-#include "../../include/System/BaseMutex.h"
+#include "System/BaseMutex.h"
 
 namespace lwe
 {
diff --git a/src/System/BaseOpen.cpp b/src/System/BaseOpen.cpp
index 101671b..bf9020b 100644
--- a/src/System/BaseOpen.cpp
+++ b/src/System/BaseOpen.cpp
@@ -1,4 +1,4 @@
-#include "../../include/System/BaseOpen.h"
+#include "System/BaseOpen.h"
 
 namespace lwe
 {
diff --git a/src/System/BaseSemaphore.cpp b/src/System/BaseSemaphore.cpp
index 7cd4b6f..d2b9890 100644
--- a/src/System/BaseSemaphore.cpp
+++ b/src/System/BaseSemaphore.cpp
@@ -1,4 +1,4 @@
-#include "../../include/System/BaseSemaphore.h"
+#include "System/BaseSemaphore.h"
 
 namespace lwe
 {
diff --git a/src/System/BaseSystem.cpp b/src/System/BaseSystem.cpp
index 1edb8b9..2dd30fc 100644
--- a/src/System/BaseSystem.cpp
+++ b/src/System/BaseSystem.cpp
@@ -1,4 +1,4 @@
-#include "../../include/System/BaseSystem.h"
+#include "System/BaseSystem.h"
 
 namespace lwe
 {
diff --git a/src/System/CPU.cpp b/src/System/CPU.cpp
index 7566769..ec07761 100644
--- a/src/System/CPU.cpp
+++ b/src/System/CPU.cpp
@@ -1,8 +1,8 @@
-#include "../../include/System/CPU.h"
-#include "../../include/Log.h"
-#include "../../include/IO/File.h"
-#include "../../include/Json/Json.h"
-#include "../../include/System/Thread.h"
+#include "System/CPU.h"
+#include "Log.h"
+#include "IO/File.h"
+#include "Json/Json.h"
+#include "System/Thread.h"
 
 namespace lwe
 {
diff --git a/src/System/CPU_ARM64.cpp b/src/System/CPU_ARM64.cpp
index 232b6b1..c6b11dc 100644
--- a/src/System/CPU_ARM64.cpp
+++ b/src/System/CPU_ARM64.cpp
@@ -1,4 +1,4 @@
-#include "../../include/System/CPU.h"
+#include "System/CPU.h"
 
 namespace lwe
 {
diff --git a/src/System/FileSystem.cpp b/src/System/FileSystem.cpp
index 6171099..27acf71 100644
--- a/src/System/FileSystem.cpp
+++ b/src/System/FileSystem.cpp
@@ -1,5 +1,5 @@
-#include "../../include/System/FileSystem.h"
-#include "../../include/Log.h"
+#include "System/FileSystem.h"
+#include "Log.h"
 
 #include <unistd.h>
 #include <cstring>
diff --git a/src/System/Mutex_PT.cpp b/src/System/Mutex_PT.cpp
index d657671..19e5eb9 100644
--- a/src/System/Mutex_PT.cpp
+++ b/src/System/Mutex_PT.cpp
@@ -1,4 +1,4 @@
-#include "../../include/System/Mutex_PT.h"
+#include "System/Mutex_PT.h"
 
 namespace lwe
 {
diff --git a/src/System/Mutex_W32.cpp b/src/System/Mutex_W32.cpp
index 50a6708..c5164ab 100644
--- a/src/System/Mutex_W32.cpp
+++ b/src/System/Mutex_W32.cpp
@@ -1,6 +1,6 @@
-#include "../../include/System/Mutex_W32.h"
-#include "../../include/Str.h"
-#include "../../include/Log.h"
+#include "System/Mutex_W32.h"
+#include "Str.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/System/Open_UNX.cpp b/src/System/Open_UNX.cpp
index 079e43c..e9bd2ae 100644
--- a/src/System/Open_UNX.cpp
+++ b/src/System/Open_UNX.cpp
@@ -1,5 +1,5 @@
-#include "../../include/System/Open_UNX.h"
-#include "../../include/Log.h"
+#include "System/Open_UNX.h"
+#include "Log.h"
 
 #include <dlfcn.h>
 
diff --git a/src/System/Open_W32.cpp b/src/System/Open_W32.cpp
index ba51686..b8e8b6b 100644
--- a/src/System/Open_W32.cpp
+++ b/src/System/Open_W32.cpp
@@ -1,4 +1,4 @@
-#include "../../include/System/Open_W32.h"
+#include "System/Open_W32.h"
 
 namespace lwe
 {
diff --git a/src/System/Semaphore_P.cpp b/src/System/Semaphore_P.cpp
index 2b89969..a3f7a97 100644
--- a/src/System/Semaphore_P.cpp
+++ b/src/System/Semaphore_P.cpp
@@ -1,5 +1,5 @@
-#include "../../include/System/Semaphore_P.h"
-#include "../../include/Log.h"
+#include "System/Semaphore_P.h"
+#include "Log.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/System/Semaphore_W32.cpp b/src/System/Semaphore_W32.cpp
index be5c394..7b5e350 100644
--- a/src/System/Semaphore_W32.cpp
+++ b/src/System/Semaphore_W32.cpp
@@ -1,6 +1,6 @@
-#include "../../include/System/Semaphore_W32.h"
-#include "../../include/UTF.h"
-#include "../../include/Log.h"
+#include "System/Semaphore_W32.h"
+#include "UTF.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/System/System_LNX.cpp b/src/System/System_LNX.cpp
index 5cab135..bc8b58f 100644
--- a/src/System/System_LNX.cpp
+++ b/src/System/System_LNX.cpp
@@ -1,6 +1,6 @@
-#include "../../include/System/System_LNX.h"
-#include "../../include/System/Thread.h"
-#include "../../include/Log.h"
+#include "System/System_LNX.h"
+#include "System/Thread.h"
+#include "Log.h"
 
 namespace lwe
 {
diff --git a/src/System/System_W32.cpp b/src/System/System_W32.cpp
index 90ee4d7..dac9015 100644
--- a/src/System/System_W32.cpp
+++ b/src/System/System_W32.cpp
@@ -1,4 +1,4 @@
-#include "../../include/System/System_W32.h"
+#include "System/System_W32.h"
 
 #include <shellapi.h>
 
diff --git a/src/System/Thread.cpp b/src/System/Thread.cpp
index 089c04b..e2d6865 100644
--- a/src/System/Thread.cpp
+++ b/src/System/Thread.cpp
@@ -1,5 +1,5 @@
-#include "../../include/System/Thread.h"
-#include "../../include/System/CPU.h"
+#include "System/Thread.h"
+#include "System/CPU.h"
 
 #if defined(LWE_OS_WINDOWS)
 	#include <avrt.h>
diff --git a/src/System/User.cpp b/src/System/User.cpp
index 5762404..c462f91 100644
--- a/src/System/User.cpp
+++ b/src/System/User.cpp
@@ -1,5 +1,5 @@
-#include "../../include/System/User.h"
-#include "../../include/Log.h"
+#include "System/User.h"
+#include "Log.h"
 
 #include <unistd.h>
 #include <cstring>
diff --git a/src/Task.cpp b/src/Task.cpp
index d3898d0..0e0f028 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1,4 +1,4 @@
-#include "../include/Task.h"
+#include "Task.h"
 
 namespace lwe
 {
diff --git a/src/Type.cpp b/src/Type.cpp
index 2b08641..3998ad7 100644
--- a/src/Type.cpp
+++ b/src/Type.cpp
@@ -1,4 +1,4 @@
-#include "../include/Type.h"
+#include "Type.h"
 
 namespace lwe
 {
diff --git a/src/URI.cpp b/src/URI.cpp
index 097a468..03c0968 100644
--- a/src/URI.cpp
+++ b/src/URI.cpp
@@ -1,4 +1,4 @@
-#include "../include/URI.h"
+#include "URI.h"
 
 namespace lwe
 {
diff --git a/src/Util.cpp b/src/Util.cpp
index 6afaee5..a3be584 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -1,4 +1,4 @@
-#include "../include/Util.h"
+#include "Util.h"
 
 namespace lwe
 {
diff --git a/src/Version.cpp b/src/Version.cpp
index fe9f043..ab60304 100644
--- a/src/Version.cpp
+++ b/src/Version.cpp
@@ -1,4 +1,4 @@
-#include "../include/Version.h"
+#include "Version.h"
 
 namespace lwe
 {