diff --git a/Cargo.lock b/Cargo.lock
index 050c53f22..24a59bfa9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2193,6 +2193,7 @@ dependencies = [
  "de_core",
  "de_objects",
  "de_pathing",
+ "de_types",
  "glam",
  "parry3d",
 ]
@@ -2206,6 +2207,7 @@ dependencies = [
  "de_core",
  "de_map",
  "de_terrain",
+ "de_types",
  "de_uom",
  "iyes_progress",
  "parry3d",
@@ -2283,6 +2285,7 @@ dependencies = [
  "de_pathing",
  "de_signs",
  "de_spawner",
+ "de_types",
  "parry2d",
  "parry3d",
 ]
@@ -2309,6 +2312,7 @@ dependencies = [
  "de_signs",
  "de_spawner",
  "de_terrain",
+ "de_types",
  "enum-map",
  "glam",
  "parry2d",
@@ -2321,16 +2325,13 @@ version = "0.1.0-dev"
 dependencies = [
  "async-std",
  "bevy",
+ "de_types",
  "dirs",
- "enum-iterator",
- "enum-map",
  "glam",
  "iyes_progress",
- "nalgebra",
  "parry2d",
  "parry3d",
  "paste",
- "serde",
  "thiserror",
  "tinyvec",
 ]
@@ -2390,6 +2391,7 @@ dependencies = [
  "criterion",
  "de_core",
  "de_objects",
+ "de_types",
  "glam",
  "nalgebra",
  "parry2d",
@@ -2409,6 +2411,7 @@ dependencies = [
  "de_multiplayer",
  "de_spawner",
  "de_terrain",
+ "de_types",
  "futures-lite",
  "iyes_progress",
 ]
@@ -2483,7 +2486,7 @@ dependencies = [
  "async-std",
  "async-tar",
  "bevy",
- "de_core",
+ "de_types",
  "enum-map",
  "glam",
  "parry2d",
@@ -2508,6 +2511,7 @@ dependencies = [
  "de_map",
  "de_messages",
  "de_multiplayer",
+ "de_types",
  "futures-lite",
  "thiserror",
 ]
@@ -2530,6 +2534,7 @@ dependencies = [
  "de_map",
  "de_objects",
  "de_pathing",
+ "de_types",
  "glam",
  "parry2d",
  "parry3d",
@@ -2547,6 +2552,7 @@ dependencies = [
  "de_gui",
  "de_messages",
  "de_net",
+ "de_types",
  "futures-lite",
  "iyes_progress",
  "tracing",
@@ -2574,6 +2580,7 @@ dependencies = [
  "anyhow",
  "bevy",
  "de_core",
+ "de_types",
  "enum-iterator",
  "enum-map",
  "glam",
@@ -2595,6 +2602,7 @@ dependencies = [
  "de_core",
  "de_map",
  "de_objects",
+ "de_types",
  "futures-lite",
  "glam",
  "nalgebra",
@@ -2615,6 +2623,7 @@ dependencies = [
  "de_core",
  "de_objects",
  "de_terrain",
+ "de_types",
  "glam",
 ]
 
@@ -2631,6 +2640,7 @@ dependencies = [
  "de_map",
  "de_objects",
  "de_terrain",
+ "de_types",
  "parry2d",
  "parry3d",
 ]
@@ -2644,6 +2654,7 @@ dependencies = [
  "de_core",
  "de_map",
  "de_objects",
+ "de_types",
  "glam",
  "itertools 0.11.0",
  "iyes_progress",
@@ -2663,6 +2674,19 @@ dependencies = [
  "parry3d",
 ]
 
+[[package]]
+name = "de_types"
+version = "0.1.0-dev"
+dependencies = [
+ "enum-iterator",
+ "enum-map",
+ "glam",
+ "nalgebra",
+ "parry2d",
+ "parry3d",
+ "serde",
+]
+
 [[package]]
 name = "de_uom"
 version = "0.1.0-dev"
diff --git a/Cargo.toml b/Cargo.toml
index 95b9d0901..515a654e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,6 +106,7 @@ de_pathing = { path = "crates/pathing", version = "0.1.0-dev" }
 de_signs = { path = "crates/signs", version = "0.1.0-dev" }
 de_spawner = { path = "crates/spawner", version = "0.1.0-dev" }
 de_terrain = { path = "crates/terrain", version = "0.1.0-dev" }
+de_types = { path = "crates/types", version = "0.1.0-dev" }
 de_uom = { path = "crates/uom", version = "0.1.0-dev" }
 
 # Other
diff --git a/crates/behaviour/Cargo.toml b/crates/behaviour/Cargo.toml
index 6dcc91ad0..7930571c0 100644
--- a/crates/behaviour/Cargo.toml
+++ b/crates/behaviour/Cargo.toml
@@ -16,6 +16,7 @@ categories.workspace = true
 de_core.workspace = true
 de_objects.workspace = true
 de_pathing.workspace = true
+de_types.workspace = true
 
 # Other
 bevy.workspace = true
diff --git a/crates/behaviour/src/chase.rs b/crates/behaviour/src/chase.rs
index cca9507ba..a6a911cfe 100644
--- a/crates/behaviour/src/chase.rs
+++ b/crates/behaviour/src/chase.rs
@@ -1,6 +1,7 @@
 use bevy::prelude::*;
-use de_core::{gamestate::GameState, projection::ToFlat};
+use de_core::gamestate::GameState;
 use de_pathing::{PathQueryProps, PathTarget, UpdateEntityPathEvent};
+use de_types::projection::ToFlat;
 
 pub(crate) struct ChasePlugin;
 
diff --git a/crates/camera/Cargo.toml b/crates/camera/Cargo.toml
index 07df812a8..82594478c 100644
--- a/crates/camera/Cargo.toml
+++ b/crates/camera/Cargo.toml
@@ -14,10 +14,11 @@ categories.workspace = true
 [dependencies]
 # DE
 de_conf.workspace = true
-de_uom.workspace = true
 de_core.workspace = true
 de_map.workspace = true
 de_terrain.workspace = true
+de_types.workspace = true
+de_uom.workspace = true
 
 # Other
 bevy.workspace = true
diff --git a/crates/camera/src/camera.rs b/crates/camera/src/camera.rs
index 357baa460..086d344a6 100644
--- a/crates/camera/src/camera.rs
+++ b/crates/camera/src/camera.rs
@@ -10,12 +10,12 @@ use de_core::{
     cleanup::DespawnOnGameExit,
     events::ResendEventPlugin,
     gamestate::GameState,
-    projection::ToAltitude,
     schedule::{InputSchedule, Movement, PreMovement},
     state::AppState,
 };
 use de_map::size::MapBounds;
 use de_terrain::{TerrainCollider, MAX_ELEVATION};
+use de_types::projection::ToAltitude;
 use de_uom::{InverseSecond, Metre, Quantity, Radian, Second};
 use iyes_progress::prelude::*;
 use parry3d::{math::Vector, query::Ray};
diff --git a/crates/combat/src/attack.rs b/crates/combat/src/attack.rs
index 88ef617d2..fc9078738 100644
--- a/crates/combat/src/attack.rs
+++ b/crates/combat/src/attack.rs
@@ -2,7 +2,7 @@ use std::{cmp::Ordering, collections::BinaryHeap};
 
 use bevy::prelude::*;
 use de_behaviour::{ChaseSet, ChaseTarget, ChaseTargetEvent};
-use de_core::{gamestate::GameState, objects::ObjectType};
+use de_core::{gamestate::GameState, objects::ObjectTypeComponent};
 use de_index::SpatialQuery;
 use de_objects::{LaserCannon, SolidObjects};
 use parry3d::query::Ray;
@@ -119,7 +119,7 @@ fn update_positions(
     mut commands: Commands,
     solids: SolidObjects,
     mut cannons: Query<(Entity, &Transform, &LaserCannon, &mut Attacking)>,
-    targets: Query<(&Transform, &ObjectType)>,
+    targets: Query<(&Transform, &ObjectTypeComponent)>,
     sightline: SpatialQuery<Entity>,
 ) {
     for (attacker, transform, cannon, mut attacking) in cannons.iter_mut() {
@@ -127,7 +127,7 @@ fn update_positions(
             Ok((enemy_transform, &target_type)) => {
                 attacking.muzzle = transform.translation + cannon.muzzle();
 
-                let enemy_aabb = solids.get(target_type).collider().aabb();
+                let enemy_aabb = solids.get(*target_type).collider().aabb();
                 let enemy_centroid = enemy_transform.translation + Vec3::from(enemy_aabb.center());
                 let direction = (enemy_centroid - attacking.muzzle)
                     .try_normalize()
diff --git a/crates/construction/Cargo.toml b/crates/construction/Cargo.toml
index b6d483d7b..c0892948b 100644
--- a/crates/construction/Cargo.toml
+++ b/crates/construction/Cargo.toml
@@ -20,6 +20,7 @@ de_objects.workspace = true
 de_pathing.workspace = true
 de_signs.workspace = true
 de_spawner.workspace = true
+de_types.workspace = true
 
 # Other
 ahash.workspace = true
diff --git a/crates/construction/src/manufacturing.rs b/crates/construction/src/manufacturing.rs
index 06fdf173b..7eb41b4a9 100644
--- a/crates/construction/src/manufacturing.rs
+++ b/crates/construction/src/manufacturing.rs
@@ -6,9 +6,8 @@ use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
 use de_core::{
     cleanup::DespawnOnGameExit,
     gamestate::GameState,
-    objects::{Active, ActiveObjectType, ObjectType, UnitType, PLAYER_MAX_UNITS},
-    player::Player,
-    projection::{ToAltitude, ToFlat},
+    objects::{Active, ObjectTypeComponent},
+    player::PlayerComponent,
     state::AppState,
 };
 use de_index::SpatialQuery;
@@ -18,6 +17,11 @@ use de_signs::{
     LineLocation, UpdateLineEndEvent, UpdateLineLocationEvent, UpdatePoleLocationEvent,
 };
 use de_spawner::{ObjectCounter, SpawnBundle};
+use de_types::{
+    objects::{ActiveObjectType, ObjectType, UnitType, PLAYER_MAX_UNITS},
+    player::Player,
+    projection::{ToAltitude, ToFlat},
+};
 use parry2d::bounding_volume::Aabb;
 use parry3d::math::Isometry;
 
@@ -290,12 +294,12 @@ impl ProductionItem {
 fn configure(
     mut commands: Commands,
     solids: SolidObjects,
-    new: Query<(Entity, &Transform, &ObjectType), Added<Active>>,
+    new: Query<(Entity, &Transform, &ObjectTypeComponent), Added<Active>>,
     mut pole_events: EventWriter<UpdatePoleLocationEvent>,
     mut line_events: EventWriter<UpdateLineLocationEvent>,
 ) {
     for (entity, transform, &object_type) in new.iter() {
-        let solid = solids.get(object_type);
+        let solid = solids.get(*object_type);
         if let Some(factory) = solid.factory() {
             let start = transform.transform_point(factory.position().to_msl());
             let local_aabb = solid.ichnography().local_aabb();
@@ -351,12 +355,12 @@ fn enqueue(
 fn check_spawn_locations(
     solids: SolidObjects,
     space: SpatialQuery<Entity>,
-    mut factories: Query<(Entity, &ObjectType, &Transform, &mut AssemblyLine)>,
+    mut factories: Query<(Entity, &ObjectTypeComponent, &Transform, &mut AssemblyLine)>,
 ) {
     for (entity, &object_type, transform, mut line) in factories.iter_mut() {
         line.blocks_mut().spawn_location = match line.current() {
             Some(unit_type) => {
-                let factory = solids.get(object_type).factory().unwrap();
+                let factory = solids.get(*object_type).factory().unwrap();
                 let collider = solids
                     .get(ObjectType::Active(ActiveObjectType::Unit(unit_type)))
                     .collider();
@@ -377,7 +381,7 @@ fn check_spawn_locations(
 fn produce(
     time: Res<Time>,
     counter: Res<ObjectCounter>,
-    mut factories: Query<(Entity, &Player, &mut AssemblyLine)>,
+    mut factories: Query<(Entity, &PlayerComponent, &mut AssemblyLine)>,
     mut deliver_events: EventWriter<DeliverEvent>,
 ) {
     let mut counts: AHashMap<Player, u32> = AHashMap::from_iter(
@@ -387,7 +391,7 @@ fn produce(
     );
 
     for (factory, &player, mut assembly) in factories.iter_mut() {
-        let player_count = counts.entry(player).or_default();
+        let player_count = counts.entry(*player).or_default();
 
         loop {
             assembly.blocks_mut().map_capacity = *player_count >= PLAYER_MAX_UNITS;
@@ -407,7 +411,12 @@ fn deliver(
     solids: SolidObjects,
     mut deliver_events: EventReader<DeliverEvent>,
     mut path_events: EventWriter<UpdateEntityPathEvent>,
-    factories: Query<(&Transform, &ObjectType, &Player, &DeliveryLocation)>,
+    factories: Query<(
+        &Transform,
+        &ObjectTypeComponent,
+        &PlayerComponent,
+        &DeliveryLocation,
+    )>,
     mut play_audio: EventWriter<PlaySpatialAudioEvent>,
 ) {
     for delivery in deliver_events.iter() {
@@ -421,7 +430,7 @@ fn deliver(
             factories.get(delivery.factory()).unwrap();
         let unit_object_type = ObjectType::Active(ActiveObjectType::Unit(delivery.unit()));
 
-        let factory = solids.get(factory_object_type).factory().unwrap();
+        let factory = solids.get(*factory_object_type).factory().unwrap();
         debug_assert!(factory.products().contains(&delivery.unit()));
         let spawn_point = transform.transform_point(factory.position().to_msl());
 
diff --git a/crates/controller/Cargo.toml b/crates/controller/Cargo.toml
index c0368ee4a..6f6e59ecf 100644
--- a/crates/controller/Cargo.toml
+++ b/crates/controller/Cargo.toml
@@ -29,6 +29,7 @@ de_pathing.workspace = true
 de_signs.workspace = true
 de_spawner.workspace = true
 de_terrain.workspace = true
+de_types.workspace = true
 
 # Other
 ahash.workspace = true
diff --git a/crates/controller/src/commands/handlers.rs b/crates/controller/src/commands/handlers.rs
index b32e68784..1026a4b96 100644
--- a/crates/controller/src/commands/handlers.rs
+++ b/crates/controller/src/commands/handlers.rs
@@ -17,13 +17,16 @@ use de_conf::Configuration;
 use de_core::{
     gamestate::GameState,
     gconfig::GameConfig,
-    objects::{BuildingType, ObjectType, Playable, PLAYER_MAX_BUILDINGS},
-    player::Player,
-    projection::ToFlat,
+    objects::{ObjectTypeComponent, Playable},
+    player::PlayerComponent,
     schedule::InputSchedule,
     screengeom::ScreenRect,
 };
 use de_spawner::{DraftAllowed, ObjectCounter};
+use de_types::{
+    objects::{BuildingType, PLAYER_MAX_BUILDINGS},
+    projection::ToFlat,
+};
 use enum_map::enum_map;
 
 use super::{
@@ -152,13 +155,13 @@ fn right_click_handler(
     mut send_events: EventWriter<SendSelectedEvent>,
     mut location_events: EventWriter<DeliveryLocationSelectedEvent>,
     mut attack_events: EventWriter<GroupAttackEvent>,
-    targets: Query<&Player>,
+    targets: Query<&PlayerComponent>,
     pointer: Res<Pointer>,
 ) {
     match pointer.entity().filter(|&entity| {
         targets
             .get(entity)
-            .map(|&player| !config.locals().is_playable(player))
+            .map(|&player| !config.locals().is_playable(*player))
             .unwrap_or(false)
     }) {
         Some(enemy) => attack_events.send(GroupAttackEvent::new(enemy)),
@@ -175,7 +178,7 @@ fn right_click_handler(
 fn double_click_handler(
     keys: Res<Input<KeyCode>>,
     pointer: Res<Pointer>,
-    playable: Query<&ObjectType, With<Playable>>,
+    playable: Query<&ObjectTypeComponent, With<Playable>>,
     drafts: Query<(), With<DraftAllowed>>,
     mut select_in_rect_events: EventWriter<SelectInRectEvent>,
 ) {
@@ -199,7 +202,7 @@ fn double_click_handler(
     select_in_rect_events.send(SelectInRectEvent::new(
         ScreenRect::full(),
         selection_mode,
-        Some(*targeted_entity_type),
+        Some(**targeted_entity_type),
     ));
 }
 
diff --git a/crates/controller/src/draft.rs b/crates/controller/src/draft.rs
index c4114c4f8..04ba1de13 100644
--- a/crates/controller/src/draft.rs
+++ b/crates/controller/src/draft.rs
@@ -1,14 +1,12 @@
 use bevy::prelude::*;
 use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
 use de_core::{
-    cleanup::DespawnOnGameExit,
-    gamestate::GameState,
-    gconfig::GameConfig,
-    objects::{BuildingType, ObjectType},
-    schedule::InputSchedule,
+    cleanup::DespawnOnGameExit, gamestate::GameState, gconfig::GameConfig,
+    objects::ObjectTypeComponent, player::PlayerComponent, schedule::InputSchedule,
     state::AppState,
 };
 use de_spawner::{DraftAllowed, DraftBundle, SpawnBundle};
+use de_types::objects::BuildingType;
 
 use crate::mouse::{Pointer, PointerSet};
 
@@ -79,15 +77,15 @@ impl NewDraftEvent {
 fn spawn(
     mut commands: Commands,
     game_config: Res<GameConfig>,
-    drafts: Query<(Entity, &Transform, &ObjectType, &DraftAllowed)>,
+    drafts: Query<(Entity, &Transform, &ObjectTypeComponent, &DraftAllowed)>,
     mut play_audio: EventWriter<PlaySpatialAudioEvent>,
 ) {
     for (entity, &transform, &object_type, draft) in drafts.iter() {
         if draft.allowed() {
             commands.entity(entity).despawn_recursive();
             commands.spawn((
-                SpawnBundle::new(object_type, transform),
-                game_config.locals().playable(),
+                SpawnBundle::new(*object_type, transform),
+                PlayerComponent::from(game_config.locals().playable()),
                 DespawnOnGameExit,
             ));
 
diff --git a/crates/controller/src/hud/actionbar.rs b/crates/controller/src/hud/actionbar.rs
index 9e751362d..542244463 100644
--- a/crates/controller/src/hud/actionbar.rs
+++ b/crates/controller/src/hud/actionbar.rs
@@ -1,13 +1,12 @@
 use bevy::prelude::*;
 use de_construction::EnqueueAssemblyEvent;
 use de_core::{
-    cleanup::DespawnOnGameExit,
-    gamestate::GameState,
-    objects::{ObjectType, UnitType},
+    cleanup::DespawnOnGameExit, gamestate::GameState, objects::ObjectTypeComponent,
     schedule::InputSchedule,
 };
 use de_gui::{ButtonCommands, GuiCommands, OuterStyle};
 use de_objects::SolidObjects;
+use de_types::objects::UnitType;
 
 use super::{interaction::InteractionBlocker, HUD_COLOR};
 use crate::selection::Selected;
@@ -93,14 +92,14 @@ fn update(
     solids: SolidObjects,
     bar_node: Res<ActionBarNode>,
     active: Res<ActiveEntity>,
-    objects: Query<&ObjectType>,
+    objects: Query<&ObjectTypeComponent>,
 ) {
     commands.entity(bar_node.0).despawn_descendants();
 
     let Some(active) = active.0 else { return };
     let object_type = *objects.get(active).unwrap();
 
-    if let Some(factory) = solids.get(object_type).factory() {
+    if let Some(factory) = solids.get(*object_type).factory() {
         for &unit in factory.products() {
             spawn_button(&mut commands, bar_node.0, unit);
         }
diff --git a/crates/controller/src/hud/minimap/fill.rs b/crates/controller/src/hud/minimap/fill.rs
index 543bcbaf8..b797dfe36 100644
--- a/crates/controller/src/hud/minimap/fill.rs
+++ b/crates/controller/src/hud/minimap/fill.rs
@@ -1,11 +1,12 @@
 use bevy::{ecs::system::SystemParam, prelude::*};
 use de_core::{
-    gamestate::GameState, gconfig::GameConfig, objects::ObjectType, player::Player,
-    projection::ToFlat, schedule::PostMovement,
+    gamestate::GameState, gconfig::GameConfig, objects::ObjectTypeComponent,
+    player::PlayerComponent, schedule::PostMovement,
 };
 use de_map::size::MapBounds;
 use de_objects::SolidObjects;
 use de_terrain::TerrainCollider;
+use de_types::projection::ToFlat;
 use parry2d::{
     bounding_volume::Aabb,
     math::Point,
@@ -74,19 +75,19 @@ fn draw_entities_system(
     ui_coords: UiCoords,
     solids: SolidObjects,
     game: Res<GameConfig>,
-    entities: Query<(&Transform, &Player, &ObjectType)>,
+    entities: Query<(&Transform, &PlayerComponent, &ObjectTypeComponent)>,
 ) {
     let mut drawing = drawing.drawing();
 
     for (transform, &player, &object_type) in entities.iter() {
         let minimap_position = ui_coords.flat_to_rel(transform.translation.to_flat());
-        let color = if game.locals().is_playable(player) {
+        let color = if game.locals().is_playable(*player) {
             PLAYER_COLOR
         } else {
             ENEMY_COLOR
         };
 
-        let radius = solids.get(object_type).ichnography().radius();
+        let radius = solids.get(*object_type).ichnography().radius();
         let rect_size = MIN_ENTITY_SIZE.max(ui_coords.size_to_rel(Vec2::splat(radius)));
         drawing.rect(minimap_position, rect_size, color);
     }
diff --git a/crates/controller/src/selection/area.rs b/crates/controller/src/selection/area.rs
index 4a51d8449..5df64e694 100644
--- a/crates/controller/src/selection/area.rs
+++ b/crates/controller/src/selection/area.rs
@@ -2,11 +2,12 @@ use bevy::prelude::*;
 use de_core::{
     frustum,
     gamestate::GameState,
-    objects::{ObjectType, Playable},
+    objects::{ObjectTypeComponent, Playable},
     schedule::InputSchedule,
     screengeom::ScreenRect,
 };
 use de_objects::SolidObjects;
+use de_types::objects::ObjectType;
 
 use crate::{
     frustum::ScreenFrustum,
@@ -68,7 +69,7 @@ impl SelectInRectEvent {
 fn select_in_area(
     screen_frustum: ScreenFrustum,
     solids: SolidObjects,
-    candidates: Query<(Entity, &ObjectType, &Transform), With<Playable>>,
+    candidates: Query<(Entity, &ObjectTypeComponent, &Transform), With<Playable>>,
     mut in_events: EventReader<SelectInRectEvent>,
     mut out_events: EventWriter<SelectEvent>,
 ) {
@@ -79,10 +80,10 @@ fn select_in_area(
             .filter(|(_, &object_type, _)| {
                 in_event
                     .filter_object_type()
-                    .map_or(true, |filter| filter == object_type)
+                    .map_or(true, |filter| filter == *object_type)
             })
             .filter_map(|(entity, &object_type, &transform)| {
-                let aabb = solids.get(object_type).collider().aabb();
+                let aabb = solids.get(*object_type).collider().aabb();
                 if frustum::intersects_parry(&event_frustum, transform, &aabb) {
                     Some(entity)
                 } else {
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index 825ea17b5..855980cb4 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -12,17 +12,17 @@ license.workspace = true
 categories.workspace = true
 
 [dependencies]
+# DE
+de_types.workspace = true
+
+# Other
 async-std.workspace = true
 bevy.workspace = true
 dirs.workspace = true
-enum-iterator.workspace = true
-enum-map.workspace = true
 glam.workspace = true
 iyes_progress.workspace = true
-nalgebra.workspace = true
 parry2d.workspace = true
 parry3d.workspace = true
 paste.workspace = true
-serde.workspace = true
 thiserror.workspace = true
 tinyvec.workspace = true
diff --git a/crates/core/src/gconfig.rs b/crates/core/src/gconfig.rs
index 17ba58138..5ab7804cd 100644
--- a/crates/core/src/gconfig.rs
+++ b/crates/core/src/gconfig.rs
@@ -1,10 +1,9 @@
 use std::path::{Path, PathBuf};
 
 use bevy::prelude::Resource;
+use de_types::player::{Player, PlayerRange};
 use tinyvec::{array_vec, ArrayVec};
 
-use crate::player::{Player, PlayerRange};
-
 /// This resource is automatically removed when
 /// [`crate::state::AppState::InGame`] is exited.
 #[derive(Resource)]
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
index 895370617..28671c82a 100644
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -18,7 +18,6 @@ pub mod gconfig;
 pub mod gresult;
 pub mod objects;
 pub mod player;
-pub mod projection;
 pub mod schedule;
 pub mod screengeom;
 pub mod state;
diff --git a/crates/core/src/objects.rs b/crates/core/src/objects.rs
index e58fd54da..b895ce8e5 100644
--- a/crates/core/src/objects.rs
+++ b/crates/core/src/objects.rs
@@ -1,17 +1,7 @@
-#![allow(clippy::modulo_one)] // Caused by derive(Enum) on an enum with only a
-                              // single variant.
-
 use std::fmt;
 
 use bevy::prelude::*;
-use enum_iterator::Sequence;
-use enum_map::Enum;
-use serde::{Deserialize, Serialize};
-
-/// Maximum number of buildings belonging to a single player.
-pub const PLAYER_MAX_BUILDINGS: u32 = 128;
-/// Maximum number of units belonging to a single player.
-pub const PLAYER_MAX_UNITS: u32 = 1024;
+use de_types::objects::ObjectType;
 
 /// Active object which can be played by any player.
 #[derive(Component)]
@@ -29,81 +19,17 @@ pub struct StaticSolid;
 #[derive(Component)]
 pub struct MovableSolid;
 
-#[derive(Enum, Sequence, Component, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum ObjectType {
-    Active(ActiveObjectType),
-    Inactive(InactiveObjectType),
-}
-
-impl fmt::Display for ObjectType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Self::Active(active) => write!(f, "Active -> {active}"),
-            Self::Inactive(inactive) => write!(f, "Inactive -> {inactive}"),
-        }
-    }
-}
-
-#[derive(
-    Enum, Sequence, Copy, Clone, Debug, Component, Serialize, Deserialize, PartialEq, Eq, Hash,
-)]
-pub enum InactiveObjectType {
-    Tree,
-}
-
-impl fmt::Display for InactiveObjectType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Self::Tree => write!(f, "Tree"),
-        }
-    }
-}
-
-#[derive(
-    Enum, Sequence, Copy, Clone, Debug, Component, Serialize, Deserialize, PartialEq, Eq, Hash,
-)]
-pub enum ActiveObjectType {
-    Building(BuildingType),
-    Unit(UnitType),
-}
-
-impl fmt::Display for ActiveObjectType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Self::Building(building) => write!(f, "Building -> {building}"),
-            Self::Unit(unit) => write!(f, "Unit -> {unit}"),
-        }
-    }
-}
-
-#[derive(
-    Enum, Sequence, Copy, Clone, Debug, Component, Serialize, Deserialize, PartialEq, Eq, Hash,
-)]
-pub enum BuildingType {
-    Base,
-    PowerHub,
-}
+#[derive(Component, Deref, Clone, Copy)]
+pub struct ObjectTypeComponent(ObjectType);
 
-impl fmt::Display for BuildingType {
+impl fmt::Display for ObjectTypeComponent {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Self::Base => write!(f, "Base"),
-            Self::PowerHub => write!(f, "Power Hub"),
-        }
+        write!(f, "{}", self.0)
     }
 }
 
-#[derive(
-    Copy, Clone, Debug, Component, Serialize, Deserialize, PartialEq, Eq, Enum, Sequence, Hash,
-)]
-pub enum UnitType {
-    Attacker,
-}
-
-impl fmt::Display for UnitType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Self::Attacker => write!(f, "Attacker"),
-        }
+impl From<ObjectType> for ObjectTypeComponent {
+    fn from(object_type: ObjectType) -> Self {
+        Self(object_type)
     }
 }
diff --git a/crates/core/src/player.rs b/crates/core/src/player.rs
index faf138ca0..0b48d245a 100644
--- a/crates/core/src/player.rs
+++ b/crates/core/src/player.rs
@@ -1,145 +1,11 @@
-use core::fmt;
-use std::cmp::Ordering;
-
 use bevy::prelude::*;
-use serde::{Deserialize, Serialize};
-
-#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, Component, PartialEq, Eq, Hash)]
-pub enum Player {
-    #[default]
-    Player1,
-    Player2,
-    Player3,
-    Player4,
-}
-
-impl Player {
-    pub const MAX_PLAYERS: usize = 4;
-
-    pub fn to_num(self) -> u8 {
-        match self {
-            Self::Player1 => 1,
-            Self::Player2 => 2,
-            Self::Player3 => 3,
-            Self::Player4 => 4,
-        }
-    }
-
-    fn next(self) -> Option<Self> {
-        self.to_num()
-            .checked_add(1)
-            .and_then(|num| Self::try_from(num).ok())
-    }
-}
-
-impl fmt::Display for Player {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "player {}", self.to_num())
-    }
-}
-
-impl PartialOrd for Player {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.to_num().partial_cmp(&other.to_num())
-    }
-}
-
-impl Ord for Player {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.partial_cmp(other).unwrap()
-    }
-}
-
-impl TryFrom<u8> for Player {
-    type Error = String;
-
-    fn try_from(value: u8) -> Result<Self, Self::Error> {
-        match value {
-            1 => Ok(Player::Player1),
-            2 => Ok(Player::Player2),
-            3 => Ok(Player::Player3),
-            4 => Ok(Player::Player4),
-            value => Err(format!(
-                "Player number must be between 1 and 4, got {value}."
-            )),
-        }
-    }
-}
-
-pub struct PlayerRange {
-    start: Player,
-    stop: Player,
-    current: Option<Player>,
-}
-
-impl PlayerRange {
-    /// Returns inclusive player range from first player to `stop`.
-    pub fn up_to(stop: Player) -> Self {
-        Self::new(Player::Player1, stop)
-    }
-
-    /// # Arguments
-    ///
-    /// * `start` - first player, inclusive.
-    ///
-    /// * `stop` - last player, inclusive.
-    pub fn new(start: Player, stop: Player) -> Self {
-        assert!(start <= stop);
-        Self {
-            start,
-            stop,
-            current: Some(start),
-        }
-    }
-
-    pub fn contains(&self, player: Player) -> bool {
-        self.start <= player && player <= self.stop
-    }
-}
-
-impl Iterator for PlayerRange {
-    type Item = Player;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self.current {
-            Some(current) => {
-                self.current = current.next();
-                Some(current)
-            }
-            None => {
-                self.current = Some(self.start);
-                None
-            }
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let size = match self.current {
-            Some(current) => 1 + (self.stop.to_num() - current.to_num()) as usize,
-            None => 0,
-        };
-        (size, Some(size))
-    }
-}
-
-impl ExactSizeIterator for PlayerRange {}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_range() {
-        let mut range = PlayerRange::new(Player::Player2, Player::Player4);
+use de_types::player::Player;
 
-        assert_eq!(range.next(), Some(Player::Player2));
-        assert_eq!(range.next(), Some(Player::Player3));
-        assert_eq!(range.next(), Some(Player::Player4));
-        assert_eq!(range.next(), None);
+#[derive(Clone, Copy, Component, Deref)]
+pub struct PlayerComponent(Player);
 
-        assert_eq!(range.next(), Some(Player::Player2));
-        assert_eq!(range.next(), Some(Player::Player3));
-        assert_eq!(range.next(), Some(Player::Player4));
-        assert_eq!(range.next(), None);
+impl From<Player> for PlayerComponent {
+    fn from(player: Player) -> Self {
+        Self(player)
     }
 }
diff --git a/crates/index/Cargo.toml b/crates/index/Cargo.toml
index 18dc75e45..cad6d474b 100644
--- a/crates/index/Cargo.toml
+++ b/crates/index/Cargo.toml
@@ -15,6 +15,7 @@ categories.workspace = true
 # DE
 de_core.workspace = true
 de_objects.workspace = true
+de_types.workspace = true
 
 # Other
 bevy.workspace = true
diff --git a/crates/index/src/range.rs b/crates/index/src/range.rs
index 0a1ca00ac..a3e206f4a 100644
--- a/crates/index/src/range.rs
+++ b/crates/index/src/range.rs
@@ -1,4 +1,4 @@
-use de_core::projection::ToFlat;
+use de_types::projection::ToFlat;
 use glam::{IVec2, Vec2};
 use parry3d::bounding_volume::Aabb;
 
diff --git a/crates/index/src/segment.rs b/crates/index/src/segment.rs
index 290fe8ef7..b72825ad3 100644
--- a/crates/index/src/segment.rs
+++ b/crates/index/src/segment.rs
@@ -2,7 +2,7 @@
 
 use ahash::AHashSet;
 use bevy::prelude::Entity;
-use de_core::projection::ToFlat;
+use de_types::projection::ToFlat;
 use glam::{IVec2, Vec2};
 use parry3d::shape::Segment;
 
diff --git a/crates/index/src/systems.rs b/crates/index/src/systems.rs
index 12ecf74f8..66f2ab70c 100644
--- a/crates/index/src/systems.rs
+++ b/crates/index/src/systems.rs
@@ -4,7 +4,7 @@
 use bevy::prelude::*;
 use de_core::{
     gamestate::GameState,
-    objects::{MovableSolid, ObjectType, StaticSolid},
+    objects::{MovableSolid, ObjectTypeComponent, StaticSolid},
     schedule::PostMovement,
     state::AppState,
 };
@@ -17,7 +17,7 @@ use crate::collider::LocalCollider;
 type SolidEntityQuery<'w, 's> = Query<
     'w,
     's,
-    (Entity, &'static ObjectType, &'static Transform),
+    (Entity, &'static ObjectTypeComponent, &'static Transform),
     (
         Without<Indexed>,
         Or<(With<StaticSolid>, With<MovableSolid>)>,
@@ -92,7 +92,7 @@ fn insert(
             transform.translation.into(),
             transform.rotation.to_scaled_axis().into(),
         );
-        let collider = LocalCollider::new(solids.get(*object_type).collider().clone(), position);
+        let collider = LocalCollider::new(solids.get(**object_type).collider().clone(), position);
         index.insert(entity, collider);
         commands.entity(entity).insert(Indexed);
     }
diff --git a/crates/loader/Cargo.toml b/crates/loader/Cargo.toml
index cbce6bc56..603704a98 100644
--- a/crates/loader/Cargo.toml
+++ b/crates/loader/Cargo.toml
@@ -21,6 +21,7 @@ de_messages.workspace = true
 de_multiplayer.workspace = true
 de_spawner.workspace = true
 de_terrain.workspace = true
+de_types.workspace = true
 
 # Other
 bevy.workspace = true
diff --git a/crates/loader/src/map.rs b/crates/loader/src/map.rs
index 5d8566a35..47954e12e 100644
--- a/crates/loader/src/map.rs
+++ b/crates/loader/src/map.rs
@@ -4,13 +4,8 @@ use bevy::{
 };
 use de_camera::MoveFocusEvent;
 use de_core::{
-    assets::asset_path,
-    cleanup::DespawnOnGameExit,
-    gamestate::GameState,
-    gconfig::GameConfig,
-    log_full_error,
-    objects::{ActiveObjectType, BuildingType, ObjectType},
-    state::AppState,
+    assets::asset_path, cleanup::DespawnOnGameExit, gamestate::GameState, gconfig::GameConfig,
+    log_full_error, player::PlayerComponent, state::AppState,
 };
 use de_map::{
     content::InnerObject,
@@ -20,6 +15,7 @@ use de_map::{
 };
 use de_spawner::SpawnBundle;
 use de_terrain::TerrainBundle;
+use de_types::objects::{ActiveObjectType, BuildingType, ObjectType};
 use futures_lite::future;
 use iyes_progress::prelude::*;
 
@@ -122,7 +118,7 @@ fn spawn_map(
                 }
 
                 (
-                    commands.spawn(player),
+                    commands.spawn(PlayerComponent::from(player)),
                     ObjectType::Active(object.object_type()),
                 )
             }
diff --git a/crates/map/Cargo.toml b/crates/map/Cargo.toml
index cec245e6a..d6a4a9700 100644
--- a/crates/map/Cargo.toml
+++ b/crates/map/Cargo.toml
@@ -13,7 +13,7 @@ categories.workspace = true
 
 [dependencies]
 # DE
-de_core.workspace = true
+de_types.workspace = true
 
 # other
 ahash.workspace = true
diff --git a/crates/map/src/content.rs b/crates/map/src/content.rs
index 8889d258a..c74a5a52c 100644
--- a/crates/map/src/content.rs
+++ b/crates/map/src/content.rs
@@ -1,5 +1,5 @@
 use ahash::AHashMap;
-use de_core::{
+use de_types::{
     objects::{ActiveObjectType, InactiveObjectType, PLAYER_MAX_BUILDINGS, PLAYER_MAX_UNITS},
     player::Player,
 };
diff --git a/crates/map/src/io.rs b/crates/map/src/io.rs
index 43d7ed420..e03e8b20d 100644
--- a/crates/map/src/io.rs
+++ b/crates/map/src/io.rs
@@ -194,7 +194,7 @@ mod test {
     use std::path::PathBuf;
 
     use async_std::task;
-    use de_core::{
+    use de_types::{
         objects::{ActiveObjectType, BuildingType},
         player::Player,
     };
diff --git a/crates/map/src/map.rs b/crates/map/src/map.rs
index a9044e22d..b2abb2e2e 100644
--- a/crates/map/src/map.rs
+++ b/crates/map/src/map.rs
@@ -95,7 +95,7 @@ pub enum MapValidationError {
 mod test {
     use std::error::Error;
 
-    use de_core::{
+    use de_types::{
         objects::{ActiveObjectType, InactiveObjectType, UnitType},
         player::Player,
     };
diff --git a/crates/map/src/meta.rs b/crates/map/src/meta.rs
index 1c65f6261..fb7891b63 100644
--- a/crates/map/src/meta.rs
+++ b/crates/map/src/meta.rs
@@ -1,4 +1,4 @@
-use de_core::player::Player;
+use de_types::player::Player;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
@@ -28,7 +28,7 @@ impl MapMetadata {
     /// * `bounds` - bounds of the map.
     ///
     /// * `max_player` - maximum number of players which can play on the map.
-    ///   For example, if the value is [de_core::player::Player::Player3], then
+    ///   For example, if the value is [de_types::player::Player::Player3], then
     ///   Player1 to `PlayerN` can play.
     ///
     /// # Panics
diff --git a/crates/map/src/placement.rs b/crates/map/src/placement.rs
index 970999911..f7646ac03 100644
--- a/crates/map/src/placement.rs
+++ b/crates/map/src/placement.rs
@@ -1,7 +1,7 @@
 use std::f32::consts::TAU;
 
 use bevy::prelude::Transform;
-use de_core::projection::ToAltitude;
+use de_types::projection::ToAltitude;
 use glam::{Quat, Vec2};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
diff --git a/crates/menu/Cargo.toml b/crates/menu/Cargo.toml
index 5c7620bfd..b290ac4bc 100644
--- a/crates/menu/Cargo.toml
+++ b/crates/menu/Cargo.toml
@@ -21,6 +21,7 @@ de_lobby_model.workspace = true
 de_map.workspace = true
 de_messages.workspace = true
 de_multiplayer.workspace = true
+de_types.workspace = true
 
 # Other
 async-std.workspace = true
diff --git a/crates/menu/src/multiplayer/joined/state.rs b/crates/menu/src/multiplayer/joined/state.rs
index d5a7a80b7..694e57e26 100644
--- a/crates/menu/src/multiplayer/joined/state.rs
+++ b/crates/menu/src/multiplayer/joined/state.rs
@@ -2,7 +2,6 @@ use bevy::prelude::*;
 use de_core::{
     assets::asset_path,
     gconfig::{GameConfig, LocalPlayers},
-    player::Player,
     state::AppState,
 };
 use de_gui::ToastEvent;
@@ -13,6 +12,7 @@ use de_messages::Readiness;
 use de_multiplayer::{
     GameReadinessEvent, PeerJoinedEvent, PeerLeftEvent, ShutdownMultiplayerEvent,
 };
+use de_types::player::Player;
 
 use super::ui::RefreshPlayersEvent;
 use crate::multiplayer::{
diff --git a/crates/menu/src/singleplayer.rs b/crates/menu/src/singleplayer.rs
index 2d8e7a42e..1df1d2bb1 100644
--- a/crates/menu/src/singleplayer.rs
+++ b/crates/menu/src/singleplayer.rs
@@ -2,10 +2,10 @@ use async_std::path::PathBuf;
 use bevy::prelude::*;
 use de_core::{
     gconfig::{GameConfig, LocalPlayers},
-    player::Player,
     state::AppState,
 };
 use de_gui::{ButtonCommands, GuiCommands, OuterStyle, ToastEvent};
+use de_types::player::Player;
 
 use crate::{
     mapselection::{MapSelectedEvent, SelectMapEvent},
diff --git a/crates/movement/Cargo.toml b/crates/movement/Cargo.toml
index c5a3e8c9d..bdac1f27b 100644
--- a/crates/movement/Cargo.toml
+++ b/crates/movement/Cargo.toml
@@ -14,10 +14,11 @@ categories.workspace = true
 [dependencies]
 # DE
 de_core.workspace = true
-de_objects.workspace = true
+de_index.workspace = true
 de_map.workspace = true
+de_objects.workspace = true
 de_pathing.workspace = true
-de_index.workspace = true
+de_types.workspace = true
 
 # Other
 bevy.workspace = true
diff --git a/crates/movement/src/altitude.rs b/crates/movement/src/altitude.rs
index 2bb433ff4..cd4001672 100644
--- a/crates/movement/src/altitude.rs
+++ b/crates/movement/src/altitude.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use de_core::{
     gamestate::GameState,
-    objects::{MovableSolid, ObjectType},
+    objects::{MovableSolid, ObjectTypeComponent},
     schedule::{Movement, PreMovement},
     state::AppState,
 };
@@ -61,15 +61,15 @@ fn setup_entities(
 fn update(
     solids: SolidObjects,
     mut objects: Query<(
-        &ObjectType,
+        &ObjectTypeComponent,
         &mut DesiredVelocity<RepulsionVelocity>,
         &mut DesiredClimbing,
         &Transform,
     )>,
 ) {
     objects.par_iter_mut().for_each_mut(
-        |(&object_type, mut horizontal, mut climbing, transform)| {
-            let Some(flight) = solids.get(object_type).flight() else {
+        |(object_type, mut horizontal, mut climbing, transform)| {
+            let Some(flight) = solids.get(**object_type).flight() else {
                 return;
             };
             let height = transform.translation.y;
diff --git a/crates/movement/src/kinematics.rs b/crates/movement/src/kinematics.rs
index f39ee3a20..b9f1fcf04 100644
--- a/crates/movement/src/kinematics.rs
+++ b/crates/movement/src/kinematics.rs
@@ -4,10 +4,10 @@ use bevy::prelude::*;
 use de_core::{
     gamestate::GameState,
     objects::MovableSolid,
-    projection::ToAltitude,
     schedule::{Movement, PreMovement},
     state::AppState,
 };
+use de_types::projection::ToAltitude;
 
 use crate::{
     altitude::{AltitudeSet, DesiredClimbing},
diff --git a/crates/movement/src/movement.rs b/crates/movement/src/movement.rs
index 0dfcf87dc..167a92880 100644
--- a/crates/movement/src/movement.rs
+++ b/crates/movement/src/movement.rs
@@ -4,12 +4,12 @@ use bevy::prelude::*;
 use de_core::{
     gamestate::GameState,
     objects::MovableSolid,
-    projection::ToAltitude,
     schedule::{Movement, PreMovement},
     state::AppState,
 };
 use de_map::size::MapBounds;
 use de_objects::EXCLUSION_OFFSET;
+use de_types::projection::ToAltitude;
 
 use crate::MAX_ALTITUDE;
 
diff --git a/crates/movement/src/obstacles.rs b/crates/movement/src/obstacles.rs
index 67778bc53..357ac70a6 100644
--- a/crates/movement/src/obstacles.rs
+++ b/crates/movement/src/obstacles.rs
@@ -1,12 +1,12 @@
 use bevy::prelude::*;
 use de_core::{
     gamestate::GameState,
-    objects::{MovableSolid, ObjectType, StaticSolid},
-    projection::ToFlat,
+    objects::{MovableSolid, ObjectTypeComponent, StaticSolid},
     schedule::{Movement, PreMovement},
 };
 use de_index::SpatialQuery;
 use de_objects::SolidObjects;
+use de_types::projection::ToFlat;
 use parry3d::{bounding_volume::Aabb, math::Point};
 
 use crate::{cache::DecayingCache, disc::Disc};
@@ -47,14 +47,14 @@ pub(crate) struct MovableObstacles;
 type Uninitialized<'w, 's> = Query<
     'w,
     's,
-    (Entity, &'static Transform, &'static ObjectType),
+    (Entity, &'static Transform, &'static ObjectTypeComponent),
     (With<MovableSolid>, Without<Disc>),
 >;
 
 fn setup_discs(mut commands: Commands, solids: SolidObjects, objects: Uninitialized) {
     for (entity, transform, &object_type) in objects.iter() {
         let center = transform.translation.to_flat();
-        let radius = solids.get(object_type).ichnography().radius();
+        let radius = solids.get(*object_type).ichnography().radius();
         commands.entity(entity).insert((
             Disc::new(center, radius),
             DecayingCache::<StaticObstacles>::default(),
diff --git a/crates/movement/src/pathing.rs b/crates/movement/src/pathing.rs
index d0adb2316..328e697af 100644
--- a/crates/movement/src/pathing.rs
+++ b/crates/movement/src/pathing.rs
@@ -1,11 +1,11 @@
 use bevy::prelude::*;
 use de_core::{
     gamestate::GameState,
-    projection::ToFlat,
     schedule::{Movement, PreMovement},
     state::AppState,
 };
 use de_pathing::ScheduledPath;
+use de_types::projection::ToFlat;
 
 use crate::{
     movement::{add_desired_velocity, DesiredVelocity},
diff --git a/crates/movement/src/repulsion.rs b/crates/movement/src/repulsion.rs
index 38d197fd6..103cd7312 100644
--- a/crates/movement/src/repulsion.rs
+++ b/crates/movement/src/repulsion.rs
@@ -1,13 +1,13 @@
 use bevy::prelude::*;
 use de_core::{
     gamestate::GameState,
-    objects::{MovableSolid, ObjectType, StaticSolid},
-    projection::ToFlat,
+    objects::{MovableSolid, ObjectTypeComponent, StaticSolid},
     schedule::{Movement, PreMovement},
     state::AppState,
 };
 use de_map::size::MapBounds;
 use de_objects::{SolidObjects, EXCLUSION_OFFSET};
+use de_types::projection::ToFlat;
 use parry2d::{math::Isometry, query::PointQuery};
 
 use crate::{
@@ -155,7 +155,7 @@ fn repel_static(
         &DecayingCache<StaticObstacles>,
         &mut Repulsion,
     )>,
-    obstacles: Query<(&ObjectType, &Transform), With<StaticSolid>>,
+    obstacles: Query<(&ObjectTypeComponent, &Transform), With<StaticSolid>>,
 ) {
     objects
         .par_iter_mut()
@@ -171,7 +171,7 @@ fn repel_static(
                 let isometry = Isometry::new(transform.translation.to_flat().into(), angle);
                 let local_point = isometry.inverse_transform_point(&From::from(disc.center()));
 
-                let footprint = solids.get(object_type).ichnography().convex_hull();
+                let footprint = solids.get(*object_type).ichnography().convex_hull();
                 let (projection, feature_id) =
                     footprint.project_local_point_and_get_feature(&local_point);
 
diff --git a/crates/multiplayer/Cargo.toml b/crates/multiplayer/Cargo.toml
index d38f50b9c..a0a235502 100644
--- a/crates/multiplayer/Cargo.toml
+++ b/crates/multiplayer/Cargo.toml
@@ -17,6 +17,7 @@ de_core.workspace = true
 de_gui.workspace = true
 de_messages.workspace = true
 de_net.workspace = true
+de_types.workspace = true
 
 # Other
 ahash.workspace = true
diff --git a/crates/multiplayer/src/config.rs b/crates/multiplayer/src/config.rs
index 6bfbe9ebb..6cf4269bf 100644
--- a/crates/multiplayer/src/config.rs
+++ b/crates/multiplayer/src/config.rs
@@ -1,6 +1,6 @@
 use std::net::IpAddr;
 
-use de_core::player::Player;
+use de_types::player::Player;
 
 pub struct NetGameConf {
     server_host: IpAddr,
diff --git a/crates/multiplayer/src/game.rs b/crates/multiplayer/src/game.rs
index 1a1ed34c2..a7c13ba63 100644
--- a/crates/multiplayer/src/game.rs
+++ b/crates/multiplayer/src/game.rs
@@ -1,9 +1,10 @@
 use std::net::SocketAddr;
 
 use bevy::prelude::*;
-use de_core::{player::Player, schedule::PreMovement};
+use de_core::schedule::PreMovement;
 use de_messages::{FromGame, FromServer, GameOpenError, JoinError, Readiness, ToGame, ToServer};
 use de_net::Reliability;
+use de_types::player::Player;
 
 use crate::{
     config::ConnectionType,
diff --git a/crates/multiplayer/src/messages.rs b/crates/multiplayer/src/messages.rs
index e4fb8f219..579147a9f 100644
--- a/crates/multiplayer/src/messages.rs
+++ b/crates/multiplayer/src/messages.rs
@@ -330,7 +330,7 @@ fn decode_and_send<P, E>(
 
 #[cfg(test)]
 mod tests {
-    use de_core::player::Player;
+    use de_types::player::Player;
 
     use super::*;
 
diff --git a/crates/objects/Cargo.toml b/crates/objects/Cargo.toml
index 5981700c7..418084aa6 100644
--- a/crates/objects/Cargo.toml
+++ b/crates/objects/Cargo.toml
@@ -14,6 +14,7 @@ categories.workspace = true
 [dependencies]
 # DE
 de_core.workspace = true
+de_types.workspace = true
 
 # Other
 ahash.workspace = true
diff --git a/crates/objects/src/factory.rs b/crates/objects/src/factory.rs
index 9c25a5361..864f91ea8 100644
--- a/crates/objects/src/factory.rs
+++ b/crates/objects/src/factory.rs
@@ -1,6 +1,6 @@
 use ahash::AHashSet;
 use bevy::utils::HashSet;
-use de_core::objects::UnitType;
+use de_types::objects::UnitType;
 use glam::Vec2;
 use serde::{Deserialize, Serialize};
 
diff --git a/crates/objects/src/health.rs b/crates/objects/src/health.rs
index 49a89d07a..f80c7b2cb 100644
--- a/crates/objects/src/health.rs
+++ b/crates/objects/src/health.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::objects::{ActiveObjectType, BuildingType, UnitType};
+use de_types::objects::{ActiveObjectType, BuildingType, UnitType};
 use enum_map::{enum_map, EnumMap};
 
 pub(crate) struct HealthPlugin;
diff --git a/crates/objects/src/names.rs b/crates/objects/src/names.rs
index 594804188..282075ce4 100644
--- a/crates/objects/src/names.rs
+++ b/crates/objects/src/names.rs
@@ -1,4 +1,4 @@
-use de_core::objects::{ActiveObjectType, BuildingType, InactiveObjectType, ObjectType, UnitType};
+use de_types::objects::{ActiveObjectType, BuildingType, InactiveObjectType, ObjectType, UnitType};
 
 pub(crate) trait FileStem: Copy {
     fn stem(self) -> &'static str;
diff --git a/crates/objects/src/scenes.rs b/crates/objects/src/scenes.rs
index bd4402e5d..51b052136 100644
--- a/crates/objects/src/scenes.rs
+++ b/crates/objects/src/scenes.rs
@@ -1,6 +1,7 @@
 use ahash::AHashMap;
 use bevy::prelude::*;
-use de_core::{objects::ObjectType, state::AppState};
+use de_core::state::AppState;
+use de_types::objects::ObjectType;
 use enum_iterator::Sequence;
 use iyes_progress::prelude::*;
 
diff --git a/crates/objects/src/solids.rs b/crates/objects/src/solids.rs
index c80cb32e8..0a4d6b730 100644
--- a/crates/objects/src/solids.rs
+++ b/crates/objects/src/solids.rs
@@ -7,7 +7,8 @@ use bevy::{
     reflect::{TypePath, TypeUuid},
     utils::BoxedFuture,
 };
-use de_core::{objects::ObjectType, state::AppState};
+use de_core::state::AppState;
+use de_types::objects::ObjectType;
 use iyes_progress::prelude::*;
 use serde::{Deserialize, Serialize};
 
diff --git a/crates/pathing/Cargo.toml b/crates/pathing/Cargo.toml
index 5852811dc..1c311735c 100644
--- a/crates/pathing/Cargo.toml
+++ b/crates/pathing/Cargo.toml
@@ -16,6 +16,7 @@ categories.workspace = true
 de_core.workspace = true
 de_map.workspace = true
 de_objects.workspace = true
+de_types.workspace = true
 
 # Other
 bevy.workspace = true
diff --git a/crates/pathing/src/exclusion.rs b/crates/pathing/src/exclusion.rs
index 88df37364..d73965d60 100644
--- a/crates/pathing/src/exclusion.rs
+++ b/crates/pathing/src/exclusion.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::Transform;
-use de_core::projection::ToFlat;
 use de_objects::Ichnography;
+use de_types::projection::ToFlat;
 use glam::EulerRot;
 use parry2d::{
     math::{Isometry, Point},
diff --git a/crates/pathing/src/fplugin.rs b/crates/pathing/src/fplugin.rs
index 8642af148..7d11520c6 100644
--- a/crates/pathing/src/fplugin.rs
+++ b/crates/pathing/src/fplugin.rs
@@ -6,7 +6,7 @@ use bevy::{
 };
 use de_core::{
     gamestate::GameState,
-    objects::{ObjectType, StaticSolid},
+    objects::{ObjectTypeComponent, StaticSolid},
     schedule::PreMovement,
     state::AppState,
 };
@@ -121,13 +121,13 @@ impl UpdateFinderState {
 
     fn spawn_update<'a, T>(&mut self, solids: SolidObjects, bounds: MapBounds, entities: T)
     where
-        T: Iterator<Item = (&'a Transform, &'a ObjectType)>,
+        T: Iterator<Item = (&'a Transform, &'a ObjectTypeComponent)>,
     {
         debug_assert!(self.task.is_none());
 
         let exclusions: Vec<ExclusionArea> = entities
             .map(|(transform, object_type)| {
-                ExclusionArea::from_ichnography(transform, solids.get(*object_type).ichnography())
+                ExclusionArea::from_ichnography(transform, solids.get(**object_type).ichnography())
             })
             .collect();
 
@@ -192,7 +192,7 @@ fn update(
     mut state: ResMut<UpdateFinderState>,
     bounds: Res<MapBounds>,
     solids: SolidObjects,
-    entities: Query<(&Transform, &ObjectType), With<StaticSolid>>,
+    entities: Query<(&Transform, &ObjectTypeComponent), With<StaticSolid>>,
 ) {
     if state.should_update() {
         info!("Spawning path finder update task");
diff --git a/crates/pathing/src/pplugin.rs b/crates/pathing/src/pplugin.rs
index 7e7e6dcb8..d97189bf1 100644
--- a/crates/pathing/src/pplugin.rs
+++ b/crates/pathing/src/pplugin.rs
@@ -7,10 +7,10 @@ use bevy::{
 use de_core::{
     gamestate::GameState,
     objects::MovableSolid,
-    projection::ToFlat,
     schedule::{PostMovement, PreMovement},
     state::AppState,
 };
+use de_types::projection::ToFlat;
 use futures_lite::future;
 
 use crate::{
diff --git a/crates/signs/Cargo.toml b/crates/signs/Cargo.toml
index 2e404328d..c90561c0e 100644
--- a/crates/signs/Cargo.toml
+++ b/crates/signs/Cargo.toml
@@ -17,6 +17,7 @@ de_camera.workspace = true
 de_core.workspace = true
 de_objects.workspace = true
 de_terrain.workspace = true
+de_types.workspace = true
 
 # Other
 ahash.workspace = true
diff --git a/crates/signs/src/bars.rs b/crates/signs/src/bars.rs
index b321794cd..c071605e0 100644
--- a/crates/signs/src/bars.rs
+++ b/crates/signs/src/bars.rs
@@ -14,7 +14,7 @@ use bevy::{
 };
 use de_camera::{CameraDistance, DistanceSet};
 use de_core::{
-    objects::{Active, ObjectType},
+    objects::{Active, ObjectTypeComponent},
     state::AppState,
     visibility::{VisibilityFlags, VisibilitySet},
 };
@@ -204,10 +204,10 @@ fn spawn(
     solids: SolidObjects,
     mesh: Res<BarMesh>,
     mut materials: ResMut<Assets<BarMaterial>>,
-    entities: Query<(Entity, &ObjectType), Added<Active>>,
+    entities: Query<(Entity, &ObjectTypeComponent), Added<Active>>,
 ) {
     for (entity, &object_type) in entities.iter() {
-        let height = solids.get(object_type).collider().aabb().maxs.y + BAR_HEIGHT;
+        let height = solids.get(*object_type).collider().aabb().maxs.y + BAR_HEIGHT;
         let transform = Transform::from_translation(height * Vec3::Y);
 
         let material = materials.add(BarMaterial::default());
diff --git a/crates/signs/src/pole.rs b/crates/signs/src/pole.rs
index 9603ce41f..85b357026 100644
--- a/crates/signs/src/pole.rs
+++ b/crates/signs/src/pole.rs
@@ -1,10 +1,10 @@
 use ahash::{AHashMap, AHashSet};
 use bevy::prelude::*;
 use de_core::{
-    cleanup::DespawnOnGameExit, objects::ObjectType, projection::ToAltitude, state::AppState,
-    vecord::Vec2Ord,
+    cleanup::DespawnOnGameExit, objects::ObjectTypeComponent, state::AppState, vecord::Vec2Ord,
 };
 use de_objects::{AssetCollection, SceneType, Scenes};
+use de_types::projection::ToAltitude;
 
 pub(crate) struct PolePlugin;
 
@@ -153,7 +153,7 @@ fn visibility_events(
 
 fn despawned(
     mut owner_to_pole: ResMut<OwnersToPoles>,
-    mut despawned: RemovedComponents<ObjectType>,
+    mut despawned: RemovedComponents<ObjectTypeComponent>,
 ) {
     for entity in despawned.iter() {
         owner_to_pole.0.remove(&entity);
diff --git a/crates/spawner/Cargo.toml b/crates/spawner/Cargo.toml
index f585541c0..a9709df38 100644
--- a/crates/spawner/Cargo.toml
+++ b/crates/spawner/Cargo.toml
@@ -18,11 +18,12 @@ godmode = []
 # DE
 de_audio.workspace = true
 de_core.workspace = true
+de_energy.workspace = true
 de_index.workspace = true
 de_map.workspace = true
 de_objects.workspace = true
 de_terrain.workspace = true
-de_energy.workspace = true
+de_types.workspace = true
 
 # Other
 ahash.workspace = true
diff --git a/crates/spawner/src/counter.rs b/crates/spawner/src/counter.rs
index 27420176a..4d0ae8d8e 100644
--- a/crates/spawner/src/counter.rs
+++ b/crates/spawner/src/counter.rs
@@ -5,7 +5,8 @@ use std::{
 
 use ahash::AHashMap;
 use bevy::prelude::*;
-use de_core::{objects::ActiveObjectType, player::Player, state::AppState};
+use de_core::state::AppState;
+use de_types::{objects::ActiveObjectType, player::Player};
 
 pub(crate) struct CounterPlugin;
 
diff --git a/crates/spawner/src/despawner.rs b/crates/spawner/src/despawner.rs
index f31a696e2..8b4ecb7b4 100644
--- a/crates/spawner/src/despawner.rs
+++ b/crates/spawner/src/despawner.rs
@@ -3,9 +3,9 @@ use std::marker::PhantomData;
 use bevy::ecs::query::{ReadOnlyWorldQuery, WorldQuery};
 use bevy::prelude::*;
 use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
-use de_core::objects::ActiveObjectType;
-use de_core::{objects::ObjectType, player::Player, state::AppState};
+use de_core::{objects::ObjectTypeComponent, player::PlayerComponent, state::AppState};
 use de_objects::Health;
+use de_types::objects::{ActiveObjectType, ObjectType};
 
 use crate::ObjectCounter;
 
@@ -45,14 +45,23 @@ pub struct DespawnEvent(Entity);
 /// Find all entities with low health and mark them for despawning
 fn find_dead(
     mut counter: ResMut<ObjectCounter>,
-    entities: Query<(Entity, &Player, &ObjectType, &Health, &Transform), Changed<Health>>,
+    entities: Query<
+        (
+            Entity,
+            &PlayerComponent,
+            &ObjectTypeComponent,
+            &Health,
+            &Transform,
+        ),
+        Changed<Health>,
+    >,
     mut event_writer: EventWriter<DespawnEvent>,
     mut play_audio: EventWriter<PlaySpatialAudioEvent>,
 ) {
     for (entity, &player, &object_type, health, transform) in entities.iter() {
         if health.destroyed() {
-            if let ObjectType::Active(active_type) = object_type {
-                counter.player_mut(player).update(active_type, -1);
+            if let ObjectType::Active(active_type) = *object_type {
+                counter.player_mut(*player).update(active_type, -1);
 
                 play_audio.send(PlaySpatialAudioEvent::new(
                     match active_type {
diff --git a/crates/spawner/src/draft.rs b/crates/spawner/src/draft.rs
index 52c248106..6d57591be 100644
--- a/crates/spawner/src/draft.rs
+++ b/crates/spawner/src/draft.rs
@@ -9,13 +9,16 @@ use bevy::scene::SceneInstance;
 use bevy::{pbr::NotShadowCaster, prelude::*};
 use de_core::{
     gamestate::GameState,
-    objects::{ActiveObjectType, BuildingType, MovableSolid, ObjectType, StaticSolid},
-    projection::ToFlat,
+    objects::{MovableSolid, ObjectTypeComponent, StaticSolid},
     state::AppState,
 };
 use de_index::{ColliderWithCache, IndexSet, QueryCollider, SpatialQuery};
 use de_map::size::MapBounds;
 use de_objects::{AssetCollection, SceneType, Scenes, SolidObjects, EXCLUSION_OFFSET};
+use de_types::{
+    objects::{ActiveObjectType, BuildingType, ObjectType},
+    projection::ToFlat,
+};
 use parry2d::{
     bounding_volume::{Aabb, BoundingVolume},
     math::Vector,
@@ -47,7 +50,7 @@ impl Plugin for DraftPlugin {
 /// Bundle to spawn a construction draft.
 #[derive(Bundle)]
 pub struct DraftBundle {
-    object_type: ObjectType,
+    object_type: ObjectTypeComponent,
     transform: Transform,
     global_transform: GlobalTransform,
     visibility: Visibility,
@@ -59,7 +62,7 @@ pub struct DraftBundle {
 impl DraftBundle {
     pub fn new(building_type: BuildingType, transform: Transform) -> Self {
         Self {
-            object_type: ObjectType::Active(ActiveObjectType::Building(building_type)),
+            object_type: ObjectType::Active(ActiveObjectType::Building(building_type)).into(),
             transform,
             global_transform: transform.into(),
             visibility: Visibility::Inherited,
@@ -86,13 +89,13 @@ type Solids<'w, 's> = SpatialQuery<'w, 's, Entity, Or<(With<StaticSolid>, With<M
 
 fn new_draft(
     mut commands: Commands,
-    drafts: Query<(Entity, &ObjectType), Added<DraftAllowed>>,
+    drafts: Query<(Entity, &ObjectTypeComponent), Added<DraftAllowed>>,
     scenes: Res<Scenes>,
 ) {
     for (entity, object_type) in drafts.iter() {
         commands.entity(entity).with_children(|parent| {
             parent.spawn(SceneBundle {
-                scene: scenes.get(SceneType::Solid(*object_type)).clone(),
+                scene: scenes.get(SceneType::Solid(**object_type)).clone(),
                 ..Default::default()
             });
         });
@@ -100,14 +103,14 @@ fn new_draft(
 }
 
 fn update_draft(
-    mut drafts: Query<(&Transform, &ObjectType, &mut DraftAllowed)>,
+    mut drafts: Query<(&Transform, &ObjectTypeComponent, &mut DraftAllowed)>,
     solids: Solids,
     solid_objects: SolidObjects,
     bounds: Res<MapBounds>,
 ) {
     for (transform, &object_type, mut draft) in drafts.iter_mut() {
         let collider = QueryCollider::new(
-            solid_objects.get(object_type).collider(),
+            solid_objects.get(*object_type).collider(),
             Isometry::new(
                 transform.translation.into(),
                 transform.rotation.to_scaled_axis().into(),
diff --git a/crates/spawner/src/spawner.rs b/crates/spawner/src/spawner.rs
index ddb946a94..2e9f444f7 100644
--- a/crates/spawner/src/spawner.rs
+++ b/crates/spawner/src/spawner.rs
@@ -4,12 +4,13 @@ use bevy::prelude::*;
 use de_core::{
     gamestate::GameState,
     gconfig::GameConfig,
-    objects::{Active, ActiveObjectType, MovableSolid, ObjectType, Playable, StaticSolid},
-    player::Player,
+    objects::{Active, MovableSolid, ObjectTypeComponent, Playable, StaticSolid},
+    player::PlayerComponent,
 };
 use de_energy::Battery;
 use de_objects::{AssetCollection, InitialHealths, SceneType, Scenes, SolidObjects};
 use de_terrain::{CircleMarker, MarkerVisibility, RectangleMarker};
+use de_types::objects::{ActiveObjectType, ObjectType};
 
 use crate::ObjectCounter;
 
@@ -23,7 +24,7 @@ impl Plugin for SpawnerPlugin {
 
 #[derive(Bundle)]
 pub struct SpawnBundle {
-    object_type: ObjectType,
+    object_type: ObjectTypeComponent,
     transform: Transform,
     global_transform: GlobalTransform,
     visibility: Visibility,
@@ -34,7 +35,7 @@ pub struct SpawnBundle {
 impl SpawnBundle {
     pub fn new(object_type: ObjectType, transform: Transform) -> Self {
         Self {
-            object_type,
+            object_type: object_type.into(),
             transform,
             global_transform: transform.into(),
             visibility: Visibility::Inherited,
@@ -54,7 +55,15 @@ fn spawn(
     solids: SolidObjects,
     healths: Res<InitialHealths>,
     mut counter: ResMut<ObjectCounter>,
-    to_spawn: Query<(Entity, &ObjectType, &GlobalTransform, Option<&Player>), With<Spawn>>,
+    to_spawn: Query<
+        (
+            Entity,
+            &ObjectTypeComponent,
+            &GlobalTransform,
+            Option<&PlayerComponent>,
+        ),
+        With<Spawn>,
+    >,
 ) {
     for (entity, &object_type, transform, player) in to_spawn.iter() {
         info!("Spawning object {}", object_type);
@@ -62,18 +71,18 @@ fn spawn(
         let mut entity_commands = commands.entity(entity);
         entity_commands
             .remove::<Spawn>()
-            .insert(scenes.get(SceneType::Solid(object_type)).clone());
+            .insert(scenes.get(SceneType::Solid(*object_type)).clone());
 
-        let solid = solids.get(object_type);
-        match object_type {
+        let solid = solids.get(*object_type);
+        match *object_type {
             ObjectType::Active(active_type) => {
                 entity_commands.insert(Active);
                 entity_commands.insert(Battery::default());
 
                 let player = *player.expect("Active object without an associated was spawned.");
-                counter.player_mut(player).update(active_type, 1);
+                counter.player_mut(*player).update(active_type, 1);
 
-                if game_config.locals().is_playable(player) || cfg!(feature = "godmode") {
+                if game_config.locals().is_playable(*player) || cfg!(feature = "godmode") {
                     entity_commands.insert(Playable);
                 }
 
diff --git a/crates/terrain/Cargo.toml b/crates/terrain/Cargo.toml
index 05dabcf03..80e136fc1 100644
--- a/crates/terrain/Cargo.toml
+++ b/crates/terrain/Cargo.toml
@@ -16,6 +16,7 @@ categories.workspace = true
 de_core.workspace = true
 de_map.workspace = true
 de_objects.workspace = true
+de_types.workspace = true
 
 # Other
 bevy.workspace = true
diff --git a/crates/terrain/src/marker.rs b/crates/terrain/src/marker.rs
index f56fba5aa..1295f2613 100644
--- a/crates/terrain/src/marker.rs
+++ b/crates/terrain/src/marker.rs
@@ -7,10 +7,10 @@ use bevy::{
     utils::FloatOrd,
 };
 use de_core::{
-    frustum, gamestate::GameState, objects::ObjectType, projection::ToFlat,
-    visibility::VisibilityFlags,
+    frustum, gamestate::GameState, objects::ObjectTypeComponent, visibility::VisibilityFlags,
 };
 use de_objects::SolidObjects;
+use de_types::projection::ToFlat;
 use glam::Vec3A;
 use parry2d::bounding_volume::Aabb;
 
@@ -119,7 +119,7 @@ fn update_markers<M>(
     camera: Query<(&Transform, &Frustum), With<Camera3d>>,
     terrains: Query<(&ComputedVisibility, &Handle<TerrainMaterial>)>,
     markers: Query<(
-        &ObjectType,
+        &ObjectTypeComponent,
         &ComputedVisibility,
         &GlobalTransform,
         &M,
@@ -148,7 +148,7 @@ fn update_markers<M>(
             continue;
         }
 
-        let aabb = solids.get(object_type).collider().aabb();
+        let aabb = solids.get(*object_type).collider().aabb();
         let aabb = BevyAabb {
             center: Vec3A::from(aabb.center()),
             half_extents: Vec3A::from(aabb.half_extents()),
diff --git a/crates/terrain/src/shader.rs b/crates/terrain/src/shader.rs
index d9d3f32d0..1e4663a47 100644
--- a/crates/terrain/src/shader.rs
+++ b/crates/terrain/src/shader.rs
@@ -8,10 +8,10 @@ use bevy::{
 use glam::{Mat3, Vec2};
 
 // * Keep this in sync with terrain.wgsl.
-// * Keep this smaller or equal to de_core::objects::PLAYER_MAX_UNITS.
+// * Keep this smaller or equal to de_types::objects::PLAYER_MAX_UNITS.
 pub(crate) const CIRCLE_CAPACITY: usize = 127;
 // * Keep this in sync with terrain.wgsl.
-// * Keep this smaller or equal to de_core::objects::PLAYER_MAX_BUILDINGS.
+// * Keep this smaller or equal to de_types::objects::PLAYER_MAX_BUILDINGS.
 pub(crate) const RECTANGLE_CAPACITY: usize = 31;
 
 #[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
diff --git a/crates/terrain/src/terrain.rs b/crates/terrain/src/terrain.rs
index 6494524d9..6af7a6148 100644
--- a/crates/terrain/src/terrain.rs
+++ b/crates/terrain/src/terrain.rs
@@ -4,8 +4,8 @@ use bevy::{
     render::{mesh::Indices, render_resource::PrimitiveTopology},
     utils::FloatOrd,
 };
-use de_core::projection::{ToAltitude, ToFlat};
 use de_map::size::MapBounds;
+use de_types::projection::{ToAltitude, ToFlat};
 use glam::{Vec2, Vec3};
 use parry3d::{
     math::Isometry,
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
new file mode 100644
index 000000000..6b317b275
--- /dev/null
+++ b/crates/types/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "de_types"
+description = "Various types for Digital Extinction."
+
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+repository.workspace = true
+keywords.workspace = true
+homepage.workspace = true
+license.workspace = true
+categories.workspace = true
+
+[dependencies]
+enum-iterator.workspace = true
+enum-map.workspace = true
+glam.workspace = true
+nalgebra.workspace = true
+parry2d.workspace = true
+parry3d.workspace = true
+serde.workspace = true
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
new file mode 100644
index 000000000..3c32e438a
--- /dev/null
+++ b/crates/types/src/lib.rs
@@ -0,0 +1,9 @@
+//! This crate implements various types and utilities used across Digital
+//! Extinction.
+//!
+//! It is lightweight and without mandatory dependency on Bevy so it can be
+//! used outside of the game itself (for example in DE Connector).
+
+pub mod objects;
+pub mod player;
+pub mod projection;
diff --git a/crates/types/src/objects.rs b/crates/types/src/objects.rs
new file mode 100644
index 000000000..08d531457
--- /dev/null
+++ b/crates/types/src/objects.rs
@@ -0,0 +1,84 @@
+#![allow(clippy::modulo_one)] // Caused by derive(Enum) on an enum with only a
+                              // single variant.
+
+use std::fmt;
+
+use enum_iterator::Sequence;
+use enum_map::Enum;
+use serde::{Deserialize, Serialize};
+
+/// Maximum number of buildings belonging to a single player.
+pub const PLAYER_MAX_BUILDINGS: u32 = 128;
+/// Maximum number of units belonging to a single player.
+pub const PLAYER_MAX_UNITS: u32 = 1024;
+
+#[derive(Enum, Sequence, Copy, Clone, PartialEq, Eq, Hash)]
+pub enum ObjectType {
+    Active(ActiveObjectType),
+    Inactive(InactiveObjectType),
+}
+
+impl fmt::Display for ObjectType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Active(active) => write!(f, "Active -> {active}"),
+            Self::Inactive(inactive) => write!(f, "Inactive -> {inactive}"),
+        }
+    }
+}
+
+#[derive(Enum, Sequence, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub enum InactiveObjectType {
+    Tree,
+}
+
+impl fmt::Display for InactiveObjectType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Tree => write!(f, "Tree"),
+        }
+    }
+}
+
+#[derive(Enum, Sequence, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub enum ActiveObjectType {
+    Building(BuildingType),
+    Unit(UnitType),
+}
+
+impl fmt::Display for ActiveObjectType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Building(building) => write!(f, "Building -> {building}"),
+            Self::Unit(unit) => write!(f, "Unit -> {unit}"),
+        }
+    }
+}
+
+#[derive(Enum, Sequence, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub enum BuildingType {
+    Base,
+    PowerHub,
+}
+
+impl fmt::Display for BuildingType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Base => write!(f, "Base"),
+            Self::PowerHub => write!(f, "Power Hub"),
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Enum, Sequence, Hash)]
+pub enum UnitType {
+    Attacker,
+}
+
+impl fmt::Display for UnitType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Attacker => write!(f, "Attacker"),
+        }
+    }
+}
diff --git a/crates/types/src/player.rs b/crates/types/src/player.rs
new file mode 100644
index 000000000..33546cff1
--- /dev/null
+++ b/crates/types/src/player.rs
@@ -0,0 +1,144 @@
+use core::fmt;
+use std::cmp::Ordering;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub enum Player {
+    #[default]
+    Player1,
+    Player2,
+    Player3,
+    Player4,
+}
+
+impl Player {
+    pub const MAX_PLAYERS: usize = 4;
+
+    pub fn to_num(self) -> u8 {
+        match self {
+            Self::Player1 => 1,
+            Self::Player2 => 2,
+            Self::Player3 => 3,
+            Self::Player4 => 4,
+        }
+    }
+
+    fn next(self) -> Option<Self> {
+        self.to_num()
+            .checked_add(1)
+            .and_then(|num| Self::try_from(num).ok())
+    }
+}
+
+impl fmt::Display for Player {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "player {}", self.to_num())
+    }
+}
+
+impl PartialOrd for Player {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.to_num().partial_cmp(&other.to_num())
+    }
+}
+
+impl Ord for Player {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.partial_cmp(other).unwrap()
+    }
+}
+
+impl TryFrom<u8> for Player {
+    type Error = String;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            1 => Ok(Player::Player1),
+            2 => Ok(Player::Player2),
+            3 => Ok(Player::Player3),
+            4 => Ok(Player::Player4),
+            value => Err(format!(
+                "Player number must be between 1 and 4, got {value}."
+            )),
+        }
+    }
+}
+
+pub struct PlayerRange {
+    start: Player,
+    stop: Player,
+    current: Option<Player>,
+}
+
+impl PlayerRange {
+    /// Returns inclusive player range from first player to `stop`.
+    pub fn up_to(stop: Player) -> Self {
+        Self::new(Player::Player1, stop)
+    }
+
+    /// # Arguments
+    ///
+    /// * `start` - first player, inclusive.
+    ///
+    /// * `stop` - last player, inclusive.
+    pub fn new(start: Player, stop: Player) -> Self {
+        assert!(start <= stop);
+        Self {
+            start,
+            stop,
+            current: Some(start),
+        }
+    }
+
+    pub fn contains(&self, player: Player) -> bool {
+        self.start <= player && player <= self.stop
+    }
+}
+
+impl Iterator for PlayerRange {
+    type Item = Player;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.current {
+            Some(current) => {
+                self.current = current.next();
+                Some(current)
+            }
+            None => {
+                self.current = Some(self.start);
+                None
+            }
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let size = match self.current {
+            Some(current) => 1 + (self.stop.to_num() - current.to_num()) as usize,
+            None => 0,
+        };
+        (size, Some(size))
+    }
+}
+
+impl ExactSizeIterator for PlayerRange {}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_range() {
+        let mut range = PlayerRange::new(Player::Player2, Player::Player4);
+
+        assert_eq!(range.next(), Some(Player::Player2));
+        assert_eq!(range.next(), Some(Player::Player3));
+        assert_eq!(range.next(), Some(Player::Player4));
+        assert_eq!(range.next(), None);
+
+        assert_eq!(range.next(), Some(Player::Player2));
+        assert_eq!(range.next(), Some(Player::Player3));
+        assert_eq!(range.next(), Some(Player::Player4));
+        assert_eq!(range.next(), None);
+    }
+}
diff --git a/crates/core/src/projection.rs b/crates/types/src/projection.rs
similarity index 100%
rename from crates/core/src/projection.rs
rename to crates/types/src/projection.rs