From 54e86b26884e45bcd0a60f987280e7d991936052 Mon Sep 17 00:00:00 2001
From: GarandPLG <garandplg@garandplg.com>
Date: Sun, 19 Apr 2026 18:02:36 +0200
Subject: [PATCH] Move buildings and units under skirmish_states

Reorganize the codebase by moving the buildings and units modules
into the skirmish_states namespace, updating imports accordingly.
---
 src/app/mod.rs                                         | 2 --
 src/app/states/skirmish.rs                             | 2 +-
 src/app/states/skirmish_states/board.rs                | 4 +---
 src/app/{ => states/skirmish_states}/buildings/base.rs | 0
 src/app/{ => states/skirmish_states}/buildings/mod.rs  | 0
 src/app/states/skirmish_states/mod.rs                  | 2 ++
 src/app/{ => states/skirmish_states}/units/miner.rs    | 0
 src/app/{ => states/skirmish_states}/units/mod.rs      | 0
 8 files changed, 4 insertions(+), 6 deletions(-)
 rename src/app/{ => states/skirmish_states}/buildings/base.rs (100%)
 rename src/app/{ => states/skirmish_states}/buildings/mod.rs (100%)
 rename src/app/{ => states/skirmish_states}/units/miner.rs (100%)
 rename src/app/{ => states/skirmish_states}/units/mod.rs (100%)

diff --git a/src/app/mod.rs b/src/app/mod.rs
index 14679f5..6a4c3a0 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -1,12 +1,10 @@
 mod app;
-mod buildings;
 pub mod helpers;
 mod keybind;
 mod keybindings;
 mod state;
 pub mod states;
 pub mod threads;
-mod units;
 pub mod view;
 mod views;
 mod widgets;
diff --git a/src/app/states/skirmish.rs b/src/app/states/skirmish.rs
index 1126aaf..b475dbd 100644
--- a/src/app/states/skirmish.rs
+++ b/src/app/states/skirmish.rs
@@ -1,4 +1,4 @@
-use crate::app::{buildings::BaseBuilding, states::skirmish_states::BoardState, units::MinerUnit};
+use crate::app::states::skirmish_states::{BoardState, buildings::BaseBuilding, units::MinerUnit};
 use clap::ValueEnum;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
diff --git a/src/app/states/skirmish_states/board.rs b/src/app/states/skirmish_states/board.rs
index cea3322..746da3c 100644
--- a/src/app/states/skirmish_states/board.rs
+++ b/src/app/states/skirmish_states/board.rs
@@ -1,11 +1,9 @@
 use crate::app::{
-    buildings::BaseBuilding,
     helpers::{CellSizes, cell_size_helper, cells_area_helper},
     states::{
         CellStructure, FocusedCell, Offset, Players, Units, ZoomLevel,
-        skirmish_states::MoveFocusedCell,
+        skirmish_states::{MoveFocusedCell, buildings::BaseBuilding, units::MinerUnit},
     },
-    units::MinerUnit,
     widgets::CellWidget,
 };
 use ratatui::layout::Rect;
diff --git a/src/app/buildings/base.rs b/src/app/states/skirmish_states/buildings/base.rs
similarity index 100%
rename from src/app/buildings/base.rs
rename to src/app/states/skirmish_states/buildings/base.rs
diff --git a/src/app/buildings/mod.rs b/src/app/states/skirmish_states/buildings/mod.rs
similarity index 100%
rename from src/app/buildings/mod.rs
rename to src/app/states/skirmish_states/buildings/mod.rs
diff --git a/src/app/states/skirmish_states/mod.rs b/src/app/states/skirmish_states/mod.rs
index a2b30b4..80ac649 100644
--- a/src/app/states/skirmish_states/mod.rs
+++ b/src/app/states/skirmish_states/mod.rs
@@ -1,6 +1,8 @@
 mod board;
+pub mod buildings;
 mod focused_cell;
 mod offset;
+pub mod units;
 
 pub use board::BoardState;
 pub use focused_cell::{FocusedCell, MoveFocusedCell};
diff --git a/src/app/units/miner.rs b/src/app/states/skirmish_states/units/miner.rs
similarity index 100%
rename from src/app/units/miner.rs
rename to src/app/states/skirmish_states/units/miner.rs
diff --git a/src/app/units/mod.rs b/src/app/states/skirmish_states/units/mod.rs
similarity index 100%
rename from src/app/units/mod.rs
rename to src/app/states/skirmish_states/units/mod.rs