diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0deacc2..b7e37c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,8 +73,8 @@ add_library(Lina::VG ALIAS ${PROJECT_NAME})
 target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include)
 target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_MAJOR=1)
 target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_MINOR=6)
-target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_PATCH=0)
-
+target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_PATCH=1)
+1
 #--------------------------------------------------------------------
 # Subdirectories & linking
 #--------------------------------------------------------------------
diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
index ba94787..f04682d 100644
--- a/Example/CMakeLists.txt
+++ b/Example/CMakeLists.txt
@@ -58,16 +58,17 @@ PUBLIC Lina::VG
 
 include(Dependencies/Dependencies.cmake)
 
+set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}/$<CONFIGURATION>/")
+
 add_custom_command(
 TARGET ${PROJECT_NAME}
 POST_BUILD
-COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/_Resources" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
-message(${CMAKE_BINARY_DIR}/${PROJECT_NAME}/)
+COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../_Resources/" "${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}/$<CONFIGURATION>/")
 
 add_custom_command(
 TARGET ${PROJECT_NAME}
 POST_BUILD
-COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/_Resources" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>/")
+COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../_Resources" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>/")
 
 #--------------------------------------------------------------------
 # Folder structuring in visual studio
diff --git a/Example/include/Backends/GL/GLBackend.hpp b/Example/include/Backends/GL/GLBackend.hpp
index 1d841f3..7cbd859 100644
--- a/Example/include/Backends/GL/GLBackend.hpp
+++ b/Example/include/Backends/GL/GLBackend.hpp
@@ -39,7 +39,7 @@ Timestamp: 3/24/2022 11:33:52 PM
 #define LinaVGGLBackend_HPP
 
 // Headers here.
-#include <LinaVG.hpp>
+#include "LinaVG/LinaVG.hpp"
 
 namespace LinaVG::Backend
 {
diff --git a/Example/include/DemoScreens.hpp b/Example/include/DemoScreens.hpp
index 3f50b25..0653660 100644
--- a/Example/include/DemoScreens.hpp
+++ b/Example/include/DemoScreens.hpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #ifndef DEMOS_HPP
 #define DEMOS_HPP
 
-#include "Core/Common.hpp"
+#include "LinaVG/Core/Common.hpp"
 #include <vector>
 
 namespace LinaVG
diff --git a/Example/src/Backends/GL/GLBackend.cpp b/Example/src/Backends/GL/GLBackend.cpp
index 12e9841..bae4bd8 100644
--- a/Example/src/Backends/GL/GLBackend.cpp
+++ b/Example/src/Backends/GL/GLBackend.cpp
@@ -28,9 +28,9 @@ SOFTWARE.
 
 #include "glad/glad.h"
 #include "Backends/GL/GLBackend.hpp"
-#include "Core/Renderer.hpp"
-#include "Core/Drawer.hpp"
-#include "Core/Math.hpp"
+#include "LinaVG/Core/Renderer.hpp"
+#include "LinaVG/Core/Drawer.hpp"
+#include "LinaVG/Core/Math.hpp"
 #include <iostream>
 #include <stdio.h>
 
diff --git a/Example/src/DemoScreens.cpp b/Example/src/DemoScreens.cpp
index 5822283..b1679bf 100644
--- a/Example/src/DemoScreens.cpp
+++ b/Example/src/DemoScreens.cpp
@@ -28,9 +28,9 @@ SOFTWARE.
 
 #include "DemoScreens.hpp"
 #include "Main.hpp"
-#include "LinaVG.hpp"
-#include "Core/Math.hpp"
-#include "Utility/Utility.hpp"
+#include "LinaVG/LinaVG.hpp"
+#include "LinaVG/Core/Math.hpp"
+#include "LinaVG/Utility/Utility.hpp"
 #include "Backends/GL/GLBackend.hpp"
 #include <string>
 #include <iostream>
diff --git a/Example/src/Main.cpp b/Example/src/Main.cpp
index a524102..6efa3e6 100644
--- a/Example/src/Main.cpp
+++ b/Example/src/Main.cpp
@@ -27,7 +27,7 @@ SOFTWARE.
 */
 
 #include "Main.hpp"
-#include "LinaVG.hpp"
+#include "LinaVG/LinaVG.hpp"
 #include <iostream>
 #include <chrono>
 #include "Backends/GLFWWindow.hpp"
diff --git a/include/LinaVG/Core/Common.hpp b/include/LinaVG/Core/Common.hpp
index 4b57c09..300b910 100644
--- a/include/LinaVG/Core/Common.hpp
+++ b/include/LinaVG/Core/Common.hpp
@@ -26,7 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-
 #pragma once
 
 #ifndef LinaVGCommon_HPP
@@ -51,8 +50,8 @@ namespace LinaVG
 #define LVG_DEG2RAD    0.0174533f
 #define LINAVG_API     // TODO
 
-    typedef unsigned int Index;
-    typedef unsigned int BackendHandle;
+    typedef unsigned short Index;
+    typedef unsigned int   BackendHandle;
     class LinaVGFont;
 
     /// <summary>