diff --git a/Package.swift b/Package.swift
index 01042c73..8367a53c 100755
--- a/Package.swift
+++ b/Package.swift
@@ -523,12 +523,11 @@ extension Target {
 }
 
 extension Target {
-    static let cVulkan: Target = systemLibrary(
+    static let cVulkan: Target = target(
         name: "CVulkan",
         path: "Volcano/Sources/CVulkan",
-        pkgConfig: "vulkan",
-        providers: [
-            .apt(["vulkan-sdk libwayland-dev libx11-dev"]),
+        linkerSettings: [
+            .linkedLibrary("vulkan"),
         ]
     )
     static let cClang: Target = systemLibrary(
diff --git a/Volcano/Sources/CVulkan/CVulkanEmpty.c b/Volcano/Sources/CVulkan/CVulkanEmpty.c
new file mode 100644
index 00000000..e18831f5
--- /dev/null
+++ b/Volcano/Sources/CVulkan/CVulkanEmpty.c
@@ -0,0 +1,8 @@
+//
+//  CVulkanEmpty.c
+//  Volcano
+//  
+//  Created by Serhii Mumriak on 10.09.2023
+//
+
+#include "include/CVulkan.h"
\ No newline at end of file
diff --git a/Volcano/Sources/CVulkan/Additions.h b/Volcano/Sources/CVulkan/include/Additions.h
similarity index 100%
rename from Volcano/Sources/CVulkan/Additions.h
rename to Volcano/Sources/CVulkan/include/Additions.h
diff --git a/Volcano/Sources/CVulkan/CVulkan_umbrella.h b/Volcano/Sources/CVulkan/include/CVulkan.h
similarity index 87%
rename from Volcano/Sources/CVulkan/CVulkan_umbrella.h
rename to Volcano/Sources/CVulkan/include/CVulkan.h
index ddd77246..1a7fe7ef 100644
--- a/Volcano/Sources/CVulkan/CVulkan_umbrella.h
+++ b/Volcano/Sources/CVulkan/include/CVulkan.h
@@ -1,12 +1,12 @@
 //
-//  CVulkan_umbrella.h
+//  CVulkan.h
 //  Volcano
-//
+//  
 //  Created by Serhii Mumriak on 15.05.2020.
 //
 
-#ifndef CVulkan_umbrella_h
-#define CVulkan_umbrella_h 1
+#ifndef CVulkan_h
+#define CVulkan_h 1
 
 #if __linux__
 
diff --git a/Volcano/Sources/CVulkan/VulkanEnums.h b/Volcano/Sources/CVulkan/include/VulkanEnums.h
similarity index 95%
rename from Volcano/Sources/CVulkan/VulkanEnums.h
rename to Volcano/Sources/CVulkan/include/VulkanEnums.h
index 8b967ef7..e2a93b99 100644
--- a/Volcano/Sources/CVulkan/VulkanEnums.h
+++ b/Volcano/Sources/CVulkan/include/VulkanEnums.h
@@ -1,8 +1,8 @@
 // WARNING: DO NOT MODIFY
 // This file is generated by vkthings tool
 // #*# Metadata version: 1
-// #*# Date generated: '2023-07-01 06:13:39Z'
-// #*# Vulkan Version: 1.3.250
+// #*# Date generated: '2023-09-10 23:28:07Z'
+// #*# Vulkan Version: 1.3.261
 //
 //  VulkanEnums.h
 //  Volcano
@@ -13,7 +13,7 @@
 #ifndef VulkanEnums_h
 #define VulkanEnums_h 1
 
-#include "../../../CCore/include/CCore.h"
+#include "../../../../CCore/include/CCore.h"
 
 AK_EXISTING_ENUM(VkAccelerationStructureBuildTypeKHR);
 AK_EXISTING_ENUM(VkAccelerationStructureCompatibilityKHR);
@@ -34,13 +34,14 @@ AK_EXISTING_ENUM(VkColorSpaceKHR);
 AK_EXISTING_ENUM(VkCommandBufferLevel);
 AK_EXISTING_ENUM(VkCompareOp);
 AK_EXISTING_ENUM(VkComponentSwizzle);
-AK_EXISTING_ENUM(VkComponentTypeNV);
+AK_EXISTING_ENUM(VkComponentTypeKHR);
 AK_EXISTING_ENUM(VkConservativeRasterizationModeEXT);
 AK_EXISTING_ENUM(VkCopyAccelerationStructureModeKHR);
 AK_EXISTING_ENUM(VkCopyMicromapModeEXT);
 AK_EXISTING_ENUM(VkCoverageModulationModeNV);
 AK_EXISTING_ENUM(VkCoverageReductionModeNV);
 AK_EXISTING_ENUM(VkDebugReportObjectTypeEXT);
+AK_EXISTING_ENUM(VkDepthBiasRepresentationEXT);
 AK_EXISTING_ENUM(VkDescriptorType);
 AK_EXISTING_ENUM(VkDescriptorUpdateTemplateType);
 AK_EXISTING_ENUM(VkDeviceAddressBindingTypeEXT);
@@ -111,7 +112,7 @@ AK_EXISTING_ENUM(VkSamplerMipmapMode);
 AK_EXISTING_ENUM(VkSamplerReductionMode);
 AK_EXISTING_ENUM(VkSamplerYcbcrModelConversion);
 AK_EXISTING_ENUM(VkSamplerYcbcrRange);
-AK_EXISTING_ENUM(VkScopeNV);
+AK_EXISTING_ENUM(VkScopeKHR);
 AK_EXISTING_ENUM(VkSemaphoreType);
 AK_EXISTING_ENUM(VkShaderCodeTypeEXT);
 AK_EXISTING_ENUM(VkShaderFloatControlsIndependence);
diff --git a/Volcano/Sources/CVulkan/VulkanOptionSets.h b/Volcano/Sources/CVulkan/include/VulkanOptionSets.h
similarity index 95%
rename from Volcano/Sources/CVulkan/VulkanOptionSets.h
rename to Volcano/Sources/CVulkan/include/VulkanOptionSets.h
index a27c4e5d..b8f0a02c 100644
--- a/Volcano/Sources/CVulkan/VulkanOptionSets.h
+++ b/Volcano/Sources/CVulkan/include/VulkanOptionSets.h
@@ -1,8 +1,8 @@
 // WARNING: DO NOT MODIFY
 // This file is generated by vkthings tool
 // #*# Metadata version: 1
-// #*# Date generated: '2023-07-01 06:13:42Z'
-// #*# Vulkan Version: 1.3.250
+// #*# Date generated: '2023-09-10 23:28:16Z'
+// #*# Vulkan Version: 1.3.261
 //
 //  VulkanOptionSets.h
 //  Volcano
@@ -13,13 +13,14 @@
 #ifndef VulkanOptionSets_h
 #define VulkanOptionSets_h 1
 
-#include "../../../CCore/include/CCore.h"
+#include "../../../../CCore/include/CCore.h"
 
 AK_EXISTING_OPTIONS(VkAccelerationStructureCreateFlagBitsKHR);
 AK_EXISTING_OPTIONS(VkAccessFlagBits);
 AK_EXISTING_OPTIONS(VkAttachmentDescriptionFlagBits);
 AK_EXISTING_OPTIONS(VkBufferCreateFlagBits);
 AK_EXISTING_OPTIONS(VkBufferUsageFlagBits);
+AK_EXISTING_OPTIONS(VkBufferUsageFlagBits2KHR);
 AK_EXISTING_OPTIONS(VkBuildAccelerationStructureFlagBitsKHR);
 AK_EXISTING_OPTIONS(VkBuildMicromapFlagBitsEXT);
 AK_EXISTING_OPTIONS(VkColorComponentFlagBits);
@@ -61,6 +62,7 @@ AK_EXISTING_OPTIONS(VkFramebufferCreateFlagBits);
 AK_EXISTING_OPTIONS(VkGeometryFlagBitsKHR);
 AK_EXISTING_OPTIONS(VkGeometryInstanceFlagBitsKHR);
 AK_EXISTING_OPTIONS(VkGraphicsPipelineLibraryFlagBitsEXT);
+AK_EXISTING_OPTIONS(VkHostImageCopyFlagBitsEXT);
 AK_EXISTING_OPTIONS(VkImageAspectFlagBits);
 AK_EXISTING_OPTIONS(VkImageCompressionFixedRateFlagBitsEXT);
 AK_EXISTING_OPTIONS(VkImageCompressionFlagBitsEXT);
@@ -83,6 +85,7 @@ AK_EXISTING_OPTIONS(VkPerformanceCounterDescriptionFlagBitsKHR);
 AK_EXISTING_OPTIONS(VkPipelineCacheCreateFlagBits);
 AK_EXISTING_OPTIONS(VkPipelineColorBlendStateCreateFlagBits);
 AK_EXISTING_OPTIONS(VkPipelineCreateFlagBits);
+AK_EXISTING_OPTIONS(VkPipelineCreateFlagBits2KHR);
 AK_EXISTING_OPTIONS(VkPipelineCreationFeedbackFlagBits);
 AK_EXISTING_OPTIONS(VkPipelineDepthStencilStateCreateFlagBits);
 AK_EXISTING_OPTIONS(VkPipelineLayoutCreateFlagBits);
diff --git a/Volcano/Sources/CVulkan/VulkanStructs.h b/Volcano/Sources/CVulkan/include/VulkanStructs.h
similarity index 95%
rename from Volcano/Sources/CVulkan/VulkanStructs.h
rename to Volcano/Sources/CVulkan/include/VulkanStructs.h
index f91c66aa..60464a1a 100644
--- a/Volcano/Sources/CVulkan/VulkanStructs.h
+++ b/Volcano/Sources/CVulkan/include/VulkanStructs.h
@@ -8,7 +8,7 @@
 #ifndef VulkanStructs_h
 #define VulkanStructs_h 1
 
-#include "../../../CCore/include/CCore.h"
+#include "../../../../CCore/include/CCore.h"
 
 #ifndef __cplusplus
 
diff --git a/Volcano/Sources/CVulkan/module.modulemap b/Volcano/Sources/CVulkan/module.modulemap
deleted file mode 100644
index 3a26a0f2..00000000
--- a/Volcano/Sources/CVulkan/module.modulemap
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-//  module.modulemap
-//  CVulkan
-//
-//  Created by Serhii Mumriak on 29.01.2020.
-//
-
-module CVulkan [system] [extern_c] {
-    header "CVulkan_umbrella.h"
-    link "vulkan"
-    export *
-}
diff --git a/Volcano/Sources/VulkanMemoryAllocatorAdapted/include/VulkanMemoryAllocatorAdapted.h b/Volcano/Sources/VulkanMemoryAllocatorAdapted/include/VulkanMemoryAllocatorAdapted.h
index 7499676a..9de0ab22 100755
--- a/Volcano/Sources/VulkanMemoryAllocatorAdapted/include/VulkanMemoryAllocatorAdapted.h
+++ b/Volcano/Sources/VulkanMemoryAllocatorAdapted/include/VulkanMemoryAllocatorAdapted.h
@@ -20,7 +20,7 @@ AK_EXISTING_ENUM(VmaMemoryUsage);
 
 #endif
 
-#include "../../CVulkan/CVulkan_umbrella.h"
+#include "../../CVulkan/include/CVulkan.h"
 #include "VulkanMemoryAllocatorAdaptor.h"
 
 #endif