diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index 4bca2164..ae5f188f 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -2025,6 +2025,7 @@ Fix server collision resolution never triggering for second body
 Fix macro structure rotation generation
 Improvement to building placement math in TownLayout
 Scaffold character job data
+Moving data packages around
 
 
 
diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java
index 77696212..bb17e538 100644
--- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java
+++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java
@@ -11,7 +11,7 @@ import electrosphere.data.entity.common.CommonEntityType;
 import electrosphere.data.entity.creature.CreatureData;
 import electrosphere.data.entity.foliage.FoliageType;
 import electrosphere.data.entity.item.Item;
-import electrosphere.data.units.UnitDefinition;
+import electrosphere.data.macro.units.UnitDefinition;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.Entity;
diff --git a/src/main/java/electrosphere/data/Config.java b/src/main/java/electrosphere/data/Config.java
index 8ae5889c..ca598f2d 100644
--- a/src/main/java/electrosphere/data/Config.java
+++ b/src/main/java/electrosphere/data/Config.java
@@ -20,11 +20,11 @@ import electrosphere.data.entity.foliage.FoliageTypeMap;
 import electrosphere.data.entity.item.ItemDataMap;
 import electrosphere.data.entity.item.source.ItemSourcingMap;
 import electrosphere.data.entity.projectile.ProjectileTypeHolder;
+import electrosphere.data.macro.struct.StructureDataLoader;
+import electrosphere.data.macro.units.UnitDefinitionFile;
+import electrosphere.data.macro.units.UnitLoader;
 import electrosphere.data.settings.UserSettings;
-import electrosphere.data.struct.StructureDataLoader;
 import electrosphere.data.tutorial.HintDefinition;
-import electrosphere.data.units.UnitDefinitionFile;
-import electrosphere.data.units.UnitLoader;
 import electrosphere.data.voxel.VoxelData;
 import electrosphere.data.voxel.sampler.SamplerFile;
 import electrosphere.logger.LoggerInterface;
diff --git a/src/main/java/electrosphere/data/macro/CharaJob.java b/src/main/java/electrosphere/data/macro/job/CharaJob.java
similarity index 88%
rename from src/main/java/electrosphere/data/macro/CharaJob.java
rename to src/main/java/electrosphere/data/macro/job/CharaJob.java
index 461e1b99..f209c468 100644
--- a/src/main/java/electrosphere/data/macro/CharaJob.java
+++ b/src/main/java/electrosphere/data/macro/job/CharaJob.java
@@ -1,4 +1,4 @@
-package electrosphere.data.macro;
+package electrosphere.data.macro.job;
 
 /**
  * A job that a character can have
diff --git a/src/main/java/electrosphere/data/struct/StructureData.java b/src/main/java/electrosphere/data/macro/struct/StructureData.java
similarity index 98%
rename from src/main/java/electrosphere/data/struct/StructureData.java
rename to src/main/java/electrosphere/data/macro/struct/StructureData.java
index b0e39c9d..1d17bd3b 100644
--- a/src/main/java/electrosphere/data/struct/StructureData.java
+++ b/src/main/java/electrosphere/data/macro/struct/StructureData.java
@@ -1,4 +1,4 @@
-package electrosphere.data.struct;
+package electrosphere.data.macro.struct;
 
 import org.joml.Vector3d;
 
diff --git a/src/main/java/electrosphere/data/struct/StructureDataFile.java b/src/main/java/electrosphere/data/macro/struct/StructureDataFile.java
similarity index 96%
rename from src/main/java/electrosphere/data/struct/StructureDataFile.java
rename to src/main/java/electrosphere/data/macro/struct/StructureDataFile.java
index b429cfe2..dd7dea76 100644
--- a/src/main/java/electrosphere/data/struct/StructureDataFile.java
+++ b/src/main/java/electrosphere/data/macro/struct/StructureDataFile.java
@@ -1,4 +1,4 @@
-package electrosphere.data.struct;
+package electrosphere.data.macro.struct;
 
 import java.util.List;
 
diff --git a/src/main/java/electrosphere/data/struct/StructureDataLoader.java b/src/main/java/electrosphere/data/macro/struct/StructureDataLoader.java
similarity index 98%
rename from src/main/java/electrosphere/data/struct/StructureDataLoader.java
rename to src/main/java/electrosphere/data/macro/struct/StructureDataLoader.java
index 70dcc25d..8430f84d 100644
--- a/src/main/java/electrosphere/data/struct/StructureDataLoader.java
+++ b/src/main/java/electrosphere/data/macro/struct/StructureDataLoader.java
@@ -1,4 +1,4 @@
-package electrosphere.data.struct;
+package electrosphere.data.macro.struct;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/src/main/java/electrosphere/data/units/UnitDefinition.java b/src/main/java/electrosphere/data/macro/units/UnitDefinition.java
similarity index 96%
rename from src/main/java/electrosphere/data/units/UnitDefinition.java
rename to src/main/java/electrosphere/data/macro/units/UnitDefinition.java
index d3aeb7e4..680e1695 100644
--- a/src/main/java/electrosphere/data/units/UnitDefinition.java
+++ b/src/main/java/electrosphere/data/macro/units/UnitDefinition.java
@@ -1,4 +1,4 @@
-package electrosphere.data.units;
+package electrosphere.data.macro.units;
 
 import java.util.List;
 
diff --git a/src/main/java/electrosphere/data/units/UnitDefinitionFile.java b/src/main/java/electrosphere/data/macro/units/UnitDefinitionFile.java
similarity index 90%
rename from src/main/java/electrosphere/data/units/UnitDefinitionFile.java
rename to src/main/java/electrosphere/data/macro/units/UnitDefinitionFile.java
index 2cf8a9a5..36a4d84e 100644
--- a/src/main/java/electrosphere/data/units/UnitDefinitionFile.java
+++ b/src/main/java/electrosphere/data/macro/units/UnitDefinitionFile.java
@@ -1,4 +1,4 @@
-package electrosphere.data.units;
+package electrosphere.data.macro.units;
 
 import java.util.List;
 
diff --git a/src/main/java/electrosphere/data/units/UnitEquippedItem.java b/src/main/java/electrosphere/data/macro/units/UnitEquippedItem.java
similarity index 93%
rename from src/main/java/electrosphere/data/units/UnitEquippedItem.java
rename to src/main/java/electrosphere/data/macro/units/UnitEquippedItem.java
index 7f1e9e37..8e5d23a8 100644
--- a/src/main/java/electrosphere/data/units/UnitEquippedItem.java
+++ b/src/main/java/electrosphere/data/macro/units/UnitEquippedItem.java
@@ -1,4 +1,4 @@
-package electrosphere.data.units;
+package electrosphere.data.macro.units;
 
 /**
  * An item equipped to a unit
diff --git a/src/main/java/electrosphere/data/units/UnitLoader.java b/src/main/java/electrosphere/data/macro/units/UnitLoader.java
similarity index 97%
rename from src/main/java/electrosphere/data/units/UnitLoader.java
rename to src/main/java/electrosphere/data/macro/units/UnitLoader.java
index 1615d3a3..79181b11 100644
--- a/src/main/java/electrosphere/data/units/UnitLoader.java
+++ b/src/main/java/electrosphere/data/macro/units/UnitLoader.java
@@ -1,4 +1,4 @@
-package electrosphere.data.units;
+package electrosphere.data.macro.units;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java b/src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java
index 6d781f64..99497f48 100644
--- a/src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java
+++ b/src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java
@@ -3,7 +3,7 @@ package electrosphere.server.ai.nodes.checks.spatial;
 import org.joml.Vector3d;
 
 import electrosphere.data.block.fab.BlockFab;
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
diff --git a/src/main/java/electrosphere/server/entity/unit/UnitUtils.java b/src/main/java/electrosphere/server/entity/unit/UnitUtils.java
index 28ed18be..ddbb17f2 100644
--- a/src/main/java/electrosphere/server/entity/unit/UnitUtils.java
+++ b/src/main/java/electrosphere/server/entity/unit/UnitUtils.java
@@ -2,9 +2,9 @@ package electrosphere.server.entity.unit;
 
 import org.joml.Vector3d;
 
-import electrosphere.data.units.UnitDefinition;
-import electrosphere.data.units.UnitEquippedItem;
-import electrosphere.data.units.UnitLoader;
+import electrosphere.data.macro.units.UnitDefinition;
+import electrosphere.data.macro.units.UnitEquippedItem;
+import electrosphere.data.macro.units.UnitLoader;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.inventory.ServerInventoryState;
diff --git a/src/main/java/electrosphere/server/macro/structure/VirtualStructure.java b/src/main/java/electrosphere/server/macro/structure/VirtualStructure.java
index 5d5a5431..627d609a 100644
--- a/src/main/java/electrosphere/server/macro/structure/VirtualStructure.java
+++ b/src/main/java/electrosphere/server/macro/structure/VirtualStructure.java
@@ -6,7 +6,7 @@ import org.joml.Vector3d;
 
 import electrosphere.controls.cursor.CursorState;
 import electrosphere.data.block.fab.BlockFab;
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.macro.MacroData;
 import electrosphere.server.macro.spatial.MacroAreaObject;
diff --git a/src/main/java/electrosphere/server/macro/town/TownLayout.java b/src/main/java/electrosphere/server/macro/town/TownLayout.java
index d127a789..9481cab5 100644
--- a/src/main/java/electrosphere/server/macro/town/TownLayout.java
+++ b/src/main/java/electrosphere/server/macro/town/TownLayout.java
@@ -10,7 +10,7 @@ import org.joml.Vector3d;
 import org.joml.Vector3i;
 
 import electrosphere.controls.cursor.CursorState;
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.server.datacell.Realm;
diff --git a/src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java b/src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java
index b30f9702..5e7cda50 100644
--- a/src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java
+++ b/src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java
@@ -2,7 +2,7 @@ package electrosphere.server.macro.utils;
 
 import org.joml.Vector3d;
 
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.server.macro.MacroData;
 
 /**
diff --git a/src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java b/src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java
index 7ba6a6ce..6c47fff5 100644
--- a/src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java
+++ b/src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java
@@ -3,7 +3,7 @@ package electrosphere.server.simulation.chara;
 import org.joml.Vector3d;
 
 import electrosphere.data.block.fab.BlockFab;
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.engine.Globals;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.macro.MacroData;