diff --git a/crates/desktop/artcraft/src/core/lifecycle/startup/tasks/size_and_position_windows.rs b/crates/desktop/artcraft/src/core/lifecycle/startup/tasks/size_and_position_windows.rs
index 2cc710f509..8fc2d11a6c 100644
--- a/crates/desktop/artcraft/src/core/lifecycle/startup/tasks/size_and_position_windows.rs
+++ b/crates/desktop/artcraft/src/core/lifecycle/startup/tasks/size_and_position_windows.rs
@@ -1,6 +1,6 @@
 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::state::window::main_window_position::MainWindowPosition;
+use crate::core::state::window::main_window_size::MainWindowSize;
 use tauri::AppHandle;
 
 pub fn size_and_position_windows(
diff --git a/crates/desktop/artcraft/src/core/state/mod.rs b/crates/desktop/artcraft/src/core/state/mod.rs
index 8516788505..63a8b3548e 100644
--- a/crates/desktop/artcraft/src/core/state/mod.rs
+++ b/crates/desktop/artcraft/src/core/state/mod.rs
@@ -3,8 +3,7 @@ pub mod app_preferences;
 pub mod app_startup_time;
 pub mod data_dir;
 pub mod expanduser;
-pub mod main_window_position;
-pub mod main_window_size;
 pub mod os_platform;
 pub mod provider_priority;
-pub mod task_database;
\ No newline at end of file
+pub mod task_database;
+pub mod window;
\ No newline at end of file
diff --git a/crates/desktop/artcraft/src/core/state/main_window_position.rs b/crates/desktop/artcraft/src/core/state/window/main_window_position.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/state/main_window_position.rs
rename to crates/desktop/artcraft/src/core/state/window/main_window_position.rs
diff --git a/crates/desktop/artcraft/src/core/state/main_window_size.rs b/crates/desktop/artcraft/src/core/state/window/main_window_size.rs
similarity index 100%
rename from crates/desktop/artcraft/src/core/state/main_window_size.rs
rename to crates/desktop/artcraft/src/core/state/window/main_window_size.rs
diff --git a/crates/desktop/artcraft/src/core/state/window/mod.rs b/crates/desktop/artcraft/src/core/state/window/mod.rs
new file mode 100644
index 0000000000..697e172a0a
--- /dev/null
+++ b/crates/desktop/artcraft/src/core/state/window/mod.rs
@@ -0,0 +1,2 @@
+pub mod main_window_position;
+pub mod main_window_size;
\ No newline at end of file
diff --git a/crates/desktop/artcraft/src/core/threads/main_window_thread/main_window_thread.rs b/crates/desktop/artcraft/src/core/threads/main_window_thread/main_window_thread.rs
index 9871287c7d..4c6d8fe83a 100644
--- a/crates/desktop/artcraft/src/core/threads/main_window_thread/main_window_thread.rs
+++ b/crates/desktop/artcraft/src/core/threads/main_window_thread/main_window_thread.rs
@@ -1,7 +1,7 @@
 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::core::state::window::main_window_position::MainWindowPosition;
+use crate::core::state::window::main_window_size::MainWindowSize;
 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;
diff --git a/crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_position_task.rs b/crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_position_task.rs
index c542514f40..b1ca129ac7 100644
--- a/crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_position_task.rs
+++ b/crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_position_task.rs
@@ -1,5 +1,5 @@
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::main_window_position::MainWindowPosition;
+use crate::core::state::window::main_window_position::MainWindowPosition;
 use errors::AnyhowResult;
 use log::info;
 use memory_store::clone_slot::CloneSlot;
diff --git a/crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_resize_task.rs b/crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_resize_task.rs
index a619d6d5c6..9c86fba324 100644
--- a/crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_resize_task.rs
+++ b/crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_resize_task.rs
@@ -1,5 +1,5 @@
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::main_window_size::MainWindowSize;
+use crate::core::state::window::main_window_size::MainWindowSize;
 use crate::core::utils::best_window_size_heuristic::best_window_size_heuristic;
 use errors::AnyhowResult;
 use log::info;
diff --git a/crates/desktop/artcraft/src/lib.rs b/crates/desktop/artcraft/src/lib.rs
index 2f66c02f86..f6891b2210 100644
--- a/crates/desktop/artcraft/src/lib.rs
+++ b/crates/desktop/artcraft/src/lib.rs
@@ -19,8 +19,6 @@ use crate::core::lifecycle::startup::handle_tauri_startup::handle_tauri_startup;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 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::state::provider_priority::ProviderPriorityStore;
 use crate::core::threads::discord_presence_thread::discord_presence_thread;
 use crate::core::threads::main_window_thread::main_window_thread::main_window_thread;