diff --git a/ash/src/extensions/android_surface.rs b/ash/src/extensions/khr/android_surface.rs
similarity index 100%
rename from ash/src/extensions/android_surface.rs
rename to ash/src/extensions/khr/android_surface.rs
diff --git a/ash/src/extensions/debug_marker.rs b/ash/src/extensions/khr/debug_marker.rs
similarity index 100%
rename from ash/src/extensions/debug_marker.rs
rename to ash/src/extensions/khr/debug_marker.rs
diff --git a/ash/src/extensions/debug_report.rs b/ash/src/extensions/khr/debug_report.rs
similarity index 100%
rename from ash/src/extensions/debug_report.rs
rename to ash/src/extensions/khr/debug_report.rs
diff --git a/ash/src/extensions/debug_utils.rs b/ash/src/extensions/khr/debug_utils.rs
similarity index 100%
rename from ash/src/extensions/debug_utils.rs
rename to ash/src/extensions/khr/debug_utils.rs
diff --git a/ash/src/extensions/display_swapchain.rs b/ash/src/extensions/khr/display_swapchain.rs
similarity index 100%
rename from ash/src/extensions/display_swapchain.rs
rename to ash/src/extensions/khr/display_swapchain.rs
diff --git a/ash/src/extensions/khr/mod.rs b/ash/src/extensions/khr/mod.rs
new file mode 100644
index 0000000..7c4cfe2
--- /dev/null
+++ b/ash/src/extensions/khr/mod.rs
@@ -0,0 +1,23 @@
+pub use self::android_surface::AndroidSurface;
+pub use self::debug_marker::DebugMarker;
+pub use self::debug_report::DebugReport;
+pub use self::debug_utils::DebugUtils;
+pub use self::display_swapchain::DisplaySwapchain;
+pub use self::surface::Surface;
+pub use self::swapchain::Swapchain;
+pub use self::wayland_surface::WaylandSurface;
+pub use self::win32_surface::Win32Surface;
+pub use self::xcb_surface::XcbSurface;
+pub use self::xlib_surface::XlibSurface;
+
+mod android_surface;
+mod debug_marker;
+mod debug_report;
+mod debug_utils;
+mod display_swapchain;
+mod surface;
+mod swapchain;
+mod wayland_surface;
+mod win32_surface;
+mod xcb_surface;
+mod xlib_surface;
diff --git a/ash/src/extensions/surface.rs b/ash/src/extensions/khr/surface.rs
similarity index 100%
rename from ash/src/extensions/surface.rs
rename to ash/src/extensions/khr/surface.rs
diff --git a/ash/src/extensions/swapchain.rs b/ash/src/extensions/khr/swapchain.rs
similarity index 100%
rename from ash/src/extensions/swapchain.rs
rename to ash/src/extensions/khr/swapchain.rs
diff --git a/ash/src/extensions/wayland_surface.rs b/ash/src/extensions/khr/wayland_surface.rs
similarity index 100%
rename from ash/src/extensions/wayland_surface.rs
rename to ash/src/extensions/khr/wayland_surface.rs
diff --git a/ash/src/extensions/win32_surface.rs b/ash/src/extensions/khr/win32_surface.rs
similarity index 100%
rename from ash/src/extensions/win32_surface.rs
rename to ash/src/extensions/khr/win32_surface.rs
diff --git a/ash/src/extensions/xcb_surface.rs b/ash/src/extensions/khr/xcb_surface.rs
similarity index 100%
rename from ash/src/extensions/xcb_surface.rs
rename to ash/src/extensions/khr/xcb_surface.rs
diff --git a/ash/src/extensions/xlib_surface.rs b/ash/src/extensions/khr/xlib_surface.rs
similarity index 100%
rename from ash/src/extensions/xlib_surface.rs
rename to ash/src/extensions/khr/xlib_surface.rs
diff --git a/ash/src/extensions/mod.rs b/ash/src/extensions/mod.rs
index 8d28374..91b0897 100644
--- a/ash/src/extensions/mod.rs
+++ b/ash/src/extensions/mod.rs
@@ -1,29 +1,3 @@
-pub use self::android_surface::AndroidSurface;
-pub use self::debug_marker::DebugMarker;
-pub use self::debug_report::DebugReport;
-pub use self::debug_utils::DebugUtils;
-pub use self::display_swapchain::DisplaySwapchain;
-pub use self::ios_surface::IOSSurface;
-pub use self::macos_surface::MacOSSurface;
-pub use self::mesh_shader::MeshShader;
-pub use self::surface::Surface;
-pub use self::swapchain::Swapchain;
-pub use self::wayland_surface::WaylandSurface;
-pub use self::win32_surface::Win32Surface;
-pub use self::xcb_surface::XcbSurface;
-pub use self::xlib_surface::XlibSurface;
-
-mod android_surface;
-mod debug_marker;
-mod debug_report;
-mod debug_utils;
-mod display_swapchain;
-mod ios_surface;
-mod macos_surface;
-mod mesh_shader;
-mod surface;
-mod swapchain;
-mod wayland_surface;
-mod win32_surface;
-mod xcb_surface;
-mod xlib_surface;
+pub mod khr;
+pub mod nv;
+pub mod mvk;
diff --git a/ash/src/extensions/ios_surface.rs b/ash/src/extensions/mvk/ios_surface.rs
similarity index 100%
rename from ash/src/extensions/ios_surface.rs
rename to ash/src/extensions/mvk/ios_surface.rs
diff --git a/ash/src/extensions/macos_surface.rs b/ash/src/extensions/mvk/macos_surface.rs
similarity index 100%
rename from ash/src/extensions/macos_surface.rs
rename to ash/src/extensions/mvk/macos_surface.rs
diff --git a/ash/src/extensions/mvk/mod.rs b/ash/src/extensions/mvk/mod.rs
new file mode 100644
index 0000000..e475d53
--- /dev/null
+++ b/ash/src/extensions/mvk/mod.rs
@@ -0,0 +1,5 @@
+pub use self::ios_surface::IOSSurface;
+pub use self::macos_surface::MacOSSurface;
+
+mod ios_surface;
+mod macos_surface;
diff --git a/ash/src/extensions/mesh_shader.rs b/ash/src/extensions/nv/mesh_shader.rs
similarity index 100%
rename from ash/src/extensions/mesh_shader.rs
rename to ash/src/extensions/nv/mesh_shader.rs
diff --git a/ash/src/extensions/nv/mod.rs b/ash/src/extensions/nv/mod.rs
new file mode 100644
index 0000000..4a8d1e5
--- /dev/null
+++ b/ash/src/extensions/nv/mod.rs
@@ -0,0 +1,3 @@
+pub use self::mesh_shader::MeshShader;
+
+mod mesh_shader;
diff --git a/examples/src/lib.rs b/examples/src/lib.rs
index 195903c..df9c526 100644
--- a/examples/src/lib.rs
+++ b/examples/src/lib.rs
@@ -21,13 +21,13 @@ use objc::runtime::YES;
 #[cfg(target_os = "macos")]
 use std::mem;
 
+#[cfg(all(unix, not(target_os = "android"), not(target_os = "macos")))]
+use ash::extensions::khr::XlibSurface;
+use ash::extensions::khr::{DebugReport, Surface, Swapchain};
 #[cfg(target_os = "macos")]
 use ash::extensions::MacOSSurface;
 #[cfg(target_os = "windows")]
 use ash::extensions::Win32Surface;
-#[cfg(all(unix, not(target_os = "android"), not(target_os = "macos")))]
-use ash::extensions::XlibSurface;
-use ash::extensions::{DebugReport, Surface, Swapchain};
 pub use ash::version::{DeviceV1_0, EntryV1_0, InstanceV1_0};
 use ash::vk;
 use ash::Device;