diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/object/enqueue_image_to_3d_object_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/enqueue_image_to_3d_object_command.rs
similarity index 97%
rename from crates/desktop/artcraft/src/core/commands/enqueue/object/enqueue_image_to_3d_object_command.rs
rename to crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/enqueue_image_to_3d_object_command.rs
index cdd1ce24d3..881575303d 100644
--- a/crates/desktop/artcraft/src/core/commands/enqueue/object/enqueue_image_to_3d_object_command.rs
+++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/enqueue_image_to_3d_object_command.rs
@@ -1,12 +1,15 @@
-use crate::core::commands::enqueue::object::generic::handle_object::handle_object;
-use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
+use crate::core::commands::enqueue::image_to_object::generic::handle_object::handle_object;
+use crate::core::commands::enqueue::image_to_object::internal_object_error::InternalObjectError;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
 use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::core::state::task_database::TaskDatabase;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
@@ -16,9 +19,6 @@ use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
 use tauri::{AppHandle, State};
 use tokens::tokens::media_files::MediaFileToken;
-use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
-use crate::core::state::task_database::TaskDatabase;
 
 #[derive(Deserialize)]
 pub struct EnqueueImageTo3dObjectRequest {
diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object.rs
similarity index 80%
rename from crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object.rs
rename to crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object.rs
index 516df03548..5f82d60f8a 100644
--- a/crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object.rs
+++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object.rs
@@ -1,7 +1,7 @@
-use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::EnqueueImageTo3dObjectRequest;
-use crate::core::commands::enqueue::object::generic::handle_object_artcraft::handle_object_artcraft;
-use crate::core::commands::enqueue::object::generic::handle_object_fal::handle_object_fal;
-use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
+use crate::core::commands::enqueue::image_to_object::enqueue_image_to_3d_object_command::EnqueueImageTo3dObjectRequest;
+use crate::core::commands::enqueue::image_to_object::generic::handle_object_artcraft::handle_object_artcraft;
+use crate::core::commands::enqueue::image_to_object::generic::handle_object_fal::handle_object_fal;
+use crate::core::commands::enqueue::image_to_object::internal_object_error::InternalObjectError;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object_artcraft.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object_artcraft.rs
similarity index 95%
rename from crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object_artcraft.rs
rename to crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object_artcraft.rs
index 3c38444e70..2e746991e2 100644
--- a/crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object_artcraft.rs
+++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object_artcraft.rs
@@ -1,5 +1,5 @@
-use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::{EnqueueImageTo3dObjectModel, EnqueueImageTo3dObjectRequest};
-use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
+use crate::core::commands::enqueue::image_to_object::enqueue_image_to_3d_object_command::{EnqueueImageTo3dObjectModel, EnqueueImageTo3dObjectRequest};
+use crate::core::commands::enqueue::image_to_object::internal_object_error::InternalObjectError;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object_fal.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object_fal.rs
similarity index 94%
rename from crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object_fal.rs
rename to crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object_fal.rs
index 636d483bc7..7a7ccfa1c5 100644
--- a/crates/desktop/artcraft/src/core/commands/enqueue/object/generic/handle_object_fal.rs
+++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/handle_object_fal.rs
@@ -1,5 +1,5 @@
-use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::{EnqueueImageTo3dObjectModel, EnqueueImageTo3dObjectRequest};
-use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
+use crate::core::commands::enqueue::image_to_object::enqueue_image_to_3d_object_command::{EnqueueImageTo3dObjectModel, EnqueueImageTo3dObjectRequest};
+use crate::core::commands::enqueue::image_to_object::internal_object_error::InternalObjectError;
 use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/object/generic/mod.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/mod.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/enqueue/object/generic/mod.rs
rename to crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/generic/mod.rs
diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/object/internal_object_error.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/internal_object_error.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/enqueue/object/internal_object_error.rs
rename to crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/internal_object_error.rs
diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/object/mod.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/mod.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/commands/enqueue/object/mod.rs
rename to crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/mod.rs
diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/mod.rs b/crates/desktop/artcraft/src/core/commands/enqueue/mod.rs
index 4e79af96e3..1434ea5d9c 100644
--- a/crates/desktop/artcraft/src/core/commands/enqueue/mod.rs
+++ b/crates/desktop/artcraft/src/core/commands/enqueue/mod.rs
@@ -1,7 +1,7 @@
 pub mod image_bg_removal;
 pub mod image_edit;
 pub mod image_inpaint;
+pub mod image_to_object;
 pub mod image_to_video;
-pub mod object;
 pub mod task_enqueue_success;
 pub mod text_to_image;
\ No newline at end of file
diff --git a/crates/desktop/artcraft/src/lib.rs b/crates/desktop/artcraft/src/lib.rs
index 3c95ecedee..3ea90f483f 100644
--- a/crates/desktop/artcraft/src/lib.rs
+++ b/crates/desktop/artcraft/src/lib.rs
@@ -8,8 +8,8 @@ use crate::core::commands::app_preferences::update_app_preference_command::updat
 use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::enqueue_image_bg_removal_command;
 use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::enqueue_contextual_edit_image_command;
 use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::enqueue_image_inpaint_command;
+use crate::core::commands::enqueue::image_to_object::enqueue_image_to_3d_object_command::enqueue_image_to_3d_object_command;
 use crate::core::commands::enqueue::image_to_video::enqueue_image_to_video_command::enqueue_image_to_video_command;
-use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::enqueue_image_to_3d_object_command;
 use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::enqueue_text_to_image_command;
 use crate::core::commands::flip_image::flip_image;
 use crate::core::commands::get_app_info_command::get_app_info_command;