diff --git a/Cargo.toml b/Cargo.toml
index 441478acf9..5fc8e6314a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,6 +6,7 @@ resolver = "2"
 members = [
   # API clients for external services
   # These might be custom implementations or wrappers over other client libraries.
+  "crates/api_clients/artcraft_api_defs", # TODO: api_clients/{artcraft}/{api_defs,client}
   "crates/api_clients/cloud_storage",
   "crates/api_clients/fal_client",
   "crates/api_clients/google_drive_common",
@@ -97,7 +98,6 @@ members = [
   #"crates/schema/database/sqlite_queries",
 
   # Schema (public): common strongly-typed tokens, ids, payloads, etc.
-  "crates/schema/public/api/artcraft_api_defs",
   "crates/schema/public/composite_identifiers",
   "crates/schema/public/enums",
   "crates/schema/public/enums_public",
@@ -178,6 +178,40 @@ publish = false
 #
 workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }
 
+# Internal libs
+# Setting paths here ensures we don't need to do so in every crate's Cargo.toml
+# It makes refactoring much easier.
+artcraft_api_defs = { path = "crates/api_clients/artcraft_api_defs" }
+build_metadata = { path = "crates/lib/build_metadata" }
+cloud_storage = { path = "crates/api_clients/cloud_storage" }
+cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
+component_traits = { path = "crates/service/plugins/component_traits" }
+cookie_store = { path = "crates/lib/cookie_store" }
+crockford = { path = "crates/lib/data/crockford" }
+enums = { path = "crates/schema/public/enums" }
+enums_public = { path = "crates/schema/public/enums_public" }
+errors = { path = "crates/lib/errors" }
+fal_client = { path = "crates/api_clients/fal_client" }
+file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
+filesys = { path = "crates/lib/files/filesys" }
+idempotency = { path = "crates/lib/idempotency" }
+images = { path = "crates/lib/files/images" }
+jwt_light = { path = "crates/lib/jwt_light" }
+memory_caching = { path = "crates/lib/caching/memory_caching" }
+memory_store = { path = "crates/lib/caching/memory_store" }
+midjourney_client = { path = "crates/api_clients/midjourney_client" }
+mimetypes = { path = "crates/lib/files/mimetypes" }
+openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
+primitives = { path = "crates/lib/data/primitives" }
+shared_service_components = { path = "crates/lib/shared_service_components" }
+sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
+storyteller_client = { path = "crates/api_clients/storyteller_client" }
+subprocess_common = { path = "crates/lib/subprocess_common" }
+test_data = { path = "crates/lib/test_data" }
+testing = { path = "crates/lib/testing" }
+tokens = { path = "crates/schema/public/tokens" }
+web_base64 = { path = "crates/lib/data/web_base64" }
+
 # External libs
 # Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace
 # If a crate needs to use an older/newer version, the dependency should be managed in that crate's own Cargo.toml
@@ -221,35 +255,3 @@ thiserror = "2.0.12"
 tokio = { version = "1.45.1", features = ["macros"] }
 toml = "0.8.22"
 url = { version = "2.5.4", features = ["serde"] }
-
-# Internal libs
-artcraft_api_defs = { path = "crates/schema/public/api/artcraft_api_defs" }
-build_metadata = { path = "crates/lib/build_metadata" }
-cloud_storage = { path = "crates/api_clients/cloud_storage" }
-cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
-component_traits = { path = "crates/service/plugins/component_traits" }
-cookie_store = { path = "crates/lib/cookie_store" }
-crockford = { path = "crates/lib/data/crockford" }
-enums = { path = "crates/schema/public/enums" }
-enums_public = { path = "crates/schema/public/enums_public" }
-errors = { path = "crates/lib/errors" }
-fal_client = { path = "crates/api_clients/fal_client" }
-file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
-filesys = { path = "crates/lib/files/filesys" }
-idempotency = { path = "crates/lib/idempotency" }
-images = { path = "crates/lib/files/images" }
-jwt_light = { path = "crates/lib/jwt_light" }
-memory_caching = { path = "crates/lib/caching/memory_caching" }
-memory_store = { path = "crates/lib/caching/memory_store" }
-midjourney_client = { path = "crates/api_clients/midjourney_client" }
-mimetypes = { path = "crates/lib/files/mimetypes" }
-openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
-primitives = { path = "crates/lib/data/primitives" }
-shared_service_components = { path = "crates/lib/shared_service_components" }
-sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
-storyteller_client = { path = "crates/api_clients/storyteller_client" }
-subprocess_common = { path = "crates/lib/subprocess_common" }
-test_data = { path = "crates/lib/test_data" }
-testing = { path = "crates/lib/testing" }
-tokens = { path = "crates/schema/public/tokens" }
-web_base64 = { path = "crates/lib/data/web_base64" }
diff --git a/crates/schema/public/api/artcraft_api_defs/Cargo.toml b/crates/api_clients/artcraft_api_defs/Cargo.toml
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/Cargo.toml
rename to crates/api_clients/artcraft_api_defs/Cargo.toml
diff --git a/crates/schema/public/api/artcraft_api_defs/src/common/mod.rs b/crates/api_clients/artcraft_api_defs/src/common/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/common/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/common/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/common/responses/cover_image_links.rs b/crates/api_clients/artcraft_api_defs/src/common/responses/cover_image_links.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/common/responses/cover_image_links.rs
rename to crates/api_clients/artcraft_api_defs/src/common/responses/cover_image_links.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/common/responses/job_details.rs b/crates/api_clients/artcraft_api_defs/src/common/responses/job_details.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/common/responses/job_details.rs
rename to crates/api_clients/artcraft_api_defs/src/common/responses/job_details.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/common/responses/media_file_cover_image_details.rs b/crates/api_clients/artcraft_api_defs/src/common/responses/media_file_cover_image_details.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/common/responses/media_file_cover_image_details.rs
rename to crates/api_clients/artcraft_api_defs/src/common/responses/media_file_cover_image_details.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/common/responses/media_links.rs b/crates/api_clients/artcraft_api_defs/src/common/responses/media_links.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/common/responses/media_links.rs
rename to crates/api_clients/artcraft_api_defs/src/common/responses/media_links.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/common/responses/mod.rs b/crates/api_clients/artcraft_api_defs/src/common/responses/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/common/responses/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/common/responses/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/common/responses/simple_entity_stats.rs b/crates/api_clients/artcraft_api_defs/src/common/responses/simple_entity_stats.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/common/responses/simple_entity_stats.rs
rename to crates/api_clients/artcraft_api_defs/src/common/responses/simple_entity_stats.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/common/responses/user_details_light.rs b/crates/api_clients/artcraft_api_defs/src/common/responses/user_details_light.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/common/responses/user_details_light.rs
rename to crates/api_clients/artcraft_api_defs/src/common/responses/user_details_light.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/flux_pro_kontext_max_edit_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/edit/flux_pro_kontext_max_edit_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/flux_pro_kontext_max_edit_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/edit/flux_pro_kontext_max_edit_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/gemini_25_flash_edit_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/edit/gemini_25_flash_edit_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/gemini_25_flash_edit_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/edit/gemini_25_flash_edit_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/gpt_image_1_edit_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/edit/gpt_image_1_edit_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/gpt_image_1_edit_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/edit/gpt_image_1_edit_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/mod.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/edit/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/edit/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/qwen_edit_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/edit/qwen_edit_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/qwen_edit_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/edit/qwen_edit_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/seededit_3_edit_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/edit/seededit_3_edit_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/edit/seededit_3_edit_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/edit/seededit_3_edit_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_flux_1_dev_text_to_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/generate_flux_1_dev_text_to_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_flux_1_dev_text_to_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/generate_flux_1_dev_text_to_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_flux_1_schnell_text_to_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/generate_flux_1_schnell_text_to_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_flux_1_schnell_text_to_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/generate_flux_1_schnell_text_to_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_flux_pro_11_text_to_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/generate_flux_pro_11_text_to_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_flux_pro_11_text_to_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/generate_flux_pro_11_text_to_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_flux_pro_11_ultra_text_to_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/generate_flux_pro_11_ultra_text_to_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_flux_pro_11_ultra_text_to_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/generate_flux_pro_11_ultra_text_to_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_gpt_image_1_text_to_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/generate_gpt_image_1_text_to_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/generate_gpt_image_1_text_to_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/generate_gpt_image_1_text_to_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/inpaint/flux_dev_juggernaut_inpaint_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/inpaint/flux_dev_juggernaut_inpaint_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/inpaint/flux_dev_juggernaut_inpaint_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/inpaint/flux_dev_juggernaut_inpaint_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/inpaint/flux_pro_1_inpaint_image.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/inpaint/flux_pro_1_inpaint_image.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/inpaint/flux_pro_1_inpaint_image.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/inpaint/flux_pro_1_inpaint_image.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/inpaint/mod.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/inpaint/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/inpaint/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/inpaint/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/mod.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/image/remove_image_background.rs b/crates/api_clients/artcraft_api_defs/src/generate/image/remove_image_background.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/image/remove_image_background.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/image/remove_image_background.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/mod.rs b/crates/api_clients/artcraft_api_defs/src/generate/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/object/generate_hunyuan_2_0_image_to_3d.rs b/crates/api_clients/artcraft_api_defs/src/generate/object/generate_hunyuan_2_0_image_to_3d.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/object/generate_hunyuan_2_0_image_to_3d.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/object/generate_hunyuan_2_0_image_to_3d.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/object/generate_hunyuan_2_1_image_to_3d.rs b/crates/api_clients/artcraft_api_defs/src/generate/object/generate_hunyuan_2_1_image_to_3d.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/object/generate_hunyuan_2_1_image_to_3d.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/object/generate_hunyuan_2_1_image_to_3d.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/object/mod.rs b/crates/api_clients/artcraft_api_defs/src/generate/object/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/object/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/object/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_kling_1_6_pro_image_to_video.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/generate_kling_1_6_pro_image_to_video.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_kling_1_6_pro_image_to_video.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/generate_kling_1_6_pro_image_to_video.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_kling_2_1_master_image_to_video.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/generate_kling_2_1_master_image_to_video.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_kling_2_1_master_image_to_video.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/generate_kling_2_1_master_image_to_video.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_kling_2_1_pro_image_to_video.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/generate_kling_2_1_pro_image_to_video.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_kling_2_1_pro_image_to_video.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/generate_kling_2_1_pro_image_to_video.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_seedance_1_0_lite_image_to_video.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/generate_seedance_1_0_lite_image_to_video.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_seedance_1_0_lite_image_to_video.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/generate_seedance_1_0_lite_image_to_video.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_seedance_1_0_pro_image_to_video.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/generate_seedance_1_0_pro_image_to_video.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_seedance_1_0_pro_image_to_video.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/generate_seedance_1_0_pro_image_to_video.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_veo_2_image_to_video.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/generate_veo_2_image_to_video.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_veo_2_image_to_video.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/generate_veo_2_image_to_video.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_veo_3_fast_image_to_video.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/generate_veo_3_fast_image_to_video.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_veo_3_fast_image_to_video.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/generate_veo_3_fast_image_to_video.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_veo_3_image_to_video.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/generate_veo_3_image_to_video.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/generate_veo_3_image_to_video.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/generate_veo_3_image_to_video.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/generate/video/mod.rs b/crates/api_clients/artcraft_api_defs/src/generate/video/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/generate/video/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/generate/video/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/jobs/list_session_jobs.rs b/crates/api_clients/artcraft_api_defs/src/jobs/list_session_jobs.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/jobs/list_session_jobs.rs
rename to crates/api_clients/artcraft_api_defs/src/jobs/list_session_jobs.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/jobs/mod.rs b/crates/api_clients/artcraft_api_defs/src/jobs/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/jobs/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/jobs/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/lib.rs b/crates/api_clients/artcraft_api_defs/src/lib.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/lib.rs
rename to crates/api_clients/artcraft_api_defs/src/lib.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs b/crates/api_clients/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs
rename to crates/api_clients/artcraft_api_defs/src/media_file/list_batch_generated_media_files.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/media_file/mod.rs b/crates/api_clients/artcraft_api_defs/src/media_file/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/media_file/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/media_file/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/prompts/create_prompt.rs b/crates/api_clients/artcraft_api_defs/src/prompts/create_prompt.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/prompts/create_prompt.rs
rename to crates/api_clients/artcraft_api_defs/src/prompts/create_prompt.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/prompts/mod.rs b/crates/api_clients/artcraft_api_defs/src/prompts/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/prompts/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/prompts/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs b/crates/api_clients/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs
rename to crates/api_clients/artcraft_api_defs/src/stripe_artcraft/create_credits_pack_checkout.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/stripe_artcraft/create_customer_portal_session.rs b/crates/api_clients/artcraft_api_defs/src/stripe_artcraft/create_customer_portal_session.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/stripe_artcraft/create_customer_portal_session.rs
rename to crates/api_clients/artcraft_api_defs/src/stripe_artcraft/create_customer_portal_session.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs b/crates/api_clients/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs
rename to crates/api_clients/artcraft_api_defs/src/stripe_artcraft/create_subscription_checkout.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/stripe_artcraft/mod.rs b/crates/api_clients/artcraft_api_defs/src/stripe_artcraft/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/stripe_artcraft/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/stripe_artcraft/mod.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/wallets/get_primary_wallet_for_user.rs b/crates/api_clients/artcraft_api_defs/src/wallets/get_primary_wallet_for_user.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/wallets/get_primary_wallet_for_user.rs
rename to crates/api_clients/artcraft_api_defs/src/wallets/get_primary_wallet_for_user.rs
diff --git a/crates/schema/public/api/artcraft_api_defs/src/wallets/mod.rs b/crates/api_clients/artcraft_api_defs/src/wallets/mod.rs
similarity index 100%
rename from crates/schema/public/api/artcraft_api_defs/src/wallets/mod.rs
rename to crates/api_clients/artcraft_api_defs/src/wallets/mod.rs