diff --git a/aster/CMakeLists.txt b/aster/CMakeLists.txt
index 4644fe9..384f4a8 100644
--- a/aster/CMakeLists.txt
+++ b/aster/CMakeLists.txt
@@ -19,7 +19,6 @@ add_subdirectory("src")
 
 target_compile_features(aster_core PUBLIC cxx_std_23)
 
-target_include_directories(aster_core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/aster")
 target_include_directories(aster_core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
 target_link_libraries(aster_core PUBLIC glm::glm-header-only)
diff --git a/aster/src/aster/core/buffer.cpp b/aster/src/aster/core/buffer.cpp
index a08d6af..ad8e617 100644
--- a/aster/src/aster/core/buffer.cpp
+++ b/aster/src/aster/core/buffer.cpp
@@ -3,9 +3,9 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/buffer.h"
+#include "aster/core/buffer.h"
 
-#include "core/device.h"
+#include "aster/core/device.h"
 
 Buffer::Buffer(Device const *device, usize const size, vk::BufferUsageFlags const bufferUsage,
                VmaAllocationCreateFlags const allocationFlags, VmaMemoryUsage const memoryUsage, cstr const name)
diff --git a/aster/src/aster/core/device.cpp b/aster/src/aster/core/device.cpp
index 5c8197d..ff29948 100644
--- a/aster/src/aster/core/device.cpp
+++ b/aster/src/aster/core/device.cpp
@@ -3,11 +3,11 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/device.h"
+#include "aster/core/device.h"
 
-#include "core/instance.h"
-#include "core/physical_device.h"
-#include "core/queue_allocation.h"
+#include "aster/core/instance.h"
+#include "aster/core/physical_device.h"
+#include "aster/core/queue_allocation.h"
 
 #include <EASTL/array.h>
 #include <EASTL/fixed_vector.h>
diff --git a/aster/src/aster/core/global.cpp b/aster/src/aster/core/global.cpp
index a268f60..49dc8c2 100644
--- a/aster/src/aster/core/global.cpp
+++ b/aster/src/aster/core/global.cpp
@@ -3,7 +3,7 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/global.h"
+#include "aster/core/global.h"
 
 #include <cstdarg>
 #include <cstdio>
diff --git a/aster/src/aster/core/image.cpp b/aster/src/aster/core/image.cpp
index df0ec72..88724e5 100644
--- a/aster/src/aster/core/image.cpp
+++ b/aster/src/aster/core/image.cpp
@@ -3,9 +3,9 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/image.h"
+#include "aster/core/image.h"
 
-#include "core/device.h"
+#include "aster/core/device.h"
 
 Image &
 Image::operator=(Image &&other) noexcept
diff --git a/aster/src/aster/core/instance.cpp b/aster/src/aster/core/instance.cpp
index 994a771..43d34e2 100644
--- a/aster/src/aster/core/instance.cpp
+++ b/aster/src/aster/core/instance.cpp
@@ -3,9 +3,9 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/instance.h"
+#include "aster/core/instance.h"
 
-#include "core/window.h"
+#include "aster/core/window.h"
 
 #include <EASTL/array.h>
 #include <EASTL/fixed_vector.h>
diff --git a/aster/src/aster/core/physical_device.cpp b/aster/src/aster/core/physical_device.cpp
index b81da10..368ab99 100644
--- a/aster/src/aster/core/physical_device.cpp
+++ b/aster/src/aster/core/physical_device.cpp
@@ -3,10 +3,10 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/physical_device.h"
+#include "aster/core/physical_device.h"
 
-#include "core/instance.h"
-#include "core/surface.h"
+#include "aster/core/instance.h"
+#include "aster/core/surface.h"
 
 [[nodiscard]] vk::SurfaceCapabilitiesKHR
 GetSurfaceCapabilities(vk::PhysicalDevice const physicalDevice, vk::SurfaceKHR const surface)
diff --git a/aster/src/aster/core/pipeline.cpp b/aster/src/aster/core/pipeline.cpp
index 9bced78..418c157 100644
--- a/aster/src/aster/core/pipeline.cpp
+++ b/aster/src/aster/core/pipeline.cpp
@@ -3,9 +3,9 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/pipeline.h"
+#include "aster/core/pipeline.h"
 
-#include "core/device.h"
+#include "aster/core/device.h"
 
 Pipeline::Pipeline(Device const *device, vk::PipelineLayout const layout, vk::Pipeline const pipeline,
                    eastl::vector<vk::DescriptorSetLayout> &&setLayouts, Kind const kind)
diff --git a/aster/src/aster/core/sampler.cpp b/aster/src/aster/core/sampler.cpp
index e32d6e8..6459c7f 100644
--- a/aster/src/aster/core/sampler.cpp
+++ b/aster/src/aster/core/sampler.cpp
@@ -3,9 +3,9 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/sampler.h"
+#include "aster/core/sampler.h"
 
-#include "core/device.h"
+#include "aster/core/device.h"
 
 Sampler::~Sampler()
 {
diff --git a/aster/src/aster/core/surface.cpp b/aster/src/aster/core/surface.cpp
index 39ba526..d4ded32 100644
--- a/aster/src/aster/core/surface.cpp
+++ b/aster/src/aster/core/surface.cpp
@@ -3,10 +3,10 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/surface.h"
+#include "aster/core/surface.h"
 
-#include "core/instance.h"
-#include "core/window.h"
+#include "aster/core/instance.h"
+#include "aster/core/window.h"
 
 Surface::Surface(Instance &context, Window const &window)
     : m_Context(&context)
diff --git a/aster/src/aster/core/swapchain.cpp b/aster/src/aster/core/swapchain.cpp
index 4bfcfe1..1124b54 100644
--- a/aster/src/aster/core/swapchain.cpp
+++ b/aster/src/aster/core/swapchain.cpp
@@ -3,11 +3,11 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // ==============================================
 
-#include "core/swapchain.h"
+#include "aster/core/swapchain.h"
 
-#include "core/device.h"
-#include "core/physical_device.h"
-#include "core/surface.h"
+#include "aster/core/device.h"
+#include "aster/core/physical_device.h"
+#include "aster/core/surface.h"
 
 [[nodiscard]] vk::Extent2D GetExtent(Size2D size, vk::SurfaceCapabilitiesKHR *surfaceCapabilities);
 
diff --git a/aster/src/aster/core/window.cpp b/aster/src/aster/core/window.cpp
index 89f7ab9..63e0305 100644
--- a/aster/src/aster/core/window.cpp
+++ b/aster/src/aster/core/window.cpp
@@ -3,10 +3,10 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "core/window.h"
+#include "aster/core/window.h"
 
-#include "core/instance.h"
-#include "util/logger.h"
+#include "aster/core/instance.h"
+#include "aster/util/logger.h"
 
 std::atomic_uint64_t Window::m_WindowCount = 0;
 std::atomic_bool Window::m_IsGlfwInit = false;
diff --git a/aster/src/aster/systems/commit_manager.cpp b/aster/src/aster/systems/commit_manager.cpp
index bac151a..1f4ccd2 100644
--- a/aster/src/aster/systems/commit_manager.cpp
+++ b/aster/src/aster/systems/commit_manager.cpp
@@ -3,12 +3,12 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "systems/commit_manager.h"
+#include "aster/systems/commit_manager.h"
 
 #include "EASTL/array.h"
-#include "core/device.h"
-#include "core/image_view.h"
-#include "systems/rendering_device.h"
+#include "aster/core/device.h"
+#include "aster/core/image_view.h"
+#include "aster/systems/rendering_device.h"
 
 using namespace systems;
 
diff --git a/aster/src/aster/systems/pipeline_helpers.cpp b/aster/src/aster/systems/pipeline_helpers.cpp
index da28879..3fcca35 100644
--- a/aster/src/aster/systems/pipeline_helpers.cpp
+++ b/aster/src/aster/systems/pipeline_helpers.cpp
@@ -3,7 +3,7 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "systems/rendering_device.h"
+#include "aster/systems/rendering_device.h"
 
 #include <aster/systems/pipeline_helpers.h>
 
diff --git a/aster/src/aster/systems/rendering_device.cpp b/aster/src/aster/systems/rendering_device.cpp
index 7a876a6..2109716 100644
--- a/aster/src/aster/systems/rendering_device.cpp
+++ b/aster/src/aster/systems/rendering_device.cpp
@@ -3,16 +3,16 @@
 // Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "systems/rendering_device.h"
+#include "aster/systems/rendering_device.h"
 
-#include "core/queue_allocation.h"
-#include "core/window.h"
-#include "systems/resource.h"
+#include "aster/core/queue_allocation.h"
+#include "aster/core/window.h"
+#include "aster/systems/resource.h"
 
 #include "aster/systems/sync_server.h"
 #include "aster/util/files.h"
-#include "systems/commit_manager.h"
-#include "systems/context.h"
+#include "aster/systems/commit_manager.h"
+#include "aster/systems/context.h"
 
 #include <EASTL/vector_map.h>
 #include <fmt/ranges.h>
diff --git a/aster/src/aster/util/logger.cpp b/aster/src/aster/util/logger.cpp
index 8288de9..953f4ee 100644
--- a/aster/src/aster/util/logger.cpp
+++ b/aster/src/aster/util/logger.cpp
@@ -3,7 +3,7 @@
 //  Copyright (c) 2020-2025 Anish Bhobe
 // =============================================
 
-#include "util/logger.h"
+#include "aster/util/logger.h"
 
 auto g_Logger = Logger();
 // ReSharper disable once CppInconsistentNaming