diff --git a/crates/camera/src/camera.rs b/crates/camera/src/camera.rs
index 8566a097..f446c748 100644
--- a/crates/camera/src/camera.rs
+++ b/crates/camera/src/camera.rs
@@ -3,11 +3,11 @@ use std::f32::consts::FRAC_PI_2;
 use bevy::prelude::*;
 use de_conf::{CameraConf, Configuration};
 use de_core::{
-    schedule::{InputSchedule, Movement, PreMovement},
     cleanup::DespawnOnGameExit,
     events::ResendEventPlugin,
     gamestate::GameState,
     projection::ToAltitude,
+    schedule::{InputSchedule, Movement, PreMovement},
     state::AppState,
 };
 use de_map::size::MapBounds;
diff --git a/crates/controller/src/commands/executor.rs b/crates/controller/src/commands/executor.rs
index c6a77f33..c67bc42a 100644
--- a/crates/controller/src/commands/executor.rs
+++ b/crates/controller/src/commands/executor.rs
@@ -2,7 +2,7 @@ use bevy::prelude::*;
 use de_behaviour::ChaseTargetEvent;
 use de_combat::AttackEvent;
 use de_construction::{AssemblyLine, ChangeDeliveryLocationEvent};
-use de_core::{schedule::InputSchedule, gamestate::GameState, objects::MovableSolid};
+use de_core::{gamestate::GameState, objects::MovableSolid, schedule::InputSchedule};
 use de_pathing::{PathQueryProps, PathTarget, UpdateEntityPathEvent};
 use glam::Vec2;
 
diff --git a/crates/controller/src/commands/handlers.rs b/crates/controller/src/commands/handlers.rs
index e646b513..9dcbac58 100644
--- a/crates/controller/src/commands/handlers.rs
+++ b/crates/controller/src/commands/handlers.rs
@@ -15,12 +15,12 @@ use de_camera::{
 };
 use de_conf::Configuration;
 use de_core::{
-    schedule::InputSchedule,
     gamestate::GameState,
     gconfig::GameConfig,
     objects::{BuildingType, ObjectType, Playable, PLAYER_MAX_BUILDINGS},
     player::Player,
     projection::ToFlat,
+    schedule::InputSchedule,
     screengeom::ScreenRect,
 };
 use de_spawner::{DraftAllowed, ObjectCounter};
diff --git a/crates/controller/src/draft.rs b/crates/controller/src/draft.rs
index 9a2cad70..920cc6a1 100644
--- a/crates/controller/src/draft.rs
+++ b/crates/controller/src/draft.rs
@@ -1,10 +1,10 @@
 use bevy::prelude::*;
 use de_core::{
-    schedule::InputSchedule,
     cleanup::DespawnOnGameExit,
     gamestate::GameState,
     gconfig::GameConfig,
     objects::{BuildingType, ObjectType},
+    schedule::InputSchedule,
     state::AppState,
 };
 use de_spawner::{DraftAllowed, DraftBundle, SpawnBundle};
diff --git a/crates/controller/src/hud/actionbar.rs b/crates/controller/src/hud/actionbar.rs
index 31bfe781..f734ec9a 100644
--- a/crates/controller/src/hud/actionbar.rs
+++ b/crates/controller/src/hud/actionbar.rs
@@ -1,10 +1,10 @@
 use bevy::prelude::*;
 use de_construction::EnqueueAssemblyEvent;
 use de_core::{
-    schedule::InputSchedule,
     cleanup::DespawnOnGameExit,
     gamestate::GameState,
     objects::{ObjectType, UnitType},
+    schedule::InputSchedule,
 };
 use de_gui::{ButtonCommands, GuiCommands, OuterStyle};
 use de_objects::SolidObjects;
diff --git a/crates/controller/src/hud/menu.rs b/crates/controller/src/hud/menu.rs
index 711b8ced..7490f624 100644
--- a/crates/controller/src/hud/menu.rs
+++ b/crates/controller/src/hud/menu.rs
@@ -1,7 +1,7 @@
 use core::fmt;
 
 use bevy::prelude::*;
-use de_core::{schedule::InputSchedule, gamestate::GameState, state::AppState};
+use de_core::{gamestate::GameState, schedule::InputSchedule, state::AppState};
 use de_gui::{ButtonCommands, GuiCommands, OuterStyle};
 
 use super::interaction::InteractionBlocker;
diff --git a/crates/controller/src/hud/minimap/fill.rs b/crates/controller/src/hud/minimap/fill.rs
index a9dbc546..dc372ef0 100644
--- a/crates/controller/src/hud/minimap/fill.rs
+++ b/crates/controller/src/hud/minimap/fill.rs
@@ -1,7 +1,7 @@
 use bevy::{ecs::system::SystemParam, prelude::*};
 use de_core::{
-    schedule::PostMovement, gamestate::GameState, gconfig::GameConfig, objects::ObjectType,
-    player::Player, projection::ToFlat,
+    gamestate::GameState, gconfig::GameConfig, objects::ObjectType, player::Player,
+    projection::ToFlat, schedule::PostMovement,
 };
 use de_map::size::MapBounds;
 use de_objects::SolidObjects;
diff --git a/crates/controller/src/hud/minimap/interaction.rs b/crates/controller/src/hud/minimap/interaction.rs
index 33bb6301..86962677 100644
--- a/crates/controller/src/hud/minimap/interaction.rs
+++ b/crates/controller/src/hud/minimap/interaction.rs
@@ -6,7 +6,7 @@ use bevy::{
     window::PrimaryWindow,
 };
 use de_camera::MoveFocusEvent;
-use de_core::{schedule::InputSchedule, gamestate::GameState};
+use de_core::{gamestate::GameState, schedule::InputSchedule};
 use de_map::size::MapBounds;
 
 use super::nodes::MinimapNode;
diff --git a/crates/controller/src/hud/minimap/nodes.rs b/crates/controller/src/hud/minimap/nodes.rs
index 79209829..c17466e0 100644
--- a/crates/controller/src/hud/minimap/nodes.rs
+++ b/crates/controller/src/hud/minimap/nodes.rs
@@ -2,7 +2,7 @@ use bevy::{
     prelude::*,
     render::render_resource::{Extent3d, TextureDimension, TextureFormat},
 };
-use de_core::{schedule::PreMovement, cleanup::DespawnOnGameExit, gamestate::GameState};
+use de_core::{cleanup::DespawnOnGameExit, gamestate::GameState, schedule::PreMovement};
 use de_map::size::MapBounds;
 
 use crate::hud::{interaction::InteractionBlocker, HUD_COLOR};
diff --git a/crates/controller/src/mouse/pointer.rs b/crates/controller/src/mouse/pointer.rs
index 16a248a0..90083500 100644
--- a/crates/controller/src/mouse/pointer.rs
+++ b/crates/controller/src/mouse/pointer.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{schedule::InputSchedule, gamestate::GameState, state::AppState};
+use de_core::{gamestate::GameState, schedule::InputSchedule, state::AppState};
 use de_index::SpatialQuery;
 use de_signs::UpdateBarVisibilityEvent;
 use de_terrain::TerrainCollider;
diff --git a/crates/controller/src/selection/area.rs b/crates/controller/src/selection/area.rs
index 81473cf8..4a51d844 100644
--- a/crates/controller/src/selection/area.rs
+++ b/crates/controller/src/selection/area.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 use de_core::{
-    schedule::InputSchedule,
     frustum,
     gamestate::GameState,
     objects::{ObjectType, Playable},
+    schedule::InputSchedule,
     screengeom::ScreenRect,
 };
 use de_objects::SolidObjects;
diff --git a/crates/controller/src/selection/bookkeeping.rs b/crates/controller/src/selection/bookkeeping.rs
index 6f83c6c6..57dce232 100644
--- a/crates/controller/src/selection/bookkeeping.rs
+++ b/crates/controller/src/selection/bookkeeping.rs
@@ -1,6 +1,6 @@
 use ahash::AHashSet;
 use bevy::{ecs::system::SystemParam, prelude::*};
-use de_core::{schedule::InputSchedule, gamestate::GameState};
+use de_core::{gamestate::GameState, schedule::InputSchedule};
 use de_signs::{UpdateBarVisibilityEvent, UpdateLineVisibilityEvent, UpdatePoleVisibilityEvent};
 use de_terrain::MarkerVisibility;
 
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
index b2158124..89537061 100644
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -1,13 +1,12 @@
-use schedule::GameSchedulesPlugin;
 use bevy::{app::PluginGroupBuilder, prelude::PluginGroup};
 use cleanup::CleanupPlugin;
 use gamestate::GameStateSetupPlugin;
 use iyes_progress::prelude::*;
+use schedule::GameSchedulesPlugin;
 use state::AppState;
 use visibility::VisibilityPlugin;
 
 pub mod assets;
-pub mod schedule;
 pub mod cleanup;
 mod errors;
 pub mod events;
@@ -20,6 +19,7 @@ pub mod gresult;
 pub mod objects;
 pub mod player;
 pub mod projection;
+pub mod schedule;
 pub mod screengeom;
 pub mod state;
 pub mod transition;
diff --git a/crates/index/src/systems.rs b/crates/index/src/systems.rs
index f40900b0..76367342 100644
--- a/crates/index/src/systems.rs
+++ b/crates/index/src/systems.rs
@@ -3,9 +3,9 @@
 
 use bevy::prelude::*;
 use de_core::{
-    schedule::PostMovement,
     gamestate::GameState,
     objects::{MovableSolid, ObjectType, StaticSolid},
+    schedule::PostMovement,
     state::AppState,
 };
 use de_objects::SolidObjects;
diff --git a/crates/movement/src/altitude.rs b/crates/movement/src/altitude.rs
index 48284d4f..2bb433ff 100644
--- a/crates/movement/src/altitude.rs
+++ b/crates/movement/src/altitude.rs
@@ -1,8 +1,8 @@
 use bevy::prelude::*;
 use de_core::{
-    schedule::{Movement, PreMovement},
     gamestate::GameState,
     objects::{MovableSolid, ObjectType},
+    schedule::{Movement, PreMovement},
     state::AppState,
 };
 use de_objects::SolidObjects;
diff --git a/crates/movement/src/kinematics.rs b/crates/movement/src/kinematics.rs
index 1d207a98..f39ee3a2 100644
--- a/crates/movement/src/kinematics.rs
+++ b/crates/movement/src/kinematics.rs
@@ -2,10 +2,10 @@ use std::f32::consts::{FRAC_PI_4, PI, TAU};
 
 use bevy::prelude::*;
 use de_core::{
-    schedule::{Movement, PreMovement},
     gamestate::GameState,
     objects::MovableSolid,
     projection::ToAltitude,
+    schedule::{Movement, PreMovement},
     state::AppState,
 };
 
diff --git a/crates/movement/src/movement.rs b/crates/movement/src/movement.rs
index 63494828..0dfcf87d 100644
--- a/crates/movement/src/movement.rs
+++ b/crates/movement/src/movement.rs
@@ -2,10 +2,10 @@ use std::marker::PhantomData;
 
 use bevy::prelude::*;
 use de_core::{
-    schedule::{Movement, PreMovement},
     gamestate::GameState,
     objects::MovableSolid,
     projection::ToAltitude,
+    schedule::{Movement, PreMovement},
     state::AppState,
 };
 use de_map::size::MapBounds;
diff --git a/crates/movement/src/obstacles.rs b/crates/movement/src/obstacles.rs
index aaa56276..fb66b8d6 100644
--- a/crates/movement/src/obstacles.rs
+++ b/crates/movement/src/obstacles.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 use de_core::{
-    schedule::{Movement, PreMovement},
     gamestate::GameState,
     objects::{MovableSolid, ObjectType, StaticSolid},
     projection::ToFlat,
+    schedule::{Movement, PreMovement},
 };
 use de_index::SpatialQuery;
 use de_objects::SolidObjects;
diff --git a/crates/movement/src/pathing.rs b/crates/movement/src/pathing.rs
index efc483dc..d0adb231 100644
--- a/crates/movement/src/pathing.rs
+++ b/crates/movement/src/pathing.rs
@@ -1,8 +1,8 @@
 use bevy::prelude::*;
 use de_core::{
-    schedule::{Movement, PreMovement},
     gamestate::GameState,
     projection::ToFlat,
+    schedule::{Movement, PreMovement},
     state::AppState,
 };
 use de_pathing::ScheduledPath;
diff --git a/crates/movement/src/repulsion.rs b/crates/movement/src/repulsion.rs
index 9430aff7..37d37de4 100644
--- a/crates/movement/src/repulsion.rs
+++ b/crates/movement/src/repulsion.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 use de_core::{
-    schedule::{Movement, PreMovement},
     gamestate::GameState,
     objects::{MovableSolid, ObjectType, StaticSolid},
     projection::ToFlat,
+    schedule::{Movement, PreMovement},
     state::AppState,
 };
 use de_map::size::MapBounds;
diff --git a/crates/multiplayer/src/game.rs b/crates/multiplayer/src/game.rs
index 93cf5a1a..01ecfd5a 100644
--- a/crates/multiplayer/src/game.rs
+++ b/crates/multiplayer/src/game.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use de_core::{schedule::PreMovement, player::Player};
+use de_core::{player::Player, schedule::PreMovement};
 use de_net::{FromGame, FromServer, GameOpenError, JoinError, ToGame, ToServer};
 
 use crate::{
diff --git a/crates/pathing/src/fplugin.rs b/crates/pathing/src/fplugin.rs
index 008a2b6d..e2fd89b1 100644
--- a/crates/pathing/src/fplugin.rs
+++ b/crates/pathing/src/fplugin.rs
@@ -5,9 +5,9 @@ use bevy::{
     tasks::{AsyncComputeTaskPool, Task},
 };
 use de_core::{
-    schedule::PreMovement,
     gamestate::GameState,
     objects::{ObjectType, StaticSolid},
+    schedule::PreMovement,
     state::AppState,
 };
 use de_map::size::MapBounds;
diff --git a/crates/pathing/src/pplugin.rs b/crates/pathing/src/pplugin.rs
index f4ab7723..df88051f 100644
--- a/crates/pathing/src/pplugin.rs
+++ b/crates/pathing/src/pplugin.rs
@@ -4,10 +4,10 @@ use bevy::{
     tasks::{AsyncComputeTaskPool, Task},
 };
 use de_core::{
-    schedule::{PostMovement, PreMovement},
     gamestate::GameState,
     objects::MovableSolid,
     projection::ToFlat,
+    schedule::{PostMovement, PreMovement},
     state::AppState,
 };
 use futures_lite::future;