diff --git a/include/gryphn/gryphn.h b/include/gryphn/gryphn.h
index 9dc4b59..c6a4b6c 100644
--- a/include/gryphn/gryphn.h
+++ b/include/gryphn/gryphn.h
@@ -1,25 +1,25 @@
 #pragma once
 #define GRYPHN_INCLUDE
-#include <core/instance/init/gryphn_init.h>
-#include <core/instance/gryphn_instance.h>
-#include <core/debugger/gryphn_debugger.h>
-#include <core/output_device/gryphn_physical_output_device.h>
-#include <core/window_surface/gryphn_surface.h>
-#include <core/presentation_queue/gryphn_presentation_queue.h>
-#include <core/shader_module/gryphn_shader_module.h>
-#include <core/pipelines/graphics_pipeline/gryphn_graphics_pipeline.h>
-#include <core/renderpass/gryphn_render_pass_descriptor.h>
-#include <core/framebuffer/gryphn_framebuffer.h>
-#include <core/textures/gryphn_texture.h>
-#include <core/command/command_pool/gryphn_command_pool.h>
-#include <core/command/command_buffer/gryphn_command_buffer.h>
-#include <core/command/commands/gryphn_command.h>
-#include <core/renderpass/gryphn_render_pass.h>
-#include <core/sync/semaphore/gryphn_semaphore.h>
-#include <core/sync/fence/gryphn_fence.h>
-#include <core/submit/gryphn_submit.h>
-#include <core/present/gryphn_present.h>
-#include <core/shader_input/gryphn_shader_layout.h>
-#include <core/buffers/gryphn_buffer.h>
-#include <core/uniforms/gryphn_uniform_pool.h>
-#include <core/uniforms/gryphn_uniform.h>
+#include <core/src/instance/init/gryphn_init.h>
+#include <core/src/instance/gryphn_instance.h>
+#include <core/src/debugger/gryphn_debugger.h>
+#include <core/src/output_device/gryphn_physical_output_device.h>
+#include <core/src/window_surface/gryphn_surface.h>
+#include <core/src/presentation_queue/gryphn_presentation_queue.h>
+#include <core/src/shader_module/gryphn_shader_module.h>
+#include <core/src/pipelines/graphics_pipeline/gryphn_graphics_pipeline.h>
+#include <core/src/renderpass/gryphn_render_pass_descriptor.h>
+#include <core/src/framebuffer/gryphn_framebuffer.h>
+#include <core/src/textures/gryphn_texture.h>
+#include <core/src/command/command_pool/gryphn_command_pool.h>
+#include <core/src/command/command_buffer/gryphn_command_buffer.h>
+#include <core/src/command/commands/gryphn_command.h>
+#include <core/src/renderpass/gryphn_render_pass.h>
+#include <core/src/sync/semaphore/gryphn_semaphore.h>
+#include <core/src/sync/fence/gryphn_fence.h>
+#include <core/src/submit/gryphn_submit.h>
+#include <core/src/present/gryphn_present.h>
+#include <core/src/shader_input/gryphn_shader_layout.h>
+#include <core/src/buffers/gryphn_buffer.h>
+#include <core/src/uniforms/gryphn_uniform_pool.h>
+#include <core/src/uniforms/gryphn_uniform.h>
diff --git a/projects/apis/vulkan/CMakeLists.txt b/projects/apis/vulkan/CMakeLists.txt
index 5e9d2aa..b16847d 100644
--- a/projects/apis/vulkan/CMakeLists.txt
+++ b/projects/apis/vulkan/CMakeLists.txt
@@ -1,28 +1,24 @@
 set(CMAKE_EXPORT_COMPILE_COMMANDS on)
-set(CMAKE_CXX_STANDARD 17)
 project(GryphnVulkanImpl)
+add_compile_definitions(GN_REVEAL_IMPL)
 
-file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS
-    "src/*.c" "src/*.h"
-)
-
+file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS "src/*.c" "src/*.h")
 if (APPLE)
-    file(GLOB_RECURSE METAL_FILES CONFIGURE_DEPENDS
-    "src/*.m"
-    )
+    file(GLOB_RECURSE METAL_FILES CONFIGURE_DEPENDS "src/*.m")
 endif()
 
 find_package(Vulkan REQUIRED)
 add_library(GryphnVulkanImpl STATIC ${SOURCE_FILES} ${METAL_FILES})
+target_link_libraries(GryphnVulkanImpl ${Vulkan_LIBRARY})
+
 target_include_directories(GryphnVulkanImpl PUBLIC
     ${Vulkan_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../core/src/
     ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/
-    src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/
 )
-add_compile_definitions(GN_REVEAL_IMPL)
-target_link_libraries(GryphnVulkanImpl ${Vulkan_LIBRARY})
 
 if(WIN32)
     add_compile_definitions(GN_PLATFORM_WIN32)
diff --git a/projects/apis/vulkan/src/buffers/vulkan_buffer.c b/projects/apis/vulkan/src/buffers/vulkan_buffer.c
index 2bdc67a..7286d89 100644
--- a/projects/apis/vulkan/src/buffers/vulkan_buffer.c
+++ b/projects/apis/vulkan/src/buffers/vulkan_buffer.c
@@ -1,6 +1,6 @@
 #include "vulkan_buffer.h"
-#include "core/buffers/gryphn_buffer.h"
-#include "core/output_device/gryphn_output_device.h"
+#include "buffers/gryphn_buffer.h"
+#include "output_device/gryphn_output_device.h"
 #include "output_device/vulkan_output_devices.h"
 #include "output_device/vulkan_physical_device.h"
 #include "commands/command_buffer/vulkan_command_buffer.h"
diff --git a/projects/apis/vulkan/src/buffers/vulkan_buffer.h b/projects/apis/vulkan/src/buffers/vulkan_buffer.h
index 621ae20..f952d7a 100644
--- a/projects/apis/vulkan/src/buffers/vulkan_buffer.h
+++ b/projects/apis/vulkan/src/buffers/vulkan_buffer.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vulkan/vulkan.h>
 #include "utils/gryphn_bool.h"
-#include <core/buffers/gryphn_buffer.h>
+#include <buffers/gryphn_buffer.h>
 
 typedef struct VkGryphnBuffer {
     VkBuffer buffer;
diff --git a/projects/apis/vulkan/src/commands/command_buffer/vulkan_command_buffer.h b/projects/apis/vulkan/src/commands/command_buffer/vulkan_command_buffer.h
index dfade1c..b62ee9c 100644
--- a/projects/apis/vulkan/src/commands/command_buffer/vulkan_command_buffer.h
+++ b/projects/apis/vulkan/src/commands/command_buffer/vulkan_command_buffer.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "core/command/command_buffer/gryphn_command_buffer.h"
+#include "command/command_buffer/gryphn_command_buffer.h"
 #include "utils/gryphn_bool.h"
 #include <vulkan/vulkan.h>
 
diff --git a/projects/apis/vulkan/src/commands/command_pool/vulkan_command_pool.h b/projects/apis/vulkan/src/commands/command_pool/vulkan_command_pool.h
index dbe40a2..8fcc2d7 100644
--- a/projects/apis/vulkan/src/commands/command_pool/vulkan_command_pool.h
+++ b/projects/apis/vulkan/src/commands/command_pool/vulkan_command_pool.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include "core/command/command_pool/gryphn_command_pool.h"
+#include "command/command_pool/gryphn_command_pool.h"
 
 typedef struct gnPlatformCommandPool_t {
     VkCommandPool commandPool;
diff --git a/projects/apis/vulkan/src/commands/commands/vulkan_commands.c b/projects/apis/vulkan/src/commands/commands/vulkan_commands.c
index 88d786b..af316ab 100644
--- a/projects/apis/vulkan/src/commands/commands/vulkan_commands.c
+++ b/projects/apis/vulkan/src/commands/commands/vulkan_commands.c
@@ -1,5 +1,5 @@
 #include <vulkan/vulkan.h>
-#include "core/command/commands/gryphn_command.h"
+#include "command/commands/gryphn_command.h"
 #include <renderpass/vulkan_render_pass_descriptor.h>
 #include "framebuffers/vulkan_framebuffer.h"
 #include "commands/command_buffer/vulkan_command_buffer.h"
diff --git a/projects/apis/vulkan/src/debugger/vulkan_debugger.h b/projects/apis/vulkan/src/debugger/vulkan_debugger.h
index 4045a56..c0ae473 100644
--- a/projects/apis/vulkan/src/debugger/vulkan_debugger.h
+++ b/projects/apis/vulkan/src/debugger/vulkan_debugger.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include <core/debugger/gryphn_debugger.h>
+#include <debugger/gryphn_debugger.h>
 
 typedef struct gnPlatformDebugger_t {
     VkDebugUtilsMessengerEXT debugMessenger;
diff --git a/projects/apis/vulkan/src/framebuffers/vulkan_framebuffer.h b/projects/apis/vulkan/src/framebuffers/vulkan_framebuffer.h
index 70a5d28..672c045 100644
--- a/projects/apis/vulkan/src/framebuffers/vulkan_framebuffer.h
+++ b/projects/apis/vulkan/src/framebuffers/vulkan_framebuffer.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "core/framebuffer/gryphn_framebuffer.h"
+#include "framebuffer/gryphn_framebuffer.h"
 #include <vulkan/vulkan.h>
 
 typedef struct gnPlatformFramebuffer_t {
diff --git a/projects/apis/vulkan/src/instance/vulkan_instance.h b/projects/apis/vulkan/src/instance/vulkan_instance.h
index 4ea9573..af38743 100644
--- a/projects/apis/vulkan/src/instance/vulkan_instance.h
+++ b/projects/apis/vulkan/src/instance/vulkan_instance.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include "core/debugger/gryphn_debugger.h"
-#include "core/instance/gryphn_instance.h"
+#include "debugger/gryphn_debugger.h"
+#include "instance/gryphn_instance.h"
 
 struct gnInstanceMessage {
     gnMessageSeverity severity;
diff --git a/projects/apis/vulkan/src/output_device/vulkan_output_device.c b/projects/apis/vulkan/src/output_device/vulkan_output_device.c
index d07285e..ebe498b 100644
--- a/projects/apis/vulkan/src/output_device/vulkan_output_device.c
+++ b/projects/apis/vulkan/src/output_device/vulkan_output_device.c
@@ -2,7 +2,7 @@
 #include <output_device/vulkan_physical_device.h>
 #include <output_device/vulkan_output_devices.h>
 #include "vulkan_device_extensions.h"
-#include "core/instance/gryphn_instance.h"
+#include "instance/gryphn_instance.h"
 #include "commands/command_buffer/vulkan_command_buffer.h"
 
 gnReturnCode gnCreateOutputDeviceFn(gnOutputDeviceHandle outputDevice, gnInstanceHandle instance, gnOutputDeviceInfo deviceInfo) {
diff --git a/projects/apis/vulkan/src/output_device/vulkan_output_devices.h b/projects/apis/vulkan/src/output_device/vulkan_output_devices.h
index 60ed033..4c201c3 100644
--- a/projects/apis/vulkan/src/output_device/vulkan_output_devices.h
+++ b/projects/apis/vulkan/src/output_device/vulkan_output_devices.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include <core/output_device/gryphn_output_device.h>
+#include <output_device/gryphn_output_device.h>
 
 typedef struct gnPlatformOutputDevice_t {
     VkDevice device;
diff --git a/projects/apis/vulkan/src/output_device/vulkan_physical_device.h b/projects/apis/vulkan/src/output_device/vulkan_physical_device.h
index eb67bad..ade3fdf 100644
--- a/projects/apis/vulkan/src/output_device/vulkan_physical_device.h
+++ b/projects/apis/vulkan/src/output_device/vulkan_physical_device.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include <core/output_device/gryphn_physical_output_device.h>
+#include <output_device/gryphn_physical_output_device.h>
 
 typedef struct gnPlatformPhysicalDevice_t {
     VkPhysicalDevice device;
diff --git a/projects/apis/vulkan/src/pipelines/graphics_pipeline/vulkan_graphics_pipeline.h b/projects/apis/vulkan/src/pipelines/graphics_pipeline/vulkan_graphics_pipeline.h
index 05b3d05..57d7288 100644
--- a/projects/apis/vulkan/src/pipelines/graphics_pipeline/vulkan_graphics_pipeline.h
+++ b/projects/apis/vulkan/src/pipelines/graphics_pipeline/vulkan_graphics_pipeline.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <core/pipelines/graphics_pipeline/gryphn_graphics_pipeline.h>
+#include <pipelines/graphics_pipeline/gryphn_graphics_pipeline.h>
 #include <vulkan/vulkan.h>
 
 typedef struct gnPlatformGraphicsPipeline_t {
diff --git a/projects/apis/vulkan/src/present/vulkan_present.c b/projects/apis/vulkan/src/present/vulkan_present.c
index cbf042b..551ba4f 100644
--- a/projects/apis/vulkan/src/present/vulkan_present.c
+++ b/projects/apis/vulkan/src/present/vulkan_present.c
@@ -1,4 +1,4 @@
-#include "core/present/gryphn_present.h"
+#include "present/gryphn_present.h"
 #include "sync/semaphore/vulkan_semaphore.h"
 #include "presentation_queue/vulkan_presentation_queue.h"
 #include "output_device/vulkan_output_devices.h"
diff --git a/projects/apis/vulkan/src/presentation_queue/vulkan_presentation_queue.c b/projects/apis/vulkan/src/presentation_queue/vulkan_presentation_queue.c
index 5284c93..e1dabf9 100644
--- a/projects/apis/vulkan/src/presentation_queue/vulkan_presentation_queue.c
+++ b/projects/apis/vulkan/src/presentation_queue/vulkan_presentation_queue.c
@@ -2,7 +2,7 @@
 #include "vulkan_swapchain_support.h"
 #include <output_device/vulkan_physical_device.h>
 #include "vulkan_surface/vulkan_surface.h"
-#include "core/debugger/gryphn_debugger.h"
+#include "debugger/gryphn_debugger.h"
 #include "textures/vulkan_texture.h"
 #include "sync/semaphore/vulkan_semaphore.h"
 #include "stdio.h"
diff --git a/projects/apis/vulkan/src/presentation_queue/vulkan_presentation_queue.h b/projects/apis/vulkan/src/presentation_queue/vulkan_presentation_queue.h
index 218008e..3b6b2a0 100644
--- a/projects/apis/vulkan/src/presentation_queue/vulkan_presentation_queue.h
+++ b/projects/apis/vulkan/src/presentation_queue/vulkan_presentation_queue.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "core/presentation_queue/gryphn_presentation_queue.h"
+#include "presentation_queue/gryphn_presentation_queue.h"
 #include <vulkan/vulkan.h>
 
 typedef struct gnPlatformPresentationQueue_t {
diff --git a/projects/apis/vulkan/src/renderpass/vulkan_render_pass_descriptor.h b/projects/apis/vulkan/src/renderpass/vulkan_render_pass_descriptor.h
index a6b3e21..5da1874 100644
--- a/projects/apis/vulkan/src/renderpass/vulkan_render_pass_descriptor.h
+++ b/projects/apis/vulkan/src/renderpass/vulkan_render_pass_descriptor.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "core/renderpass/gryphn_render_pass_descriptor.h"
+#include "renderpass/gryphn_render_pass_descriptor.h"
 #include <vulkan/vulkan.h>
 
 typedef struct gnPlatformRenderPassDescriptor_t {
diff --git a/projects/apis/vulkan/src/shader_module/vulkan_shader_module.h b/projects/apis/vulkan/src/shader_module/vulkan_shader_module.h
index 53cb33c..fdbe516 100644
--- a/projects/apis/vulkan/src/shader_module/vulkan_shader_module.h
+++ b/projects/apis/vulkan/src/shader_module/vulkan_shader_module.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <core/shader_module/gryphn_shader_module.h>
+#include <shader_module/gryphn_shader_module.h>
 #include <vulkan/vulkan.h>
 
 typedef struct gnPlatformShaderModule_t {
diff --git a/projects/apis/vulkan/src/submit/vulkan_submit.c b/projects/apis/vulkan/src/submit/vulkan_submit.c
index fd8148e..3e6828d 100644
--- a/projects/apis/vulkan/src/submit/vulkan_submit.c
+++ b/projects/apis/vulkan/src/submit/vulkan_submit.c
@@ -1,5 +1,5 @@
 #include <vulkan/vulkan.h>
-#include "core/submit/gryphn_submit.h"
+#include "submit/gryphn_submit.h"
 #include "sync/semaphore/vulkan_semaphore.h"
 #include "sync/fence/vulkan_fence.h"
 #include "commands/command_buffer/vulkan_command_buffer.h"
diff --git a/projects/apis/vulkan/src/sync/fence/vulkan_fence.h b/projects/apis/vulkan/src/sync/fence/vulkan_fence.h
index 8c140cf..94f920c 100644
--- a/projects/apis/vulkan/src/sync/fence/vulkan_fence.h
+++ b/projects/apis/vulkan/src/sync/fence/vulkan_fence.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include "core/sync/fence/gryphn_fence.h"
+#include "sync/fence/gryphn_fence.h"
 
 typedef struct gnPlatformFence_t {
     VkFence fence;
diff --git a/projects/apis/vulkan/src/sync/semaphore/vulkan_semaphore.h b/projects/apis/vulkan/src/sync/semaphore/vulkan_semaphore.h
index 3c47937..d41ae86 100644
--- a/projects/apis/vulkan/src/sync/semaphore/vulkan_semaphore.h
+++ b/projects/apis/vulkan/src/sync/semaphore/vulkan_semaphore.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include "core/sync/semaphore/gryphn_semaphore.h"
+#include "sync/semaphore/gryphn_semaphore.h"
 
 typedef struct gnPlatformSemaphore_t {
     VkSemaphore semaphore;
diff --git a/projects/apis/vulkan/src/textures/vulkan_texture.c b/projects/apis/vulkan/src/textures/vulkan_texture.c
index 2c491a2..578bae7 100644
--- a/projects/apis/vulkan/src/textures/vulkan_texture.c
+++ b/projects/apis/vulkan/src/textures/vulkan_texture.c
@@ -2,7 +2,7 @@
 #include "vulkan_texture.h"
 #include "output_device/vulkan_output_devices.h"
 #include "output_device/vulkan_physical_device.h"
-#include "core/debugger/gryphn_debugger.h"
+#include "debugger/gryphn_debugger.h"
 
 VkImageType vkGryphnTextureType(gnTextureType type) {
     switch(type) {
diff --git a/projects/apis/vulkan/src/textures/vulkan_texture.h b/projects/apis/vulkan/src/textures/vulkan_texture.h
index 68c4496..6ef0f43 100644
--- a/projects/apis/vulkan/src/textures/vulkan_texture.h
+++ b/projects/apis/vulkan/src/textures/vulkan_texture.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include "core/textures/gryphn_texture.h"
+#include "textures/gryphn_texture.h"
 #include "buffers/vulkan_buffer.h"
 
 typedef struct VkGryphnImage {
diff --git a/projects/apis/vulkan/src/uniforms/vulkan_uniform.c b/projects/apis/vulkan/src/uniforms/vulkan_uniform.c
index ae78061..80f29db 100644
--- a/projects/apis/vulkan/src/uniforms/vulkan_uniform.c
+++ b/projects/apis/vulkan/src/uniforms/vulkan_uniform.c
@@ -1,7 +1,7 @@
 #include "vulkan_uniform.h"
 #include "buffers/vulkan_buffer.h"
 #include "output_device/vulkan_output_devices.h"
-#include "core/uniforms/gryphn_uniform_pool.h"
+#include "uniforms/gryphn_uniform_pool.h"
 #include "textures/vulkan_texture.h"
 
 void gnUpdateBufferUniformFn(gnUniform uniform, gnBufferUniformInfo* info) {
diff --git a/projects/apis/vulkan/src/uniforms/vulkan_uniform.h b/projects/apis/vulkan/src/uniforms/vulkan_uniform.h
index c40ca8a..4ceeeec 100644
--- a/projects/apis/vulkan/src/uniforms/vulkan_uniform.h
+++ b/projects/apis/vulkan/src/uniforms/vulkan_uniform.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include "core/uniforms/gryphn_uniform.h"
+#include "uniforms/gryphn_uniform.h"
 
 typedef struct gnPlatformUniform_t {
     VkDescriptorSet set;
diff --git a/projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.h b/projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.h
index 95513b0..db67ae9 100644
--- a/projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.h
+++ b/projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include <core/uniforms/gryphn_uniform_layout.h>
+#include <uniforms/gryphn_uniform_layout.h>
 
 VkDescriptorSetLayout vkGryphnCreateSetLayouts(const gnUniformSet* set, VkDevice device);
 VkDescriptorType vkGryphnUniformType(gnUniformType type);
diff --git a/projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.c b/projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.c
index 246ffe2..a32fbce 100644
--- a/projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.c
+++ b/projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.c
@@ -2,7 +2,7 @@
 #include "vulkan_uniform_layout.h"
 #include "stdlib.h"
 #include "output_device/vulkan_output_devices.h"
-#include "core/uniforms/gryphn_uniform.h"
+#include "uniforms/gryphn_uniform.h"
 #include "vulkan_uniform.h"
 #include "stdio.h"
 
diff --git a/projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.h b/projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.h
index 52cc5f2..94ed5ce 100644
--- a/projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.h
+++ b/projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.h>
-#include <core/uniforms/gryphn_uniform_pool.h>
+#include <uniforms/gryphn_uniform_pool.h>
 
 GN_ARRAY_LIST(VkDescriptorSetLayout);
 
diff --git a/projects/apis/vulkan/src/vulkan_surface/vulkan_surface.c b/projects/apis/vulkan/src/vulkan_surface/vulkan_surface.c
index 2a19dc1..a3daf7b 100644
--- a/projects/apis/vulkan/src/vulkan_surface/vulkan_surface.c
+++ b/projects/apis/vulkan/src/vulkan_surface/vulkan_surface.c
@@ -1,4 +1,4 @@
-#include <core/window_surface/gryphn_surface_create_functions.h>
+#include <window_surface/gryphn_surface_create_functions.h>
 #include <instance/vulkan_instance.h>
 #include "vulkan_surface.h"
 #include <output_device/vulkan_physical_device.h>
diff --git a/projects/apis/vulkan/src/vulkan_surface/vulkan_surface.h b/projects/apis/vulkan/src/vulkan_surface/vulkan_surface.h
index 66b81c5..4f51fb5 100644
--- a/projects/apis/vulkan/src/vulkan_surface/vulkan_surface.h
+++ b/projects/apis/vulkan/src/vulkan_surface/vulkan_surface.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <core/window_surface/gryphn_surface.h>
+#include <window_surface/gryphn_surface.h>
 #include <vulkan/vulkan.h>
 
 typedef struct gnPlatformWindowSurface_t {