diff --git a/src/app/states/skirmish_states/mod.rs b/src/app/states/skirmish_states/mod.rs
index 70c46da..c2ddbe4 100644
--- a/src/app/states/skirmish_states/mod.rs
+++ b/src/app/states/skirmish_states/mod.rs
@@ -4,6 +4,7 @@ mod game_mode;
 mod offset;
 mod players;
 pub mod structures;
+pub mod tasks;
 pub mod units;
 pub mod zoom_level;
 
diff --git a/src/app/states/skirmish_states/structures/mod.rs b/src/app/states/skirmish_states/structures/mod.rs
index 07a3392..1a57bc2 100644
--- a/src/app/states/skirmish_states/structures/mod.rs
+++ b/src/app/states/skirmish_states/structures/mod.rs
@@ -1,13 +1,13 @@
 mod base;
 mod ore;
 mod stone;
+mod structure_trait;
 mod structures_enum;
-mod structures_trait;
 mod tunnel;
 
 pub use base::BaseBuilding;
 pub use ore::Ore;
 pub use stone::Stone;
+pub use structure_trait::Structure;
 pub use structures_enum::Structures;
-pub use structures_trait::Structure;
 pub use tunnel::Tunnel;
diff --git a/src/app/states/skirmish_states/structures/structures_trait.rs b/src/app/states/skirmish_states/structures/structure_trait.rs
similarity index 100%
rename from src/app/states/skirmish_states/structures/structures_trait.rs
rename to src/app/states/skirmish_states/structures/structure_trait.rs
diff --git a/src/app/states/skirmish_states/tasks/digging.rs b/src/app/states/skirmish_states/tasks/digging.rs
new file mode 100644
index 0000000..b4cea94
--- /dev/null
+++ b/src/app/states/skirmish_states/tasks/digging.rs
@@ -0,0 +1,6 @@
+use crate::app::widgets::CellWidget;
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct DiggingTask<'a> {
+    path: Vec<&'a CellWidget>,
+}
diff --git a/src/app/states/skirmish_states/tasks/mod.rs b/src/app/states/skirmish_states/tasks/mod.rs
new file mode 100644
index 0000000..5fc4b7b
--- /dev/null
+++ b/src/app/states/skirmish_states/tasks/mod.rs
@@ -0,0 +1,7 @@
+mod digging;
+mod tasks_enum;
+mod task_trait;
+
+pub use tasks_enum::Tasks;
+pub use digging::DiggingTask;
+pub use task_trait::Task;
diff --git a/src/app/states/skirmish_states/tasks/task_trait.rs b/src/app/states/skirmish_states/tasks/task_trait.rs
new file mode 100644
index 0000000..9c190d9
--- /dev/null
+++ b/src/app/states/skirmish_states/tasks/task_trait.rs
@@ -0,0 +1 @@
+pub trait Task {}
diff --git a/src/app/states/skirmish_states/tasks/tasks_enum.rs b/src/app/states/skirmish_states/tasks/tasks_enum.rs
new file mode 100644
index 0000000..e95cc3f
--- /dev/null
+++ b/src/app/states/skirmish_states/tasks/tasks_enum.rs
@@ -0,0 +1,4 @@
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Tasks {
+    Digging,
+}
diff --git a/src/app/states/skirmish_states/units/mod.rs b/src/app/states/skirmish_states/units/mod.rs
index fc493ca..b5346dc 100644
--- a/src/app/states/skirmish_states/units/mod.rs
+++ b/src/app/states/skirmish_states/units/mod.rs
@@ -1,7 +1,7 @@
 mod miner;
+mod unit_trait;
 mod units_enum;
-mod units_trait;
 
 pub use miner::MinerUnit;
+pub use unit_trait::Unit;
 pub use units_enum::Units;
-pub use units_trait::Unit;
diff --git a/src/app/states/skirmish_states/units/units_trait.rs b/src/app/states/skirmish_states/units/unit_trait.rs
similarity index 100%
rename from src/app/states/skirmish_states/units/units_trait.rs
rename to src/app/states/skirmish_states/units/unit_trait.rs