move everything else to core::

crates/desktop/artcraft/src/core/commands/app_preferences/get_app_preferences_command.rs

@@ -1,5 +1,5 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
 use errors::AnyhowResult;
 use log::{error, info};
 use serde_derive::Serialize;

crates/desktop/artcraft/src/core/commands/app_preferences/update_app_preference_command.rs

@@ -1,6 +1,6 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{error, info};

crates/desktop/artcraft/src/core/commands/mod.rs

@@ -1,6 +1,4 @@
 pub mod app_preferences;
 pub mod command_response_wrapper;
-pub mod fal;
 pub mod flip_image;
 pub mod platform_info_command;
-pub mod sora;

crates/desktop/artcraft/src/core/commands/platform_info_command.rs

@@ -1,4 +1,4 @@
-use crate::state::os_platform::OsPlatform;
+use crate::core::state::os_platform::OsPlatform;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use image::codecs::png::{CompressionType, FilterType, PngEncoder};

crates/desktop/artcraft/src/core/events/mod.rs

@@ -1,4 +1,3 @@
 pub mod notification_event;
 pub mod sendable_event_error;
-pub mod sendable_event_trait;
-pub mod sora;
+pub mod sendable_event_trait;

crates/desktop/artcraft/src/core/events/sendable_event_trait.rs

@@ -1,5 +1,5 @@
 use log::info;
-use crate::events::sendable_event_error::SendableEventError;
+use crate::core::events::sendable_event_error::SendableEventError;
 use serde::Serialize;
 use tauri::{AppHandle, Emitter};
 

crates/desktop/artcraft/src/core/mod.rs

@@ -0,0 +1,6 @@
+pub mod commands;
+pub mod events;
+pub mod state;
+pub mod threads;
+pub mod utils;
+pub mod windows;

crates/desktop/artcraft/src/core/state/app_preferences/app_preferences.rs

@@ -1,6 +1,6 @@
-use crate::state::app_preferences::app_preferences_serializable::AppPreferencesSerializable;
-use crate::state::app_preferences::preferred_download_directory::{PreferredDownloadDirectory, SystemDownloadDirectory};
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::app_preferences::app_preferences_serializable::AppPreferencesSerializable;
+use crate::core::state::app_preferences::preferred_download_directory::{PreferredDownloadDirectory, SystemDownloadDirectory};
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 
 #[derive(Clone)]
 pub struct AppPreferences {

crates/desktop/artcraft/src/core/state/app_preferences/app_preferences_manager.rs

@@ -1,5 +1,5 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::app_preferences::app_preferences::AppPreferences;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use memory_store::clone_cell::CloneCell;
 
 pub type AppPreferencesManager = CloneCell<AppPreferences>;

crates/desktop/artcraft/src/core/state/app_preferences/app_preferences_serializable.rs

@@ -1,6 +1,6 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::app_preferences::app_preferences::AppPreferences;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use errors::AnyhowResult;
 use serde_derive::{Deserialize, Serialize};
 

crates/desktop/artcraft/src/core/state/app_preferences/preferred_download_directory.rs

@@ -58,8 +58,8 @@ impl Display for SystemDownloadDirectory {
 
 #[cfg(test)]
 mod tests {
-  use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-  use crate::state::app_preferences::preferred_download_directory::SystemDownloadDirectory;
+  use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+  use crate::core::state::app_preferences::preferred_download_directory::SystemDownloadDirectory;
   use std::str::FromStr;
 
   mod json {

crates/desktop/artcraft/src/core/state/data_dir/app_assets_dir.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use chrono::{DateTime, Local};
 use std::path::{Path, PathBuf};
 

crates/desktop/artcraft/src/core/state/data_dir/app_credentials_dir.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use std::path::{Path, PathBuf};
 
 #[derive(Clone)]

crates/desktop/artcraft/src/core/state/data_dir/app_data_root.rs

@@ -1,12 +1,12 @@
-use crate::state::data_dir::app_assets_dir::AppAssetsDir;
-use crate::state::data_dir::app_credentials_dir::AppCredentialsDir;
-use crate::state::data_dir::app_downloads_dir::AppDownloadsDir;
-use crate::state::data_dir::app_settings_dir::AppSettingsDir;
-use crate::state::data_dir::app_weights_dir::AppWeightsDir;
-use crate::state::data_dir::temporary_dir::TemporaryDir;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::expanduser::expanduser;
-use crate::state::os_platform::OsPlatform;
+use crate::core::state::data_dir::app_assets_dir::AppAssetsDir;
+use crate::core::state::data_dir::app_credentials_dir::AppCredentialsDir;
+use crate::core::state::data_dir::app_downloads_dir::AppDownloadsDir;
+use crate::core::state::data_dir::app_settings_dir::AppSettingsDir;
+use crate::core::state::data_dir::app_weights_dir::AppWeightsDir;
+use crate::core::state::data_dir::temporary_dir::TemporaryDir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::expanduser::expanduser;
+use crate::core::state::os_platform::OsPlatform;
 use anyhow::anyhow;
 use directories::UserDirs;
 use std::path::{Path, PathBuf};

crates/desktop/artcraft/src/core/state/data_dir/app_downloads_dir.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use std::path::{Path, PathBuf};
 
 #[derive(Clone)]

crates/desktop/artcraft/src/core/state/data_dir/app_settings_dir.rs

@@ -1,5 +1,5 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::app_preferences::app_preferences::AppPreferences;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use errors::AnyhowResult;
 use serde::Serialize;
 use std::fs::OpenOptions;

crates/desktop/artcraft/src/core/state/data_dir/app_weights_dir.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use std::path::{Path, PathBuf};
 
 #[derive(Clone)]

crates/desktop/artcraft/src/core/state/data_dir/temporary_dir.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use std::path::{Path, PathBuf};
 use tempdir::TempDir;
 use tempfile::{Builder, NamedTempFile};

crates/desktop/artcraft/src/core/state/expanduser.rs

@@ -43,7 +43,7 @@ pub fn home_dir() -> io::Result<PathBuf> {
 
 #[cfg(test)]
 mod tests {
-    use crate::state::expanduser::expanduser;
+    use crate::core::state::expanduser::expanduser;
     use std::env;
     use std::path::PathBuf;
 

crates/desktop/artcraft/src/core/state/main_window_position.rs

@@ -1,5 +1,5 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::windows::main_window::constants::MAIN_WINDOW_NAME;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::windows::main_window::constants::MAIN_WINDOW_NAME;
 use errors::AnyhowResult;
 use serde_derive::{Deserialize, Serialize};
 use std::fs::OpenOptions;

crates/desktop/artcraft/src/core/state/main_window_size.rs

@@ -1,6 +1,6 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::utils::best_window_size_heuristic::best_window_size_heuristic;
-use crate::windows::main_window::constants::MAIN_WINDOW_NAME;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::utils::best_window_size_heuristic::best_window_size_heuristic;
+use crate::core::windows::main_window::constants::MAIN_WINDOW_NAME;
 use errors::AnyhowResult;
 use serde_derive::{Deserialize, Serialize};
 use std::fs::OpenOptions;

crates/desktop/artcraft/src/core/state/mod.rs

@@ -2,9 +2,6 @@ pub mod app_preferences;
 pub mod app_startup_time;
 pub mod data_dir;
 pub mod expanduser;
-pub mod fal;
 pub mod main_window_position;
 pub mod main_window_size;
-pub mod os_platform;
-pub mod sora;
-pub mod storyteller;
+pub mod os_platform;

crates/desktop/artcraft/src/core/threads/main_window_thread/main_window_thread.rs

@@ -1,11 +1,11 @@
-use crate::state::app_startup_time::AppStartupTime;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_position::MainWindowPosition;
-use crate::state::main_window_size::MainWindowSize;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::threads::main_window_thread::persist_storyteller_cookies_task::persist_storyteller_cookies_task;
-use crate::threads::main_window_thread::persist_window_position_task::persist_window_position_task;
-use crate::threads::main_window_thread::persist_window_resize_task::persist_window_resize_task;
+use crate::core::state::app_startup_time::AppStartupTime;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::main_window_position::MainWindowPosition;
+use crate::core::state::main_window_size::MainWindowSize;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::core::threads::main_window_thread::persist_storyteller_cookies_task::persist_storyteller_cookies_task;
+use crate::core::threads::main_window_thread::persist_window_position_task::persist_window_position_task;
+use crate::core::threads::main_window_thread::persist_window_resize_task::persist_window_resize_task;
 use errors::AnyhowResult;
 use log::{error, info};
 use memory_store::clone_slot::CloneSlot;

crates/desktop/artcraft/src/core/threads/main_window_thread/persist_storyteller_cookies_task.rs

@@ -1,6 +1,6 @@
-use crate::state::app_startup_time::AppStartupTime;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::core::state::app_startup_time::AppStartupTime;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
 use chrono::TimeDelta;
 use errors::AnyhowResult;

crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_position_task.rs

@@ -1,7 +1,7 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_position::MainWindowPosition;
-use crate::state::main_window_size::MainWindowSize;
-use crate::utils::best_window_size_heuristic::best_window_size_heuristic;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::main_window_position::MainWindowPosition;
+use crate::core::state::main_window_size::MainWindowSize;
+use crate::core::utils::best_window_size_heuristic::best_window_size_heuristic;
 use errors::AnyhowResult;
 use log::info;
 use memory_store::clone_slot::CloneSlot;

crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_resize_task.rs

@@ -1,6 +1,6 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_size::MainWindowSize;
-use crate::utils::best_window_size_heuristic::best_window_size_heuristic;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::main_window_size::MainWindowSize;
+use crate::core::utils::best_window_size_heuristic::best_window_size_heuristic;
 use errors::AnyhowResult;
 use log::info;
 use memory_store::clone_slot::CloneSlot;

crates/desktop/artcraft/src/core/threads/mod.rs

@@ -0,0 +1,2 @@
+pub mod discord_presence_thread;
+pub mod main_window_thread;

crates/desktop/artcraft/src/core/utils/large_file_transfer/download.rs

@@ -1,7 +1,7 @@
 //! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs
 
-use crate::utils::large_file_transfer::error::Error;
-use crate::utils::large_file_transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
+use crate::core::utils::large_file_transfer::error::Error;
+use crate::core::utils::large_file_transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use log::info;

crates/desktop/artcraft/src/core/utils/large_file_transfer/upload.rs

@@ -1,7 +1,7 @@
 //! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs
 
-use crate::utils::large_file_transfer::error::Error;
-use crate::utils::large_file_transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
+use crate::core::utils::large_file_transfer::error::Error;
+use crate::core::utils::large_file_transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use reqwest::header::CONTENT_LENGTH;

crates/desktop/artcraft/src/core/utils/mod.rs

@@ -6,5 +6,4 @@ pub mod large_file_transfer;
 pub mod object_store;
 pub mod simple_http_download;
 pub mod simple_http_download_to_tempfile;
-pub mod sora;
 pub mod webview_unsafe;

crates/desktop/artcraft/src/core/windows/mod.rs

@@ -0,0 +1 @@
+pub mod main_window;

crates/desktop/artcraft/src/lib.rs

@@ -1,39 +1,35 @@
-pub mod commands;
-pub mod events;
-pub mod state;
-pub mod threads;
-pub mod utils;
-pub mod windows;
+pub mod core;
+pub mod services;
 
 use tauri::Manager;
 
-use crate::commands::app_preferences::get_app_preferences_command::get_app_preferences_command;
-use crate::commands::app_preferences::update_app_preference_command::update_app_preferences_command;
-use crate::commands::fal::fal_background_removal_command::fal_background_removal_command;
-use crate::commands::fal::fal_kling_image_to_video_command::fal_kling_image_to_video_command;
-use crate::commands::fal::get_fal_api_key_command::get_fal_api_key_command;
-use crate::commands::fal::set_fal_api_key_command::set_fal_api_key_command;
-use crate::commands::flip_image::flip_image;
-use crate::commands::platform_info_command::platform_info_command;
-use crate::commands::sora::check_sora_session_command::check_sora_session_command;
-use crate::commands::sora::open_sora_login_command::open_sora_login_command;
-use crate::commands::sora::sora_image_generation_command::sora_image_generation_command;
-use crate::commands::sora::sora_image_remix_command::sora_image_remix_command;
-use crate::commands::sora::sora_logout_command::sora_logout_command;
-use crate::state::app_preferences::app_preferences_manager::load_app_preferences_or_default;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
-use crate::state::fal::fal_task_queue::FalTaskQueue;
-use crate::state::main_window_position::MainWindowPosition;
-use crate::state::main_window_size::MainWindowSize;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::threads::discord_presence_thread::discord_presence_thread;
-use crate::threads::fal_task_polling_thread::fal_task_polling_thread;
-use crate::threads::main_window_thread::main_window_thread::main_window_thread;
-use crate::threads::sora_task_polling_thread::sora_task_polling_thread;
-use crate::utils::webview_unsafe::webview_unsafe_for_app;
+use crate::core::commands::app_preferences::get_app_preferences_command::get_app_preferences_command;
+use crate::core::commands::app_preferences::update_app_preference_command::update_app_preferences_command;
+use crate::core::commands::flip_image::flip_image;
+use crate::core::commands::platform_info_command::platform_info_command;
+use crate::core::state::app_preferences::app_preferences_manager::load_app_preferences_or_default;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::main_window_position::MainWindowPosition;
+use crate::core::state::main_window_size::MainWindowSize;
+use crate::core::threads::discord_presence_thread::discord_presence_thread;
+use crate::core::threads::main_window_thread::main_window_thread::main_window_thread;
+use crate::core::utils::webview_unsafe::webview_unsafe_for_app;
+use crate::services::fal::commands::fal_background_removal_command::fal_background_removal_command;
+use crate::services::fal::commands::fal_kling_image_to_video_command::fal_kling_image_to_video_command;
+use crate::services::fal::commands::get_fal_api_key_command::get_fal_api_key_command;
+use crate::services::fal::commands::set_fal_api_key_command::set_fal_api_key_command;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::fal::threads::fal_task_polling_thread::fal_task_polling_thread;
+use crate::services::sora::commands::check_sora_session_command::check_sora_session_command;
+use crate::services::sora::commands::open_sora_login_command::open_sora_login_command;
+use crate::services::sora::commands::sora_image_generation_command::sora_image_generation_command;
+use crate::services::sora::commands::sora_image_remix_command::sora_image_remix_command;
+use crate::services::sora::commands::sora_logout_command::sora_logout_command;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::sora::threads::sora_task_polling_thread::sora_task_polling_thread;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 
 use tauri_plugin_dialog;
 use tauri_plugin_http;

crates/desktop/artcraft/src/services/fal/commands/fal_background_removal_command.rs

@@ -1,24 +1,25 @@
-use crate::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult, SerializeMarker};
-use crate::events::sendable_event_trait::SendableEvent;
-use crate::events::sora::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
-use crate::events::sora::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::utils::get_url_file_extension::get_url_file_extension;
-use crate::utils::simple_http_download::simple_http_download;
-use crate::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use crate::core::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult, SerializeMarker};
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::services::sora::events::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
+use crate::services::sora::events::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
 use anyhow::anyhow;
 use base64::prelude::BASE64_STANDARD;
 use base64::{DecodeError, Engine};
 use errors::{AnyhowError, AnyhowResult};
 use fal_client::fal_error_plus::FalErrorPlus;
 use fal_client::requests::remove_background_rembg::remove_background_rembg;
+use filesys::file_read_bytes::file_read_bytes;
 use image::codecs::png::{CompressionType, FilterType, PngEncoder};
 use image::{DynamicImage, EncodableLayout, ImageReader};
 use log::{debug, error, info, warn};
@@ -47,7 +48,6 @@ use storyteller_client::media_files::upload_image_media_file_from_file::upload_i
 use storyteller_client::utils::api_host::ApiHost;
 use tauri::{AppHandle, Emitter, Manager, State};
 use tempfile::NamedTempFile;
-use filesys::file_read_bytes::file_read_bytes;
 use tokens::tokens::media_files::MediaFileToken;
 
 #[derive(Deserialize)]

crates/desktop/artcraft/src/services/fal/commands/fal_kling_image_to_video_command.rs

@@ -1,24 +1,27 @@
-use crate::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult, SerializeMarker};
-use crate::events::sendable_event_trait::SendableEvent;
-use crate::events::sora::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
-use crate::events::sora::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::utils::get_url_file_extension::get_url_file_extension;
-use crate::utils::simple_http_download::simple_http_download;
-use crate::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use crate::core::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult, SerializeMarker};
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::services::sora::events::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
+use crate::services::sora::events::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
 use anyhow::anyhow;
 use base64::prelude::BASE64_STANDARD;
 use base64::{DecodeError, Engine};
 use errors::{AnyhowError, AnyhowResult};
 use fal_client::fal_error_plus::FalErrorPlus;
+use fal_client::requests::enqueue_kling_16_image_to_video::{enqueue_kling_16_image_to_video, Kling16Args, Kling16Duration};
 use fal_client::requests::remove_background_rembg::remove_background_rembg;
+use filesys::file_read_bytes::file_read_bytes;
 use image::codecs::png::{CompressionType, FilterType, PngEncoder};
 use image::{DynamicImage, EncodableLayout, ImageReader};
 use log::{debug, error, info, warn};
@@ -47,10 +50,7 @@ use storyteller_client::media_files::upload_image_media_file_from_file::upload_i
 use storyteller_client::utils::api_host::ApiHost;
 use tauri::{AppHandle, Emitter, Manager, State};
 use tempfile::NamedTempFile;
-use fal_client::requests::enqueue_kling_16_image_to_video::{enqueue_kling_16_image_to_video, Kling16Args, Kling16Duration};
-use filesys::file_read_bytes::file_read_bytes;
 use tokens::tokens::media_files::MediaFileToken;
-use crate::state::fal::fal_task_queue::FalTaskQueue;
 
 #[derive(Deserialize)]
 pub struct FalKlingImageToVideoRequest {

crates/desktop/artcraft/src/services/fal/commands/get_fal_api_key_command.rs

@@ -1,8 +1,8 @@
-use crate::commands::command_response_wrapper::{CommandResult, SerializeMarker};
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
+use crate::core::commands::command_response_wrapper::{CommandResult, SerializeMarker};
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;

crates/desktop/artcraft/src/services/fal/commands/set_fal_api_key_command.rs

@@ -1,8 +1,8 @@
-use crate::commands::command_response_wrapper::CommandResult;
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
+use crate::core::commands::command_response_wrapper::CommandResult;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;

crates/desktop/artcraft/src/services/fal/mod.rs

@@ -0,0 +1,3 @@
+pub mod commands;
+pub mod state;
+pub mod threads;

crates/desktop/artcraft/src/services/fal/state/fal_credential_manager.rs

@@ -1,5 +1,5 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::fal::read_fal_api_key_from_disk::read_fal_api_key_from_disk;
+use crate::services::fal::state::read_fal_api_key_from_disk::read_fal_api_key_from_disk;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;

crates/desktop/artcraft/src/services/fal/state/read_fal_api_key_from_disk.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;

crates/desktop/artcraft/src/services/fal/threads/fal_task_polling_thread.rs

@@ -1,12 +1,12 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use crate::events::sora::sora_image_generation_complete_event::SoraImageGenerationCompleteEvent;
-use crate::events::sora::sora_image_generation_failed_event::SoraImageGenerationFailedEvent;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
-use crate::state::fal::fal_task_queue::FalTaskQueue;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::services::sora::events::sora_image_generation_complete_event::SoraImageGenerationCompleteEvent;
+use crate::services::sora::events::sora_image_generation_failed_event::SoraImageGenerationFailedEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use errors::AnyhowResult;
 use fal_client::export::queue::Status;
 use fal_client::fal_error_plus::FalErrorPlus;

crates/desktop/artcraft/src/services/fal/threads/mod.rs

@@ -0,0 +1 @@
+pub mod fal_task_polling_thread;

crates/desktop/artcraft/src/services/mod.rs

@@ -0,0 +1,3 @@
+pub mod fal;
+pub mod sora;
+pub mod storyteller;

crates/desktop/artcraft/src/services/sora/commands/check_sora_session_command.rs

@@ -1,10 +1,9 @@
-use std::ops::Add;
+use crate::core::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use chrono::{DateTime, TimeDelta, Utc};
-use crate::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use errors::AnyhowResult;
 use log::{error, info};
 use once_cell::sync::Lazy;
@@ -12,6 +11,7 @@ use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
 use openai_sora_client::requests::list_media::list_media::list_media;
 use serde_derive::Serialize;
+use std::ops::Add;
 use tauri::{AppHandle, State};
 
 const CACHE_PERIOD : TimeDelta = TimeDelta::milliseconds(1000 * 60 * 5); // 5 minutes

crates/desktop/artcraft/src/services/sora/commands/open_sora_login_command.rs

@@ -1,7 +1,7 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use errors::AnyhowResult;
 use log::{error, info};
 use once_cell::sync::Lazy;

crates/desktop/artcraft/src/services/sora/commands/sora_image_generation_command.rs

@@ -1,6 +1,6 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use errors::AnyhowResult;

crates/desktop/artcraft/src/services/sora/commands/sora_image_remix_command.rs

@@ -1,15 +1,15 @@
-use crate::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult};
-use crate::events::sendable_event_trait::SendableEvent;
-use crate::events::sora::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
-use crate::events::sora::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::utils::get_url_file_extension::get_url_file_extension;
-use crate::utils::simple_http_download::simple_http_download;
+use crate::core::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult};
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::services::sora::events::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
+use crate::services::sora::events::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::simple_http_download::simple_http_download;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use errors::{AnyhowError, AnyhowResult};

crates/desktop/artcraft/src/services/sora/commands/sora_logout_command.rs

@@ -1,9 +1,9 @@
-use crate::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
-use crate::commands::command_response_wrapper::{CommandResult, CommandSuccessResponseWrapper, SimpleCommandResult};
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
+use crate::core::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
+use crate::core::commands::command_response_wrapper::{CommandResult, CommandSuccessResponseWrapper, SimpleCommandResult};
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use errors::{AnyhowError, AnyhowResult};
 use log::{error, info};
 use once_cell::sync::Lazy;

crates/desktop/artcraft/src/services/sora/events/sora_image_enqueue_failure_event.rs

@@ -1,4 +1,4 @@
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
 use serde_derive::Serialize;
 
 #[derive(Debug, Clone, Serialize)]

crates/desktop/artcraft/src/services/sora/events/sora_image_enqueue_success_event.rs

@@ -1,4 +1,4 @@
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
 use serde_derive::Serialize;
 
 #[derive(Debug, Clone, Serialize)]

crates/desktop/artcraft/src/services/sora/events/sora_image_generation_complete_event.rs

@@ -1,6 +1,6 @@
 use serde_derive::Serialize;
 use tokens::tokens::media_files::MediaFileToken;
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
 
 #[derive(Debug, Clone, Serialize)]
 pub struct SoraImageGenerationCompleteEvent {

crates/desktop/artcraft/src/services/sora/events/sora_image_generation_failed_event.rs

@@ -1,5 +1,5 @@
 use serde_derive::Serialize;
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
 
 #[derive(Debug, Clone, Serialize)]
 pub struct SoraImageGenerationFailedEvent {

crates/desktop/artcraft/src/services/sora/events/sora_login_success_event.rs

@@ -1,4 +1,4 @@
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
 use serde_derive::Serialize;
 
 #[derive(Debug, Clone, Serialize)]

crates/desktop/artcraft/src/services/sora/mod.rs

@@ -0,0 +1,5 @@
+pub mod commands;
+pub mod events;
+pub mod state;
+pub mod threads;
+pub mod windows;

crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::info;

crates/desktop/artcraft/src/services/sora/state/mod.rs

@@ -1,3 +1,4 @@
+pub mod initialize_sora_jwt_bearer_token;
 pub mod read_sora_credentials_from_disk;
 pub mod read_sora_credentials_from_disk_with_upgrade;
 pub mod sora_credential_holder;

crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use openai_sora_client::creds::sora_cookies::SoraCookies;

crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs

@@ -1,4 +1,4 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{info, warn};

crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs

@@ -1,7 +1,7 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::sora::sora_credential_stats::SoraCredentialStats;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_stats::SoraCredentialStats;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{error, info, warn};

crates/desktop/artcraft/src/services/sora/state/sora_task_queue.rs

@@ -1,8 +1,8 @@
-use std::collections::HashSet;
 use chrono::{DateTime, Utc};
 use errors::AnyhowResult;
 use indexmap::IndexMap;
 use openai_sora_client::requests::image_gen::image_gen_status::TaskId;
+use std::collections::HashSet;
 use std::sync::{Arc, RwLock};
 
 #[derive(Clone)]
@@ -152,9 +152,9 @@ impl SoraTaskQueue {
 
 #[cfg(test)]
 mod tests {
+  use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
   use errors::AnyhowResult;
   use openai_sora_client::requests::image_gen::image_gen_status::TaskId;
-  use crate::state::sora::sora_task_queue::SoraTaskQueue;
 
   #[test]
   fn remove_list() -> AnyhowResult<()> {

crates/desktop/artcraft/src/services/sora/threads/mod.rs

@@ -0,0 +1 @@
+pub mod sora_task_polling_thread;

crates/desktop/artcraft/src/services/sora/threads/sora_task_polling_thread.rs

@@ -1,11 +1,11 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use crate::events::sora::sora_image_generation_complete_event::SoraImageGenerationCompleteEvent;
-use crate::events::sora::sora_image_generation_failed_event::SoraImageGenerationFailedEvent;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::services::sora::events::sora_image_generation_complete_event::SoraImageGenerationCompleteEvent;
+use crate::services::sora::events::sora_image_generation_failed_event::SoraImageGenerationFailedEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use errors::AnyhowResult;
 use log::{error, info};
 use openai_sora_client::recipes::list_sora_task_status_with_session_auto_renew::{list_sora_task_status_with_session_auto_renew, StatusRequestArgs};

crates/desktop/artcraft/src/services/sora/windows/mod.rs

@@ -0,0 +1 @@
+pub mod sora_login_window;

crates/desktop/artcraft/src/services/sora/windows/sora_login_window/keep_on_login_domains.rs

@@ -1,4 +1,4 @@
-use crate::windows::sora_login_window::open_sora_login_window::SORA_LOGIN_URL;
+use crate::services::sora::windows::sora_login_window::open_sora_login_window::SORA_LOGIN_URL;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::info;