From a75e1a383adee98e64e0b672ebefba826b17da66 Mon Sep 17 00:00:00 2001
From: firestar99 <firestar99@sydow.cloud>
Date: Wed, 3 Dec 2025 11:23:00 +0100
Subject: [PATCH 1/4] rename placeholder `integration_type` to `integration`

---
 ash-graphics/Cargo.toml.liquid              | 6 +++---
 ash-graphics/ash-graphics/Cargo.toml.liquid | 6 +++---
 ash-graphics/ash-graphics/build.rs.liquid   | 8 ++++----
 ash-graphics/cargo-generate.toml            | 6 +++---
 xtask/src/generate.rs                       | 6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ash-graphics/Cargo.toml.liquid b/ash-graphics/Cargo.toml.liquid
index 70d7058..ff4d92f 100644
--- a/ash-graphics/Cargo.toml.liquid
+++ b/ash-graphics/Cargo.toml.liquid
@@ -16,11 +16,11 @@ repository = ""
 unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
 
 [workspace.dependencies]
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 # The version of the dependencies `spirv-builder` and `spirv-std` must match exactly!
 spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
 {% endif -%}
-{% if integration_type == "cargo-gpu" -%}
+{% if integration == "cargo-gpu" -%}
 cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "bf24eb6060e0c7b0013eceddd23b5d7cee68f4cc" }
 {% endif -%}
 spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
@@ -34,7 +34,7 @@ winit = "0.30.0"
 cfg-if = "1.0.0"
 anyhow = "1.0.98"
 
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 # Optimize build scripts, copied from rust-gpu's repo
 # Enable incremental by default in release mode.
 [profile.release]
diff --git a/ash-graphics/ash-graphics/Cargo.toml.liquid b/ash-graphics/ash-graphics/Cargo.toml.liquid
index 89b68d5..b4e98ae 100644
--- a/ash-graphics/ash-graphics/Cargo.toml.liquid
+++ b/ash-graphics/ash-graphics/Cargo.toml.liquid
@@ -10,7 +10,7 @@ repository.workspace = true
 [lints]
 workspace = true
 
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 [features]
 default = ["use-compiled-tools"]
 use-installed-tools = ["spirv-builder/use-installed-tools"]
@@ -28,10 +28,10 @@ anyhow.workspace = true
 bytemuck.workspace = true
 
 [build-dependencies]
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 spirv-builder.workspace = true
 {% endif -%}
-{% if integration_type == "cargo-gpu" -%}
+{% if integration == "cargo-gpu" -%}
 cargo-gpu.workspace = true
 {% endif -%}
 anyhow.workspace = true
diff --git a/ash-graphics/ash-graphics/build.rs.liquid b/ash-graphics/ash-graphics/build.rs.liquid
index be05945..51e4e3e 100644
--- a/ash-graphics/ash-graphics/build.rs.liquid
+++ b/ash-graphics/ash-graphics/build.rs.liquid
@@ -1,7 +1,7 @@
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 use spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvBuilder};
 {% endif -%}
-{% if integration_type == "cargo-gpu" -%}
+{% if integration == "cargo-gpu" -%}
 use cargo_gpu::Install;
 use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy};
 {% endif -%}
@@ -14,10 +14,10 @@ pub fn main() -> anyhow::Result<()> {
         .copied()
         .collect::<PathBuf>();
 
-    {% if integration_type == "spirv-builder" -%}
+    {% if integration == "spirv-builder" -%}
     let mut builder = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.3");
     {% endif -%}
-    {% if integration_type == "cargo-gpu" -%}
+    {% if integration == "cargo-gpu" -%}
     let install = Install::from_shader_crate(crate_path.clone()).run()?;
     let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
     {% endif -%}
diff --git a/ash-graphics/cargo-generate.toml b/ash-graphics/cargo-generate.toml
index fc2918e..aa55015 100644
--- a/ash-graphics/cargo-generate.toml
+++ b/ash-graphics/cargo-generate.toml
@@ -3,7 +3,7 @@ ignore = ["target"]
 exclude = ["target"]
 
 [placeholders]
-integration_type = { prompt = "What integration type?", choices = ["cargo-gpu", "spirv-builder"], default = "cargo-gpu", type = "string" }
+integration = { prompt = "What integration type?", choices = ["cargo-gpu", "spirv-builder"], default = "cargo-gpu", type = "string" }
 
-[conditional.'integration_type != "spirv-builder"']
-ignore = [ "rust-toolchain.toml" ]
\ No newline at end of file
+[conditional.'integration != "spirv-builder"']
+ignore = [ "rust-toolchain.toml" ]
diff --git a/xtask/src/generate.rs b/xtask/src/generate.rs
index 3768e42..d464282 100644
--- a/xtask/src/generate.rs
+++ b/xtask/src/generate.rs
@@ -40,7 +40,7 @@ impl clap::ValueEnum for Values {
 impl Values {
     pub fn key(&self) -> Placeholders {
         match self {
-            Values::CargoGpu | Values::SpirvBuilder => Placeholders::IntegrationType,
+            Values::CargoGpu | Values::SpirvBuilder => Placeholders::Integration,
         }
     }
 
@@ -52,8 +52,8 @@ impl Values {
 #[repr(u32)]
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Display, EnumString, IntoStaticStr, VariantArray)]
 pub enum Placeholders {
-    #[strum(to_string = "integration_type")]
-    IntegrationType,
+    #[strum(to_string = "integration")]
+    Integration,
 }
 
 impl Debug for Placeholders {

From 143fd47608ef36a3736b5e68f140f8445b04b141 Mon Sep 17 00:00:00 2001
From: firestar99 <firestar99@sydow.cloud>
Date: Wed, 3 Dec 2025 13:57:21 +0100
Subject: [PATCH 2/4] rename template from `ash-graphics` to `graphics`

---
 cargo-generate.toml                                           | 2 +-
 {ash-graphics => graphics}/Cargo.toml.liquid                  | 0
 {ash-graphics => graphics}/ash-graphics-shaders/Cargo.toml    | 0
 {ash-graphics => graphics}/ash-graphics-shaders/src/lib.rs    | 0
 {ash-graphics => graphics}/ash-graphics/Cargo.toml.liquid     | 0
 {ash-graphics => graphics}/ash-graphics/build.rs.liquid       | 0
 {ash-graphics => graphics}/ash-graphics/src/device.rs         | 0
 {ash-graphics => graphics}/ash-graphics/src/graphics.rs       | 0
 {ash-graphics => graphics}/ash-graphics/src/main.rs           | 0
 .../ash-graphics/src/single_command_buffer.rs                 | 0
 {ash-graphics => graphics}/ash-graphics/src/swapchain.rs      | 0
 {ash-graphics => graphics}/cargo-generate.toml                | 0
 {ash-graphics => graphics}/rust-toolchain.toml                | 0
 xtask/src/generate.rs                                         | 4 +++-
 14 files changed, 4 insertions(+), 2 deletions(-)
 rename {ash-graphics => graphics}/Cargo.toml.liquid (100%)
 rename {ash-graphics => graphics}/ash-graphics-shaders/Cargo.toml (100%)
 rename {ash-graphics => graphics}/ash-graphics-shaders/src/lib.rs (100%)
 rename {ash-graphics => graphics}/ash-graphics/Cargo.toml.liquid (100%)
 rename {ash-graphics => graphics}/ash-graphics/build.rs.liquid (100%)
 rename {ash-graphics => graphics}/ash-graphics/src/device.rs (100%)
 rename {ash-graphics => graphics}/ash-graphics/src/graphics.rs (100%)
 rename {ash-graphics => graphics}/ash-graphics/src/main.rs (100%)
 rename {ash-graphics => graphics}/ash-graphics/src/single_command_buffer.rs (100%)
 rename {ash-graphics => graphics}/ash-graphics/src/swapchain.rs (100%)
 rename {ash-graphics => graphics}/cargo-generate.toml (100%)
 rename {ash-graphics => graphics}/rust-toolchain.toml (100%)

diff --git a/cargo-generate.toml b/cargo-generate.toml
index d7fcde6..eb222f3 100644
--- a/cargo-generate.toml
+++ b/cargo-generate.toml
@@ -1,2 +1,2 @@
 [template]
-sub_templates = ["ash-graphics"]
+sub_templates = ["graphics"]
diff --git a/ash-graphics/Cargo.toml.liquid b/graphics/Cargo.toml.liquid
similarity index 100%
rename from ash-graphics/Cargo.toml.liquid
rename to graphics/Cargo.toml.liquid
diff --git a/ash-graphics/ash-graphics-shaders/Cargo.toml b/graphics/ash-graphics-shaders/Cargo.toml
similarity index 100%
rename from ash-graphics/ash-graphics-shaders/Cargo.toml
rename to graphics/ash-graphics-shaders/Cargo.toml
diff --git a/ash-graphics/ash-graphics-shaders/src/lib.rs b/graphics/ash-graphics-shaders/src/lib.rs
similarity index 100%
rename from ash-graphics/ash-graphics-shaders/src/lib.rs
rename to graphics/ash-graphics-shaders/src/lib.rs
diff --git a/ash-graphics/ash-graphics/Cargo.toml.liquid b/graphics/ash-graphics/Cargo.toml.liquid
similarity index 100%
rename from ash-graphics/ash-graphics/Cargo.toml.liquid
rename to graphics/ash-graphics/Cargo.toml.liquid
diff --git a/ash-graphics/ash-graphics/build.rs.liquid b/graphics/ash-graphics/build.rs.liquid
similarity index 100%
rename from ash-graphics/ash-graphics/build.rs.liquid
rename to graphics/ash-graphics/build.rs.liquid
diff --git a/ash-graphics/ash-graphics/src/device.rs b/graphics/ash-graphics/src/device.rs
similarity index 100%
rename from ash-graphics/ash-graphics/src/device.rs
rename to graphics/ash-graphics/src/device.rs
diff --git a/ash-graphics/ash-graphics/src/graphics.rs b/graphics/ash-graphics/src/graphics.rs
similarity index 100%
rename from ash-graphics/ash-graphics/src/graphics.rs
rename to graphics/ash-graphics/src/graphics.rs
diff --git a/ash-graphics/ash-graphics/src/main.rs b/graphics/ash-graphics/src/main.rs
similarity index 100%
rename from ash-graphics/ash-graphics/src/main.rs
rename to graphics/ash-graphics/src/main.rs
diff --git a/ash-graphics/ash-graphics/src/single_command_buffer.rs b/graphics/ash-graphics/src/single_command_buffer.rs
similarity index 100%
rename from ash-graphics/ash-graphics/src/single_command_buffer.rs
rename to graphics/ash-graphics/src/single_command_buffer.rs
diff --git a/ash-graphics/ash-graphics/src/swapchain.rs b/graphics/ash-graphics/src/swapchain.rs
similarity index 100%
rename from ash-graphics/ash-graphics/src/swapchain.rs
rename to graphics/ash-graphics/src/swapchain.rs
diff --git a/ash-graphics/cargo-generate.toml b/graphics/cargo-generate.toml
similarity index 100%
rename from ash-graphics/cargo-generate.toml
rename to graphics/cargo-generate.toml
diff --git a/ash-graphics/rust-toolchain.toml b/graphics/rust-toolchain.toml
similarity index 100%
rename from ash-graphics/rust-toolchain.toml
rename to graphics/rust-toolchain.toml
diff --git a/xtask/src/generate.rs b/xtask/src/generate.rs
index d464282..21ca083 100644
--- a/xtask/src/generate.rs
+++ b/xtask/src/generate.rs
@@ -8,6 +8,8 @@ use std::fmt::{Debug, Display, Formatter};
 use std::path::{Path, PathBuf};
 use strum::{Display, EnumString, IntoStaticStr, VariantArray};
 
+pub const TEMPLATE_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../graphics");
+
 /// All possible placeholder *values*.
 ///
 /// We assume there are no duplicate values for placeholders, so we don't need to type out the key / placeholder name,
@@ -148,7 +150,7 @@ impl Generate {
 
         debug!("Generating `{variant:?}` at `{}`", out_dir.display());
         let mut args = GenerateArgs::default();
-        args.template_path.path = Some(format!("{}/../ash-graphics", env!("CARGO_MANIFEST_DIR")));
+        args.template_path.path = Some(TEMPLATE_PATH.to_string());
         args.init = true;
         args.overwrite = true;
         args.define = variant

From b5323a3ae48ab909050b47e92b2647989a1ce5ea Mon Sep 17 00:00:00 2001
From: firestar99 <firestar99@sydow.cloud>
Date: Wed, 3 Dec 2025 14:09:51 +0100
Subject: [PATCH 3/4] generate: add `--clean` to delete moved or removed files

---
 .github/workflows/ci.yaml | 3 ++-
 xtask/src/generate.rs     | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ae84198..5a1e26e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -53,7 +53,8 @@ jobs:
       - name: xtask build
         run: cd xtask && cargo build
       - name: xtask generate
-        run: cargo xtask generate ${{ matrix.integration }}
+        # generate all variants, since `--clean` deletes `generated/`, not generating all of them will cause changes
+        run: cargo xtask generate --clean
       - name: check generated files are up-to-date
         run: |
           git add .
diff --git a/xtask/src/generate.rs b/xtask/src/generate.rs
index 21ca083..423b629 100644
--- a/xtask/src/generate.rs
+++ b/xtask/src/generate.rs
@@ -69,6 +69,10 @@ pub struct Generate {
     /// Directory where to place the generated templates.
     #[clap(long)]
     out: Option<PathBuf>,
+    /// Clean generate, deletes the generated directory before generating templates. Use this when you moved or removed
+    /// files.
+    #[clap(long)]
+    clean: bool,
     /// A command that should be executed on each generated template.
     ///
     /// If a command fails, this process will fail as well, allowing you to test the template output.
@@ -126,6 +130,10 @@ impl Generate {
             .out
             .clone()
             .unwrap_or_else(|| PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../generated"));
+        debug!("out_base_dir: {}", out.display());
+        if self.clean {
+            std::fs::remove_dir_all(&out)?;
+        }
         std::fs::create_dir_all(&out)?;
         Ok(out)
     }

From b8b0e0e6cab9126f9f723b402a0f89f30bb328e7 Mon Sep 17 00:00:00 2001
From: firestar99 <firestar99@sydow.cloud>
Date: Wed, 3 Dec 2025 14:01:17 +0100
Subject: [PATCH 4/4] rename graphics crates

---
 generated/cargo-gpu/Cargo.toml                                | 4 ++--
 generated/cargo-gpu/{ash-graphics => ash}/Cargo.toml          | 4 ++--
 generated/cargo-gpu/{ash-graphics => ash}/build.rs            | 2 +-
 generated/cargo-gpu/{ash-graphics => ash}/src/device.rs       | 0
 .../ash-graphics => cargo-gpu/ash}/src/graphics.rs            | 2 +-
 generated/cargo-gpu/{ash-graphics => ash}/src/main.rs         | 2 +-
 .../{ash-graphics => ash}/src/single_command_buffer.rs        | 0
 generated/cargo-gpu/{ash-graphics => ash}/src/swapchain.rs    | 0
 .../cargo-gpu/{ash-graphics-shaders => shaders}/Cargo.toml    | 2 +-
 .../cargo-gpu/{ash-graphics-shaders => shaders}/src/lib.rs    | 0
 generated/spirv-builder/Cargo.toml                            | 4 ++--
 generated/spirv-builder/{ash-graphics => ash}/Cargo.toml      | 4 ++--
 generated/spirv-builder/{ash-graphics => ash}/build.rs        | 2 +-
 generated/spirv-builder/{ash-graphics => ash}/src/device.rs   | 0
 .../spirv-builder/ash}/src/graphics.rs                        | 2 +-
 generated/spirv-builder/{ash-graphics => ash}/src/main.rs     | 2 +-
 .../{ash-graphics => ash}/src/single_command_buffer.rs        | 0
 .../spirv-builder/{ash-graphics => ash}/src/swapchain.rs      | 0
 .../spirv-builder/shaders}/Cargo.toml                         | 2 +-
 .../{ash-graphics-shaders => shaders}/src/lib.rs              | 0
 graphics/Cargo.toml.liquid                                    | 4 ++--
 graphics/{ash-graphics => ash}/Cargo.toml.liquid              | 4 ++--
 graphics/{ash-graphics => ash}/build.rs.liquid                | 2 +-
 graphics/{ash-graphics => ash}/src/device.rs                  | 0
 .../cargo-gpu/ash-graphics => graphics/ash}/src/graphics.rs   | 2 +-
 graphics/{ash-graphics => ash}/src/main.rs                    | 2 +-
 graphics/{ash-graphics => ash}/src/single_command_buffer.rs   | 0
 graphics/{ash-graphics => ash}/src/swapchain.rs               | 0
 .../ash-graphics-shaders => graphics/shaders}/Cargo.toml      | 2 +-
 graphics/{ash-graphics-shaders => shaders}/src/lib.rs         | 0
 30 files changed, 24 insertions(+), 24 deletions(-)
 rename generated/cargo-gpu/{ash-graphics => ash}/Cargo.toml (83%)
 rename generated/cargo-gpu/{ash-graphics => ash}/build.rs (92%)
 rename generated/cargo-gpu/{ash-graphics => ash}/src/device.rs (100%)
 rename generated/{spirv-builder/ash-graphics => cargo-gpu/ash}/src/graphics.rs (99%)
 rename generated/cargo-gpu/{ash-graphics => ash}/src/main.rs (99%)
 rename generated/cargo-gpu/{ash-graphics => ash}/src/single_command_buffer.rs (100%)
 rename generated/cargo-gpu/{ash-graphics => ash}/src/swapchain.rs (100%)
 rename generated/cargo-gpu/{ash-graphics-shaders => shaders}/Cargo.toml (86%)
 rename generated/cargo-gpu/{ash-graphics-shaders => shaders}/src/lib.rs (100%)
 rename generated/spirv-builder/{ash-graphics => ash}/Cargo.toml (87%)
 rename generated/spirv-builder/{ash-graphics => ash}/build.rs (91%)
 rename generated/spirv-builder/{ash-graphics => ash}/src/device.rs (100%)
 rename {graphics/ash-graphics => generated/spirv-builder/ash}/src/graphics.rs (99%)
 rename generated/spirv-builder/{ash-graphics => ash}/src/main.rs (99%)
 rename generated/spirv-builder/{ash-graphics => ash}/src/single_command_buffer.rs (100%)
 rename generated/spirv-builder/{ash-graphics => ash}/src/swapchain.rs (100%)
 rename {graphics/ash-graphics-shaders => generated/spirv-builder/shaders}/Cargo.toml (86%)
 rename generated/spirv-builder/{ash-graphics-shaders => shaders}/src/lib.rs (100%)
 rename graphics/{ash-graphics => ash}/Cargo.toml.liquid (90%)
 rename graphics/{ash-graphics => ash}/build.rs.liquid (94%)
 rename graphics/{ash-graphics => ash}/src/device.rs (100%)
 rename {generated/cargo-gpu/ash-graphics => graphics/ash}/src/graphics.rs (99%)
 rename graphics/{ash-graphics => ash}/src/main.rs (99%)
 rename graphics/{ash-graphics => ash}/src/single_command_buffer.rs (100%)
 rename graphics/{ash-graphics => ash}/src/swapchain.rs (100%)
 rename {generated/spirv-builder/ash-graphics-shaders => graphics/shaders}/Cargo.toml (86%)
 rename graphics/{ash-graphics-shaders => shaders}/src/lib.rs (100%)

diff --git a/generated/cargo-gpu/Cargo.toml b/generated/cargo-gpu/Cargo.toml
index 1077aa2..e5a1763 100644
--- a/generated/cargo-gpu/Cargo.toml
+++ b/generated/cargo-gpu/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
-    "ash-graphics",
-    "ash-graphics-shaders"
+    "ash",
+    "shaders"
 ]
 resolver = "3"
 
diff --git a/generated/cargo-gpu/ash-graphics/Cargo.toml b/generated/cargo-gpu/ash/Cargo.toml
similarity index 83%
rename from generated/cargo-gpu/ash-graphics/Cargo.toml
rename to generated/cargo-gpu/ash/Cargo.toml
index 69e3c84..d074c7c 100644
--- a/generated/cargo-gpu/ash-graphics/Cargo.toml
+++ b/generated/cargo-gpu/ash/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ash-graphics"
+name = "graphics-ash"
 publish = false
 version.workspace = true
 authors.workspace = true
@@ -11,7 +11,7 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-ash-graphics-shaders = { path = "../ash-graphics-shaders" }
+graphics-shaders = { path = "../shaders" }
 
 ash.workspace = true
 ash-window.workspace = true
diff --git a/generated/cargo-gpu/ash-graphics/build.rs b/generated/cargo-gpu/ash/build.rs
similarity index 92%
rename from generated/cargo-gpu/ash-graphics/build.rs
rename to generated/cargo-gpu/ash/build.rs
index 9b76628..17c3e01 100644
--- a/generated/cargo-gpu/ash-graphics/build.rs
+++ b/generated/cargo-gpu/ash/build.rs
@@ -4,7 +4,7 @@ use std::path::PathBuf;
 
 pub fn main() -> anyhow::Result<()> {
     let manifest_dir = env!("CARGO_MANIFEST_DIR");
-    let crate_path = [manifest_dir, "..", "ash-graphics-shaders"]
+    let crate_path = [manifest_dir, "..", "shaders"]
         .iter()
         .copied()
         .collect::<PathBuf>();
diff --git a/generated/cargo-gpu/ash-graphics/src/device.rs b/generated/cargo-gpu/ash/src/device.rs
similarity index 100%
rename from generated/cargo-gpu/ash-graphics/src/device.rs
rename to generated/cargo-gpu/ash/src/device.rs
diff --git a/generated/spirv-builder/ash-graphics/src/graphics.rs b/generated/cargo-gpu/ash/src/graphics.rs
similarity index 99%
rename from generated/spirv-builder/ash-graphics/src/graphics.rs
rename to generated/cargo-gpu/ash/src/graphics.rs
index 3760480..18c6437 100644
--- a/generated/spirv-builder/ash-graphics/src/graphics.rs
+++ b/generated/cargo-gpu/ash/src/graphics.rs
@@ -3,7 +3,7 @@ use crate::single_command_buffer::SingleCommandBuffer;
 use crate::swapchain::DrawFrame;
 use anyhow::Context;
 use ash::vk;
-use ash_graphics_shaders::ShaderConstants;
+use graphics_shaders::ShaderConstants;
 use std::sync::Arc;
 
 /// Manages the creation and recreation of [`MyRenderPipeline`], whenever new shader code ([`Self::set_shader_code`])
diff --git a/generated/cargo-gpu/ash-graphics/src/main.rs b/generated/cargo-gpu/ash/src/main.rs
similarity index 99%
rename from generated/cargo-gpu/ash-graphics/src/main.rs
rename to generated/cargo-gpu/ash/src/main.rs
index 9dc0595..45bdd81 100644
--- a/generated/cargo-gpu/ash-graphics/src/main.rs
+++ b/generated/cargo-gpu/ash/src/main.rs
@@ -74,7 +74,7 @@ use crate::device::MyDevice;
 use crate::graphics::{MyRenderPipelineManager, MyRenderer};
 use crate::swapchain::MySwapchainManager;
 use ash::util::read_spv;
-use ash_graphics_shaders::ShaderConstants;
+use graphics_shaders::ShaderConstants;
 use raw_window_handle::HasDisplayHandle as _;
 use winit::event_loop::ActiveEventLoop;
 use winit::{
diff --git a/generated/cargo-gpu/ash-graphics/src/single_command_buffer.rs b/generated/cargo-gpu/ash/src/single_command_buffer.rs
similarity index 100%
rename from generated/cargo-gpu/ash-graphics/src/single_command_buffer.rs
rename to generated/cargo-gpu/ash/src/single_command_buffer.rs
diff --git a/generated/cargo-gpu/ash-graphics/src/swapchain.rs b/generated/cargo-gpu/ash/src/swapchain.rs
similarity index 100%
rename from generated/cargo-gpu/ash-graphics/src/swapchain.rs
rename to generated/cargo-gpu/ash/src/swapchain.rs
diff --git a/generated/cargo-gpu/ash-graphics-shaders/Cargo.toml b/generated/cargo-gpu/shaders/Cargo.toml
similarity index 86%
rename from generated/cargo-gpu/ash-graphics-shaders/Cargo.toml
rename to generated/cargo-gpu/shaders/Cargo.toml
index d340807..c6b52e0 100644
--- a/generated/cargo-gpu/ash-graphics-shaders/Cargo.toml
+++ b/generated/cargo-gpu/shaders/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ash-graphics-shaders"
+name = "graphics-shaders"
 version = "0.1.0"
 edition = "2024"
 
diff --git a/generated/cargo-gpu/ash-graphics-shaders/src/lib.rs b/generated/cargo-gpu/shaders/src/lib.rs
similarity index 100%
rename from generated/cargo-gpu/ash-graphics-shaders/src/lib.rs
rename to generated/cargo-gpu/shaders/src/lib.rs
diff --git a/generated/spirv-builder/Cargo.toml b/generated/spirv-builder/Cargo.toml
index 9cec221..cba5b4e 100644
--- a/generated/spirv-builder/Cargo.toml
+++ b/generated/spirv-builder/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
-    "ash-graphics",
-    "ash-graphics-shaders"
+    "ash",
+    "shaders"
 ]
 resolver = "3"
 
diff --git a/generated/spirv-builder/ash-graphics/Cargo.toml b/generated/spirv-builder/ash/Cargo.toml
similarity index 87%
rename from generated/spirv-builder/ash-graphics/Cargo.toml
rename to generated/spirv-builder/ash/Cargo.toml
index 2dcb360..c144a55 100644
--- a/generated/spirv-builder/ash-graphics/Cargo.toml
+++ b/generated/spirv-builder/ash/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ash-graphics"
+name = "graphics-ash"
 publish = false
 version.workspace = true
 authors.workspace = true
@@ -15,7 +15,7 @@ default = ["use-compiled-tools"]
 use-installed-tools = ["spirv-builder/use-installed-tools"]
 use-compiled-tools = ["spirv-builder/use-compiled-tools"]
 [dependencies]
-ash-graphics-shaders = { path = "../ash-graphics-shaders" }
+graphics-shaders = { path = "../shaders" }
 
 ash.workspace = true
 ash-window.workspace = true
diff --git a/generated/spirv-builder/ash-graphics/build.rs b/generated/spirv-builder/ash/build.rs
similarity index 91%
rename from generated/spirv-builder/ash-graphics/build.rs
rename to generated/spirv-builder/ash/build.rs
index 52f2ea1..278e9b8 100644
--- a/generated/spirv-builder/ash-graphics/build.rs
+++ b/generated/spirv-builder/ash/build.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 pub fn main() -> anyhow::Result<()> {
     let manifest_dir = env!("CARGO_MANIFEST_DIR");
-    let crate_path = [manifest_dir, "..", "ash-graphics-shaders"]
+    let crate_path = [manifest_dir, "..", "shaders"]
         .iter()
         .copied()
         .collect::<PathBuf>();
diff --git a/generated/spirv-builder/ash-graphics/src/device.rs b/generated/spirv-builder/ash/src/device.rs
similarity index 100%
rename from generated/spirv-builder/ash-graphics/src/device.rs
rename to generated/spirv-builder/ash/src/device.rs
diff --git a/graphics/ash-graphics/src/graphics.rs b/generated/spirv-builder/ash/src/graphics.rs
similarity index 99%
rename from graphics/ash-graphics/src/graphics.rs
rename to generated/spirv-builder/ash/src/graphics.rs
index 3760480..18c6437 100644
--- a/graphics/ash-graphics/src/graphics.rs
+++ b/generated/spirv-builder/ash/src/graphics.rs
@@ -3,7 +3,7 @@ use crate::single_command_buffer::SingleCommandBuffer;
 use crate::swapchain::DrawFrame;
 use anyhow::Context;
 use ash::vk;
-use ash_graphics_shaders::ShaderConstants;
+use graphics_shaders::ShaderConstants;
 use std::sync::Arc;
 
 /// Manages the creation and recreation of [`MyRenderPipeline`], whenever new shader code ([`Self::set_shader_code`])
diff --git a/generated/spirv-builder/ash-graphics/src/main.rs b/generated/spirv-builder/ash/src/main.rs
similarity index 99%
rename from generated/spirv-builder/ash-graphics/src/main.rs
rename to generated/spirv-builder/ash/src/main.rs
index 9dc0595..45bdd81 100644
--- a/generated/spirv-builder/ash-graphics/src/main.rs
+++ b/generated/spirv-builder/ash/src/main.rs
@@ -74,7 +74,7 @@ use crate::device::MyDevice;
 use crate::graphics::{MyRenderPipelineManager, MyRenderer};
 use crate::swapchain::MySwapchainManager;
 use ash::util::read_spv;
-use ash_graphics_shaders::ShaderConstants;
+use graphics_shaders::ShaderConstants;
 use raw_window_handle::HasDisplayHandle as _;
 use winit::event_loop::ActiveEventLoop;
 use winit::{
diff --git a/generated/spirv-builder/ash-graphics/src/single_command_buffer.rs b/generated/spirv-builder/ash/src/single_command_buffer.rs
similarity index 100%
rename from generated/spirv-builder/ash-graphics/src/single_command_buffer.rs
rename to generated/spirv-builder/ash/src/single_command_buffer.rs
diff --git a/generated/spirv-builder/ash-graphics/src/swapchain.rs b/generated/spirv-builder/ash/src/swapchain.rs
similarity index 100%
rename from generated/spirv-builder/ash-graphics/src/swapchain.rs
rename to generated/spirv-builder/ash/src/swapchain.rs
diff --git a/graphics/ash-graphics-shaders/Cargo.toml b/generated/spirv-builder/shaders/Cargo.toml
similarity index 86%
rename from graphics/ash-graphics-shaders/Cargo.toml
rename to generated/spirv-builder/shaders/Cargo.toml
index d340807..c6b52e0 100644
--- a/graphics/ash-graphics-shaders/Cargo.toml
+++ b/generated/spirv-builder/shaders/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ash-graphics-shaders"
+name = "graphics-shaders"
 version = "0.1.0"
 edition = "2024"
 
diff --git a/generated/spirv-builder/ash-graphics-shaders/src/lib.rs b/generated/spirv-builder/shaders/src/lib.rs
similarity index 100%
rename from generated/spirv-builder/ash-graphics-shaders/src/lib.rs
rename to generated/spirv-builder/shaders/src/lib.rs
diff --git a/graphics/Cargo.toml.liquid b/graphics/Cargo.toml.liquid
index ff4d92f..97e1458 100644
--- a/graphics/Cargo.toml.liquid
+++ b/graphics/Cargo.toml.liquid
@@ -1,7 +1,7 @@
 [workspace]
 members = [
-    "ash-graphics",
-    "ash-graphics-shaders"
+    "ash",
+    "shaders"
 ]
 resolver = "3"
 
diff --git a/graphics/ash-graphics/Cargo.toml.liquid b/graphics/ash/Cargo.toml.liquid
similarity index 90%
rename from graphics/ash-graphics/Cargo.toml.liquid
rename to graphics/ash/Cargo.toml.liquid
index b4e98ae..4574e79 100644
--- a/graphics/ash-graphics/Cargo.toml.liquid
+++ b/graphics/ash/Cargo.toml.liquid
@@ -1,5 +1,5 @@
 [package]
-name = "ash-graphics"
+name = "graphics-ash"
 publish = false
 version.workspace = true
 authors.workspace = true
@@ -18,7 +18,7 @@ use-compiled-tools = ["spirv-builder/use-compiled-tools"]
 {% endif -%}
 
 [dependencies]
-ash-graphics-shaders = { path = "../ash-graphics-shaders" }
+graphics-shaders = { path = "../shaders" }
 
 ash.workspace = true
 ash-window.workspace = true
diff --git a/graphics/ash-graphics/build.rs.liquid b/graphics/ash/build.rs.liquid
similarity index 94%
rename from graphics/ash-graphics/build.rs.liquid
rename to graphics/ash/build.rs.liquid
index 51e4e3e..0f69a40 100644
--- a/graphics/ash-graphics/build.rs.liquid
+++ b/graphics/ash/build.rs.liquid
@@ -9,7 +9,7 @@ use std::path::PathBuf;
 
 pub fn main() -> anyhow::Result<()> {
     let manifest_dir = env!("CARGO_MANIFEST_DIR");
-    let crate_path = [manifest_dir, "..", "ash-graphics-shaders"]
+    let crate_path = [manifest_dir, "..", "shaders"]
         .iter()
         .copied()
         .collect::<PathBuf>();
diff --git a/graphics/ash-graphics/src/device.rs b/graphics/ash/src/device.rs
similarity index 100%
rename from graphics/ash-graphics/src/device.rs
rename to graphics/ash/src/device.rs
diff --git a/generated/cargo-gpu/ash-graphics/src/graphics.rs b/graphics/ash/src/graphics.rs
similarity index 99%
rename from generated/cargo-gpu/ash-graphics/src/graphics.rs
rename to graphics/ash/src/graphics.rs
index 3760480..18c6437 100644
--- a/generated/cargo-gpu/ash-graphics/src/graphics.rs
+++ b/graphics/ash/src/graphics.rs
@@ -3,7 +3,7 @@ use crate::single_command_buffer::SingleCommandBuffer;
 use crate::swapchain::DrawFrame;
 use anyhow::Context;
 use ash::vk;
-use ash_graphics_shaders::ShaderConstants;
+use graphics_shaders::ShaderConstants;
 use std::sync::Arc;
 
 /// Manages the creation and recreation of [`MyRenderPipeline`], whenever new shader code ([`Self::set_shader_code`])
diff --git a/graphics/ash-graphics/src/main.rs b/graphics/ash/src/main.rs
similarity index 99%
rename from graphics/ash-graphics/src/main.rs
rename to graphics/ash/src/main.rs
index 9dc0595..45bdd81 100644
--- a/graphics/ash-graphics/src/main.rs
+++ b/graphics/ash/src/main.rs
@@ -74,7 +74,7 @@ use crate::device::MyDevice;
 use crate::graphics::{MyRenderPipelineManager, MyRenderer};
 use crate::swapchain::MySwapchainManager;
 use ash::util::read_spv;
-use ash_graphics_shaders::ShaderConstants;
+use graphics_shaders::ShaderConstants;
 use raw_window_handle::HasDisplayHandle as _;
 use winit::event_loop::ActiveEventLoop;
 use winit::{
diff --git a/graphics/ash-graphics/src/single_command_buffer.rs b/graphics/ash/src/single_command_buffer.rs
similarity index 100%
rename from graphics/ash-graphics/src/single_command_buffer.rs
rename to graphics/ash/src/single_command_buffer.rs
diff --git a/graphics/ash-graphics/src/swapchain.rs b/graphics/ash/src/swapchain.rs
similarity index 100%
rename from graphics/ash-graphics/src/swapchain.rs
rename to graphics/ash/src/swapchain.rs
diff --git a/generated/spirv-builder/ash-graphics-shaders/Cargo.toml b/graphics/shaders/Cargo.toml
similarity index 86%
rename from generated/spirv-builder/ash-graphics-shaders/Cargo.toml
rename to graphics/shaders/Cargo.toml
index d340807..c6b52e0 100644
--- a/generated/spirv-builder/ash-graphics-shaders/Cargo.toml
+++ b/graphics/shaders/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ash-graphics-shaders"
+name = "graphics-shaders"
 version = "0.1.0"
 edition = "2024"
 
diff --git a/graphics/ash-graphics-shaders/src/lib.rs b/graphics/shaders/src/lib.rs
similarity index 100%
rename from graphics/ash-graphics-shaders/src/lib.rs
rename to graphics/shaders/src/lib.rs