diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/artcraft/mod.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/artcraft/mod.rs
deleted file mode 100644
index 4738550231..0000000000
--- a/crates/desktop/artcraft/src/core/commands/generate/generate_image/artcraft/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub(super) mod handle_artcraft_via_omni_endpoint;
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/generate_image_command.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/generate_image_command.rs
index d6c26dc5ec..611046e178 100644
--- a/crates/desktop/artcraft/src/core/commands/generate/generate_image/generate_image_command.rs
+++ b/crates/desktop/artcraft/src/core/commands/generate/generate_image/generate_image_command.rs
@@ -10,7 +10,7 @@ use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{
   enqueue_text_to_image_command, EnqueueTextToImageRequest, TextToImageModel,
 };
-use crate::core::commands::generate::generate_image::artcraft::handle_artcraft_via_omni_endpoint::handle_artcraft_via_omni_endpoint;
+use crate::core::commands::generate::generate_image::providers::artcraft::handle_artcraft_via_omni_endpoint::handle_artcraft_via_omni_endpoint;
 use crate::core::commands::generate::generate_image::tauri_generate_image_request::{
   TauriGenerateImageErrorType, TauriGenerateImageRequest, TauriGenerateImageResponse,
 };
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/mod.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/mod.rs
index 432b9931d7..c3fc5a9b7b 100644
--- a/crates/desktop/artcraft/src/core/commands/generate/generate_image/mod.rs
+++ b/crates/desktop/artcraft/src/core/commands/generate/generate_image/mod.rs
@@ -1,4 +1,4 @@
-mod artcraft;
 pub mod generate_image_command;
+pub mod providers;
 pub mod tauri_generate_image_request;
 pub mod tauri_image_model;
\ No newline at end of file
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/artcraft/handle_artcraft_via_omni_endpoint.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/handle_artcraft_via_omni_endpoint.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/generate/generate_image/artcraft/handle_artcraft_via_omni_endpoint.rs
rename to crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/handle_artcraft_via_omni_endpoint.rs
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/mod.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/mod.rs
new file mode 100644
index 0000000000..af712f0cb7
--- /dev/null
+++ b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/mod.rs
@@ -0,0 +1 @@
+pub mod handle_artcraft_via_omni_endpoint;
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/grok/handle_grok.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/grok/handle_grok.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/generate/generate_image/grok/handle_grok.rs
rename to crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/grok/handle_grok.rs
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/grok/mod.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/grok/mod.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/generate/generate_image/grok/mod.rs
rename to crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/grok/mod.rs
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/midjourney/handle_midjourney.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/midjourney/handle_midjourney.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/generate/generate_image/midjourney/handle_midjourney.rs
rename to crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/midjourney/handle_midjourney.rs
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/midjourney/mod.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/midjourney/mod.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/generate/generate_image/midjourney/mod.rs
rename to crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/midjourney/mod.rs
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/mod.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/mod.rs
new file mode 100644
index 0000000000..8a4247a99f
--- /dev/null
+++ b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/mod.rs
@@ -0,0 +1 @@
+pub mod artcraft;
\ No newline at end of file
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/sora/handle_gpt_image_1_sora_text_to_image.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/sora/handle_gpt_image_1_sora_text_to_image.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/generate/generate_image/sora/handle_gpt_image_1_sora_text_to_image.rs
rename to crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/sora/handle_gpt_image_1_sora_text_to_image.rs
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/sora/handle_text_to_image_sora.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/sora/handle_text_to_image_sora.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/generate/generate_image/sora/handle_text_to_image_sora.rs
rename to crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/sora/handle_text_to_image_sora.rs
diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/sora/mod.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/sora/mod.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/generate/generate_image/sora/mod.rs
rename to crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/sora/mod.rs