chore: rename ecs* crates to engine-ecs*HEADmaster

74 files changed, 205 insertions, 214 deletions

diff --git a/Cargo.lock b/Cargo.lock
index d864a95..16cb0e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -553,35 +553,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
-name = "ecs"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "backtrace",
- "criterion",
- "ecs-macros",
- "hashbrown 0.15.2",
- "parking_lot",
- "paste",
- "seq-macro",
- "thiserror",
- "tracing",
- "tracing-subscriber",
- "util-macros",
- "vizoxide",
-]
-
-[[package]]
-name = "ecs-macros"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
- "toml",
-]
-
-[[package]]
 name = "either"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -595,7 +566,7 @@ dependencies = [
  "build-rs",
  "cfg_aliases",
  "crossbeam-channel",
- "ecs",
+ "engine-ecs",
  "engine-macros",
  "glutin",
  "image",
@@ -617,6 +588,35 @@ dependencies = [
 ]
 
 [[package]]
+name = "engine-ecs"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "backtrace",
+ "criterion",
+ "engine-ecs-macros",
+ "hashbrown 0.15.2",
+ "parking_lot",
+ "paste",
+ "seq-macro",
+ "thiserror",
+ "tracing",
+ "tracing-subscriber",
+ "util-macros",
+ "vizoxide",
+]
+
+[[package]]
+name = "engine-ecs-macros"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+ "toml",
+]
+
+[[package]]
 name = "engine-macros"
 version = "0.1.0"
 dependencies = [
diff --git a/Cargo.toml b/Cargo.toml
index 98b5502..5062219 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,13 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [workspace]
-members = ["engine*", "ecs*", "util-macros", "opengl-bindings"]
+members = ["engine*", "util-macros", "opengl-bindings"]
 
 [workspace.dependencies]
 engine = { path = "engine" }
 engine-macros = { path = "engine-macros" }
-ecs = { path = "ecs" }
-ecs-macros = { path = "ecs-macros" }
+engine-ecs = { path = "engine-ecs" }
+engine-ecs-macros = { path = "engine-ecs-macros" }
 util-macros= { path = "util-macros" }
 opengl-bindings = { path = "opengl-bindings" }
 
diff --git a/ecs-macros/Cargo.toml b/engine-ecs-macros/Cargo.toml
index cf323fc..3a2e27b 100644
--- a/ecs-macros/Cargo.toml
+++ b/engine-ecs-macros/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ecs-macros"
+name = "engine-ecs-macros"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/ecs-macros/src/lib.rs b/engine-ecs-macros/src/lib.rs
index 7d00736..bdbba25 100644
--- a/ecs-macros/src/lib.rs
+++ b/engine-ecs-macros/src/lib.rs
@@ -2,10 +2,9 @@
 use std::path::PathBuf as FsPathBuf;
 
 use proc_macro::TokenStream;
-use quote::{format_ident, quote, ToTokens};
+use quote::{ToTokens, format_ident, quote};
 use syn::spanned::Spanned;
 use syn::{
-    parse,
     Attribute,
     Generics,
     Ident,
@@ -14,6 +13,7 @@ use syn::{
     ItemStruct,
     ItemUnion,
     Path,
+    parse,
 };
 use toml::value::{Table as TomlTable, Value as TomlValue};
 
@@ -277,9 +277,9 @@ fn find_engine_ecs_crate_path() -> Option<Path>
     let cargo_crate_name = std::env::var("CARGO_CRATE_NAME").ok()?;
     let cargo_pkg_name = std::env::var("CARGO_PKG_NAME").ok()?;
 
-    if cargo_pkg_name == "ecs" && cargo_crate_name != "ecs" {
-        // Macro is used by a ecs crate example/test/benchmark
-        return Some(syn_path!(ecs));
+    if cargo_pkg_name == "engine-ecs" && cargo_crate_name != "engine_ecs" {
+        // Macro is used by a engine-ecs crate example/test/benchmark
+        return Some(syn_path!(engine_ecs));
     }
 
     let crate_manifest = std::fs::read_to_string(cargo_manifest_dir.join("Cargo.toml"))
@@ -297,7 +297,7 @@ fn find_engine_ecs_crate_path() -> Option<Path>
         _ => None,
     }?;
 
-    if package_name == "ecs" {
+    if package_name == "engine-ecs" {
         return Some(syn_path!(crate));
     }
 
diff --git a/ecs/Cargo.toml b/engine-ecs/Cargo.toml
index 0a94ff0..724aaea 100644
--- a/ecs/Cargo.toml
+++ b/engine-ecs/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ecs"
+name = "engine-ecs"
 version = "0.1.0"
 edition = "2021"
 
@@ -15,7 +15,7 @@ hashbrown = "0.15.2"
 parking_lot = "0.12.3"
 anyhow = "1.0.102"
 backtrace = "0.3.76"
-ecs-macros = {  workspace = true  }
+engine-ecs-macros = {  workspace = true  }
 util-macros = {  workspace = true  }
 vizoxide = { version = "1.0.5", optional = true }
 
diff --git a/ecs/benches/query.rs b/engine-ecs/benches/query.rs
index f14bb06..bbc50ab 100644
--- a/ecs/benches/query.rs
+++ b/engine-ecs/benches/query.rs
@@ -2,7 +2,7 @@ use std::hint::black_box;
 use std::path::PathBuf;
 
 use criterion::{criterion_group, criterion_main, Criterion};
-use ecs::{Component, World};
+use engine_ecs::{Component, World};
 
 #[derive(Component)]
 struct Foo
diff --git a/ecs/examples/component_changed_event.rs b/engine-ecs/examples/component_changed_event.rs
index 2168df0..2788505 100644
--- a/ecs/examples/component_changed_event.rs
+++ b/engine-ecs/examples/component_changed_event.rs
@@ -1,8 +1,8 @@
-use ecs::event::component::{Changed, EventMatchExt};
-use ecs::pair::Pair;
-use ecs::phase::UPDATE as UPDATE_PHASE;
-use ecs::system::observer::Observe;
-use ecs::{Component, Query, World};
+use engine_ecs::event::component::{Changed, EventMatchExt};
+use engine_ecs::pair::Pair;
+use engine_ecs::phase::UPDATE as UPDATE_PHASE;
+use engine_ecs::system::observer::Observe;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Component)]
 struct SomeData
diff --git a/ecs/examples/component_events.rs b/engine-ecs/examples/component_events.rs
index 06e7fab..7c65630 100644
--- a/ecs/examples/component_events.rs
+++ b/engine-ecs/examples/component_events.rs
@@ -1,10 +1,10 @@
-use ecs::actions::Actions;
-use ecs::component::Component;
-use ecs::event::component::{Changed, EventMatchExt, Removed};
-use ecs::pair::Pair;
-use ecs::phase::UPDATE;
-use ecs::system::observer::Observe;
-use ecs::{Component, Query, World};
+use engine_ecs::actions::Actions;
+use engine_ecs::component::Component;
+use engine_ecs::event::component::{Changed, EventMatchExt, Removed};
+use engine_ecs::pair::Pair;
+use engine_ecs::phase::UPDATE;
+use engine_ecs::system::observer::Observe;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Debug, Component)]
 struct CheeseCrumbs
diff --git a/ecs/examples/component_relationship.rs b/engine-ecs/examples/component_relationship.rs
index e07b214..0f7b514 100644
--- a/ecs/examples/component_relationship.rs
+++ b/engine-ecs/examples/component_relationship.rs
@@ -1,6 +1,6 @@
-use ecs::pair::Pair;
-use ecs::phase::START as START_PHASE;
-use ecs::{Component, Query, World};
+use engine_ecs::pair::Pair;
+use engine_ecs::phase::START as START_PHASE;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Component)]
 struct Person
diff --git a/ecs/examples/component_removed_event.rs b/engine-ecs/examples/component_removed_event.rs
index 9b73b1a..b15c2c3 100644
--- a/ecs/examples/component_removed_event.rs
+++ b/engine-ecs/examples/component_removed_event.rs
@@ -1,10 +1,10 @@
-use ecs::actions::Actions;
-use ecs::component::Component;
-use ecs::event::component::{EventMatchExt, Removed};
-use ecs::pair::Pair;
-use ecs::phase::UPDATE;
-use ecs::system::observer::Observe;
-use ecs::{Component, Query, World};
+use engine_ecs::actions::Actions;
+use engine_ecs::component::Component;
+use engine_ecs::event::component::{EventMatchExt, Removed};
+use engine_ecs::pair::Pair;
+use engine_ecs::phase::UPDATE;
+use engine_ecs::system::observer::Observe;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Debug, Component)]
 struct Cheese
diff --git a/ecs/examples/error_handling.rs b/engine-ecs/examples/error_handling.rs
index dc34c5f..3d57778 100644
--- a/ecs/examples/error_handling.rs
+++ b/engine-ecs/examples/error_handling.rs
@@ -1,10 +1,10 @@
-use ecs::error::Error;
-use ecs::event::component::{Changed, EventMatchExt};
-use ecs::pair::Pair;
-use ecs::phase::UPDATE;
-use ecs::query::Query;
-use ecs::system::observer::Observe;
-use ecs::{Component, World, error};
+use engine_ecs::error::Error;
+use engine_ecs::event::component::{Changed, EventMatchExt};
+use engine_ecs::pair::Pair;
+use engine_ecs::phase::UPDATE;
+use engine_ecs::query::Query;
+use engine_ecs::system::observer::Observe;
+use engine_ecs::{Component, World, error};
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::EnvFilter;
 use tracing_subscriber::fmt::time::ChronoLocal;
@@ -64,7 +64,7 @@ fn main()
 
     let mut world = World::new();
 
-    world.set_err_handler(ecs::error::err_handler_log_error);
+    world.set_err_handler(engine_ecs::error::err_handler_log_error);
 
     world.create_entity((State { value: 0 },));
 
diff --git a/ecs/examples/event_loop.rs b/engine-ecs/examples/event_loop.rs
index bec2c00..62d0876 100644
--- a/ecs/examples/event_loop.rs
+++ b/engine-ecs/examples/event_loop.rs
@@ -1,7 +1,7 @@
-use ecs::actions::Actions;
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
-use ecs::{declare_entity, Component, Query, World};
+use engine_ecs::actions::Actions;
+use engine_ecs::pair::{ChildOf, Pair};
+use engine_ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
+use engine_ecs::{declare_entity, Component, Query, World};
 
 #[derive(Component)]
 struct Wool
diff --git a/ecs/examples/extension.rs b/engine-ecs/examples/extension.rs
index f6282e1..a96c1a7 100644
--- a/ecs/examples/extension.rs
+++ b/engine-ecs/examples/extension.rs
@@ -1,7 +1,7 @@
-use ecs::actions::Actions;
-use ecs::extension::{Collector as ExtensionCollector, Extension};
-use ecs::phase::UPDATE as UPDATE_PHASE;
-use ecs::{Component, Query, World};
+use engine_ecs::actions::Actions;
+use engine_ecs::extension::{Collector as ExtensionCollector, Extension};
+use engine_ecs::phase::UPDATE as UPDATE_PHASE;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Debug, Component)]
 struct Position
diff --git a/ecs/examples/multiple_queries.rs b/engine-ecs/examples/multiple_queries.rs
index e0c957f..1a4aaad 100644
--- a/ecs/examples/multiple_queries.rs
+++ b/engine-ecs/examples/multiple_queries.rs
@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
-use ecs::phase::START as START_PHASE;
-use ecs::{Component, Query, World};
+use engine_ecs::phase::START as START_PHASE;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Component)]
 struct Health
diff --git a/ecs/examples/optional_component.rs b/engine-ecs/examples/optional_component.rs
index ebc9115..79650b9 100644
--- a/ecs/examples/optional_component.rs
+++ b/engine-ecs/examples/optional_component.rs
@@ -1,5 +1,5 @@
-use ecs::phase::UPDATE as UPDATE_PHASE;
-use ecs::{Component, Query, World};
+use engine_ecs::phase::UPDATE as UPDATE_PHASE;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Debug, Component)]
 struct PettingCapacity
diff --git a/ecs/examples/relationship.rs b/engine-ecs/examples/relationship.rs
index 4e94151..749c202 100644
--- a/ecs/examples/relationship.rs
+++ b/engine-ecs/examples/relationship.rs
@@ -1,6 +1,6 @@
-use ecs::pair::{Pair, Wildcard};
-use ecs::phase::START as START_PHASE;
-use ecs::{Component, Query, World};
+use engine_ecs::pair::{Pair, Wildcard};
+use engine_ecs::phase::START as START_PHASE;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Component)]
 struct Sword
diff --git a/ecs/examples/simple.rs b/engine-ecs/examples/simple.rs
index 0169062..e03c003 100644
--- a/ecs/examples/simple.rs
+++ b/engine-ecs/examples/simple.rs
@@ -1,5 +1,5 @@
-use ecs::phase::START as START_PHASE;
-use ecs::{Component, Query, World};
+use engine_ecs::phase::START as START_PHASE;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Component)]
 struct SomeData
diff --git a/ecs/examples/with_local.rs b/engine-ecs/examples/with_local.rs
index 7a36d0e..2c04f26 100644
--- a/ecs/examples/with_local.rs
+++ b/engine-ecs/examples/with_local.rs
@@ -1,8 +1,8 @@
-use ecs::component::local::Local;
-use ecs::phase::UPDATE as UPDATE_PHASE;
-use ecs::system::initializable::Initializable;
-use ecs::system::Into;
-use ecs::{Component, Query, World};
+use engine_ecs::component::local::Local;
+use engine_ecs::phase::UPDATE as UPDATE_PHASE;
+use engine_ecs::system::initializable::Initializable;
+use engine_ecs::system::Into;
+use engine_ecs::{Component, Query, World};
 
 #[derive(Component)]
 struct SomeData
diff --git a/ecs/examples/with_sole.rs b/engine-ecs/examples/with_sole.rs
index 7e89b0a..4b2fa44 100644
--- a/ecs/examples/with_sole.rs
+++ b/engine-ecs/examples/with_sole.rs
@@ -1,7 +1,7 @@
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
-use ecs::sole::Single;
-use ecs::{declare_entity, Component, Query, Sole, World};
+use engine_ecs::pair::{ChildOf, Pair};
+use engine_ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
+use engine_ecs::sole::Single;
+use engine_ecs::{declare_entity, Component, Query, Sole, World};
 
 #[derive(Component)]
 struct Ammo
diff --git a/ecs/src/actions.rs b/engine-ecs/src/actions.rs
index 3d8afe6..3d8afe6 100644
--- a/ecs/src/actions.rs
+++ b/engine-ecs/src/actions.rs
diff --git a/ecs/src/component.rs b/engine-ecs/src/component.rs
index 17b279b..17b279b 100644
--- a/ecs/src/component.rs
+++ b/engine-ecs/src/component.rs
diff --git a/ecs/src/component/local.rs b/engine-ecs/src/component/local.rs
index b19a30b..29afcee 100644
--- a/ecs/src/component/local.rs
+++ b/engine-ecs/src/component/local.rs
@@ -1,10 +1,7 @@
 use std::any::type_name;
 use std::ops::{Deref, DerefMut};
 
-use ecs_macros::Component;
-
 use crate::component::{
-    Component,
     HandleMut as ComponentHandleMut,
     IntoParts as _,
     Parts as ComponentParts,
@@ -12,7 +9,7 @@ use crate::component::{
 use crate::pair::Pair;
 use crate::system::initializable::Param as InitializableParam;
 use crate::system::{Metadata as SystemMetadata, Param as SystemParam};
-use crate::World;
+use crate::{Component, World};
 
 /// Holds a component which is local to a single system.
 #[derive(Debug)]
diff --git a/ecs/src/component/storage.rs b/engine-ecs/src/component/storage.rs
index dc38b6a..dc38b6a 100644
--- a/ecs/src/component/storage.rs
+++ b/engine-ecs/src/component/storage.rs
diff --git a/ecs/src/component/storage/archetype.rs b/engine-ecs/src/component/storage/archetype.rs
index a7fe7ed..a7fe7ed 100644
--- a/ecs/src/component/storage/archetype.rs
+++ b/engine-ecs/src/component/storage/archetype.rs
diff --git a/ecs/src/component/storage/graph.rs b/engine-ecs/src/component/storage/graph.rs
index 76200f9..76200f9 100644
--- a/ecs/src/component/storage/graph.rs
+++ b/engine-ecs/src/component/storage/graph.rs
diff --git a/ecs/src/entity.rs b/engine-ecs/src/entity.rs
index ad9f179..ad9f179 100644
--- a/ecs/src/entity.rs
+++ b/engine-ecs/src/entity.rs
diff --git a/ecs/src/entity/obtainer.rs b/engine-ecs/src/entity/obtainer.rs
index 6c2ea96..6c2ea96 100644
--- a/ecs/src/entity/obtainer.rs
+++ b/engine-ecs/src/entity/obtainer.rs
diff --git a/ecs/src/error.rs b/engine-ecs/src/error.rs
index 185b706..185b706 100644
--- a/ecs/src/error.rs
+++ b/engine-ecs/src/error.rs
diff --git a/ecs/src/event.rs b/engine-ecs/src/event.rs
index 15455b6..15455b6 100644
--- a/ecs/src/event.rs
+++ b/engine-ecs/src/event.rs
diff --git a/ecs/src/event/component.rs b/engine-ecs/src/event/component.rs
index 70ea3e5..70ea3e5 100644
--- a/ecs/src/event/component.rs
+++ b/engine-ecs/src/event/component.rs
diff --git a/ecs/src/extension.rs b/engine-ecs/src/extension.rs
index 9c6614b..9c6614b 100644
--- a/ecs/src/extension.rs
+++ b/engine-ecs/src/extension.rs
diff --git a/ecs/src/lib.rs b/engine-ecs/src/lib.rs
index 667aa0e..6450587 100644
--- a/ecs/src/lib.rs
+++ b/engine-ecs/src/lib.rs
@@ -71,7 +71,7 @@ pub mod util;
 
 mod lock;
 
-pub use ecs_macros::{Component, Sole};
+pub use engine_ecs_macros::{Component, Sole};
 
 pub use crate::query::Query;
 
diff --git a/ecs/src/lock.rs b/engine-ecs/src/lock.rs
index fe4e08b..fe4e08b 100644
--- a/ecs/src/lock.rs
+++ b/engine-ecs/src/lock.rs
diff --git a/ecs/src/pair.rs b/engine-ecs/src/pair.rs
index 0d353e3..0d353e3 100644
--- a/ecs/src/pair.rs
+++ b/engine-ecs/src/pair.rs
diff --git a/ecs/src/phase.rs b/engine-ecs/src/phase.rs
index e8d9b71..976de1b 100644
--- a/ecs/src/phase.rs
+++ b/engine-ecs/src/phase.rs
@@ -1,6 +1,4 @@
-use ecs_macros::Component;
-
-use crate::{World, declare_entity};
+use crate::{Component, World, declare_entity};
 
 #[derive(Debug, Default, Clone, Copy, Component)]
 pub struct Phase;
diff --git a/ecs/src/query.rs b/engine-ecs/src/query.rs
index 5f13579..5f13579 100644
--- a/ecs/src/query.rs
+++ b/engine-ecs/src/query.rs
diff --git a/ecs/src/query/flexible.rs b/engine-ecs/src/query/flexible.rs
index 936ab82..936ab82 100644
--- a/ecs/src/query/flexible.rs
+++ b/engine-ecs/src/query/flexible.rs
diff --git a/ecs/src/query/term.rs b/engine-ecs/src/query/term.rs
index 0683918..0683918 100644
--- a/ecs/src/query/term.rs
+++ b/engine-ecs/src/query/term.rs
diff --git a/ecs/src/sole.rs b/engine-ecs/src/sole.rs
index 82e5e0f..82e5e0f 100644
--- a/ecs/src/sole.rs
+++ b/engine-ecs/src/sole.rs
diff --git a/ecs/src/stats.rs b/engine-ecs/src/stats.rs
index 56a5c32..2fe731b 100644
--- a/ecs/src/stats.rs
+++ b/engine-ecs/src/stats.rs
@@ -1,4 +1,4 @@
-use ecs_macros::Sole;
+use crate::Sole;
 
 #[derive(Debug, Default, Sole)]
 #[non_exhaustive]
diff --git a/ecs/src/system.rs b/engine-ecs/src/system.rs
index 5d3e0bf..38e480d 100644
--- a/ecs/src/system.rs
+++ b/engine-ecs/src/system.rs
@@ -1,11 +1,10 @@
 use std::fmt::Debug;
 
-use ecs_macros::Component;
 use seq_macro::seq;
 
-use crate::World;
 use crate::error::Error;
 use crate::uid::Uid;
+use crate::{Component, World};
 
 pub mod initializable;
 pub mod observer;
diff --git a/ecs/src/system/initializable.rs b/engine-ecs/src/system/initializable.rs
index b6ec8e8..b6ec8e8 100644
--- a/ecs/src/system/initializable.rs
+++ b/engine-ecs/src/system/initializable.rs
diff --git a/ecs/src/system/observer.rs b/engine-ecs/src/system/observer.rs
index 6893b0f..1ad7496 100644
--- a/ecs/src/system/observer.rs
+++ b/engine-ecs/src/system/observer.rs
@@ -4,11 +4,8 @@ use std::marker::PhantomData;
 use std::mem::transmute;
 use std::slice::Iter as SliceIter;
 
-use ecs_macros::Component;
 use seq_macro::seq;
 
-use crate::World;
-use crate::component::Component;
 use crate::entity::Handle as EntityHandle;
 use crate::error::Error;
 use crate::event::Emitted as EmittedEvent;
@@ -23,6 +20,7 @@ use crate::system::{
 };
 use crate::uid::Uid;
 use crate::util::Array;
+use crate::{Component, World};
 
 pub trait Observed
 {
diff --git a/ecs/src/system/stateful.rs b/engine-ecs/src/system/stateful.rs
index 3e0076a..3e0076a 100644
--- a/ecs/src/system/stateful.rs
+++ b/engine-ecs/src/system/stateful.rs
diff --git a/ecs/src/tuple.rs b/engine-ecs/src/tuple.rs
index def25a0..def25a0 100644
--- a/ecs/src/tuple.rs
+++ b/engine-ecs/src/tuple.rs
diff --git a/ecs/src/uid.rs b/engine-ecs/src/uid.rs
index bb393a1..bb393a1 100644
--- a/ecs/src/uid.rs
+++ b/engine-ecs/src/uid.rs
diff --git a/ecs/src/util.rs b/engine-ecs/src/util.rs
index 27e9748..27e9748 100644
--- a/ecs/src/util.rs
+++ b/engine-ecs/src/util.rs
diff --git a/ecs/src/util/array_vec.rs b/engine-ecs/src/util/array_vec.rs
index 5d0aac9..5d0aac9 100644
--- a/ecs/src/util/array_vec.rs
+++ b/engine-ecs/src/util/array_vec.rs
diff --git a/ecs/tests/phase.rs b/engine-ecs/tests/phase.rs
index af2646b..8b755a9 100644
--- a/ecs/tests/phase.rs
+++ b/engine-ecs/tests/phase.rs
@@ -1,10 +1,10 @@
 use std::sync::atomic::{AtomicUsize, Ordering};
 
-use ecs::component::local::Local;
-use ecs::phase::UPDATE;
-use ecs::system::Into;
-use ecs::system::initializable::Initializable;
-use ecs::{Component, World};
+use engine_ecs::component::local::Local;
+use engine_ecs::phase::UPDATE;
+use engine_ecs::system::Into;
+use engine_ecs::system::initializable::Initializable;
+use engine_ecs::{Component, World};
 
 #[derive(Component)]
 struct Thing;
diff --git a/ecs/tests/query.rs b/engine-ecs/tests/query.rs
index 7b218e3..c7956e0 100644
--- a/ecs/tests/query.rs
+++ b/engine-ecs/tests/query.rs
@@ -1,12 +1,12 @@
-use ecs::component::Component;
-use ecs::pair::{Pair, Wildcard};
-use ecs::query::term::Without;
-use ecs::query::{
+use engine_ecs::component::Component;
+use engine_ecs::pair::{Pair, Wildcard};
+use engine_ecs::query::term::Without;
+use engine_ecs::query::{
     TermWithFieldTuple as QueryTermWithFieldTuple,
     TermWithoutFieldTuple as QueryTermWithoutFieldTuple,
 };
-use ecs::uid::Uid;
-use ecs::{Component, Query, World};
+use engine_ecs::uid::Uid;
+use engine_ecs::{Component, Query, World};
 use parking_lot::{Mutex, Once};
 
 pub static SETUP: Once = Once::new();
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index cd4902f..9b91df8 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -15,7 +15,7 @@ parking_lot = "0.12.3"
 crossbeam-channel = "0.5.15"
 safer-ffi = "0.1.13"
 nu-ansi-term = "0.46.0"
-ecs = { workspace = true }
+engine-ecs = { workspace = true }
 util-macros = { workspace = true }
 opengl-bindings = { workspace = true }
 engine-macros = { workspace = true }
diff --git a/engine/src/asset.rs b/engine/src/asset.rs
index e9a3831..1ab3cb1 100644
--- a/engine/src/asset.rs
+++ b/engine/src/asset.rs
@@ -15,10 +15,10 @@ use std::sync::mpsc::{
     channel as mpsc_channel,
 };
 
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{PRE_UPDATE as PRE_UPDATE_PHASE, Phase};
-use ecs::sole::Single;
-use ecs::{Sole, declare_entity};
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::{PRE_UPDATE as PRE_UPDATE_PHASE, Phase};
+use crate::ecs::sole::Single;
+use crate::ecs::{Sole, declare_entity};
 
 use crate::work_queue::{Work, WorkQueue};
 
@@ -843,9 +843,9 @@ pub(crate) struct Extension
     pub assets: Assets,
 }
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         let _ = collector.add_sole(self.assets);
 
diff --git a/engine/src/camera.rs b/engine/src/camera.rs
index fa3d612..22a0702 100644
--- a/engine/src/camera.rs
+++ b/engine/src/camera.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::projection::{Perspective, Projection};
 use crate::vector::Vec3;
diff --git a/engine/src/camera/fly.rs b/engine/src/camera/fly.rs
index 2042c0c..eddc8ff 100644
--- a/engine/src/camera/fly.rs
+++ b/engine/src/camera/fly.rs
@@ -1,9 +1,9 @@
-use ecs::component::local::Local;
-use ecs::phase::UPDATE as UPDATE_PHASE;
-use ecs::sole::Single;
-use ecs::system::Into;
-use ecs::system::initializable::Initializable;
-use ecs::{Component, Query};
+use crate::ecs::component::local::Local;
+use crate::ecs::phase::UPDATE as UPDATE_PHASE;
+use crate::ecs::sole::Single;
+use crate::ecs::system::Into;
+use crate::ecs::system::initializable::Initializable;
+use crate::ecs::{Component, Query};
 
 use crate::builder;
 use crate::camera::{Active as ActiveCamera, Camera};
@@ -57,9 +57,9 @@ impl Default for Builder
 /// Fly camera extension.
 pub struct Extension(pub Options);
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         collector.add_system(*UPDATE_PHASE, update.into_system().initialize((self.0,)));
     }
diff --git a/engine/src/collision.rs b/engine/src/collision.rs
index aefd9b6..24cb152 100644
--- a/engine/src/collision.rs
+++ b/engine/src/collision.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::mesh::Mesh;
 use crate::vector::Vec3;
diff --git a/engine/src/delta_time.rs b/engine/src/delta_time.rs
index 33a2fc8..6f75247 100644
--- a/engine/src/delta_time.rs
+++ b/engine/src/delta_time.rs
@@ -1,8 +1,8 @@
 use std::time::{Duration, Instant};
 
-use ecs::component::local::Local;
-use ecs::sole::Single;
-use ecs::{Component, Sole};
+use crate::ecs::component::local::Local;
+use crate::ecs::sole::Single;
+use crate::ecs::{Component, Sole};
 
 #[derive(Debug, Clone, Default, Sole)]
 pub struct DeltaTime
diff --git a/engine/src/draw_flags.rs b/engine/src/draw_flags.rs
index 8328669..bd3d714 100644
--- a/engine/src/draw_flags.rs
+++ b/engine/src/draw_flags.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::builder;
 
diff --git a/engine/src/input.rs b/engine/src/input.rs
index 60dd1e7..613f0ad 100644
--- a/engine/src/input.rs
+++ b/engine/src/input.rs
@@ -1,7 +1,7 @@
-use ecs::declare_entity;
-use ecs::extension::Collector as ExtensionCollector;
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::Phase;
+use crate::ecs::declare_entity;
+use crate::ecs::extension::Collector as ExtensionCollector;
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::Phase;
 
 use crate::windowing::PHASE as WINDOWING_PHASE;
 
@@ -23,7 +23,7 @@ declare_entity!(
 #[derive(Debug, Default)]
 pub struct Extension {}
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
     fn collect(self, mut collector: ExtensionCollector<'_>)
     {
diff --git a/engine/src/lib.rs b/engine/src/lib.rs
index 0941de0..5249e14 100644
--- a/engine/src/lib.rs
+++ b/engine/src/lib.rs
@@ -1,18 +1,17 @@
 #![deny(clippy::all, clippy::pedantic)]
 #![allow(clippy::needless_pass_by_value)]
 
-use ecs::component::Sequence as ComponentSequence;
-use ecs::extension::Extension;
-use ecs::phase::PRE_UPDATE as PRE_UPDATE_PHASE;
-use ecs::sole::Sole;
-use ecs::system::initializable::Initializable;
-use ecs::system::observer::Observer;
-use ecs::system::{Into, System};
-use ecs::uid::Uid;
-use ecs::{SoleAlreadyExistsError, World};
-
 use crate::asset::{Assets, Extension as AssetExtension};
 use crate::delta_time::{DeltaTime, LastUpdate, update as update_delta_time};
+use crate::ecs::component::Sequence as ComponentSequence;
+use crate::ecs::extension::Extension;
+use crate::ecs::phase::PRE_UPDATE as PRE_UPDATE_PHASE;
+use crate::ecs::sole::Sole;
+use crate::ecs::system::initializable::Initializable;
+use crate::ecs::system::observer::Observer;
+use crate::ecs::system::{Into, System};
+use crate::ecs::uid::Uid;
+use crate::ecs::{SoleAlreadyExistsError, World};
 use crate::shader::Extension as ShaderExtension;
 
 mod util;
@@ -40,7 +39,7 @@ pub mod texture;
 pub mod transform;
 pub mod windowing;
 
-pub extern crate ecs;
+pub extern crate engine_ecs as ecs;
 
 pub(crate) use crate::data_types::matrix;
 pub use crate::data_types::{color, vector};
diff --git a/engine/src/lighting.rs b/engine/src/lighting.rs
index 9ab2ca8..f1b6570 100644
--- a/engine/src/lighting.rs
+++ b/engine/src/lighting.rs
@@ -1,4 +1,4 @@
-use ecs::{Component, Sole};
+use crate::ecs::{Component, Sole};
 
 use crate::builder;
 use crate::color::Color;
diff --git a/engine/src/material.rs b/engine/src/material.rs
index ed1c139..accb9a1 100644
--- a/engine/src/material.rs
+++ b/engine/src/material.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::asset::Handle as AssetHandle;
 use crate::builder;
diff --git a/engine/src/model.rs b/engine/src/model.rs
index ebf623f..0aaa877 100644
--- a/engine/src/model.rs
+++ b/engine/src/model.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::asset::{Assets, Handle as AssetHandle};
 use crate::material::Material;
diff --git a/engine/src/renderer.rs b/engine/src/renderer.rs
index b7bb2db..a302b8e 100644
--- a/engine/src/renderer.rs
+++ b/engine/src/renderer.rs
@@ -2,17 +2,17 @@ use std::collections::VecDeque;
 use std::sync::atomic::{AtomicU64, Ordering};
 
 use bitflags::bitflags;
-use ecs::actions::Actions;
-use ecs::component::local::Local;
-use ecs::event::component::{Changed, EventMatchExt, Removed};
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase};
-use ecs::query::term::With;
-use ecs::sole::Single;
-use ecs::system::Into;
-use ecs::system::initializable::Initializable;
-use ecs::system::observer::Observe;
-use ecs::{Component, Query, Sole, declare_entity};
+use crate::ecs::actions::Actions;
+use crate::ecs::component::local::Local;
+use crate::ecs::event::component::{Changed, EventMatchExt, Removed};
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase};
+use crate::ecs::query::term::With;
+use crate::ecs::sole::Single;
+use crate::ecs::system::Into;
+use crate::ecs::system::initializable::Initializable;
+use crate::ecs::system::observer::Observe;
+use crate::ecs::{Component, Query, Sole, declare_entity};
 use engine_macros::Reflection;
 
 use crate::asset::Handle as AssetHandle;
@@ -83,9 +83,9 @@ impl Extension
     }
 }
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         collector.add_declared_entity(&PRE_RENDER_PHASE);
         collector.add_declared_entity(&RENDER_PHASE);
diff --git a/engine/src/renderer/main_render_pass.rs b/engine/src/renderer/main_render_pass.rs
index 7492379..abd1022 100644
--- a/engine/src/renderer/main_render_pass.rs
+++ b/engine/src/renderer/main_render_pass.rs
@@ -1,6 +1,6 @@
-use ecs::Query;
-use ecs::query::term::{With, Without};
-use ecs::sole::Single;
+use crate::ecs::Query;
+use crate::ecs::query::term::{With, Without};
+use crate::ecs::sole::Single;
 
 use crate::asset::Assets;
 use crate::draw_flags::{DrawFlags, NoDraw, PolygonModeConfig};
diff --git a/engine/src/renderer/object.rs b/engine/src/renderer/object.rs
index bdff885..8441959 100644
--- a/engine/src/renderer/object.rs
+++ b/engine/src/renderer/object.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::sync::atomic::{AtomicU64, Ordering};
 
-use ecs::Sole;
+use crate::ecs::Sole;
 
 use crate::asset::Id as AssetId;
 
diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs
index 378a89d..dcdd6a5 100644
--- a/engine/src/renderer/opengl.rs
+++ b/engine/src/renderer/opengl.rs
@@ -3,10 +3,10 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-use ecs::actions::Actions;
-use ecs::query::term::Without;
-use ecs::sole::Single;
-use ecs::{Component, Query, Sole};
+use crate::ecs::actions::Actions;
+use crate::ecs::query::term::Without;
+use crate::ecs::sole::Single;
+use crate::ecs::{Component, Query, Sole};
 use glutin::config::Config as GlutinConfig;
 use glutin::display::GetGlDisplay;
 use glutin::error::Error as GlutinError;
@@ -164,9 +164,9 @@ enum GraphicsContextObject
 #[non_exhaustive]
 pub struct Extension {}
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         collector.add_system(*RENDER_PHASE, handle_commands);
 
diff --git a/engine/src/shader.rs b/engine/src/shader.rs
index 1b368fb..d5611ca 100644
--- a/engine/src/shader.rs
+++ b/engine/src/shader.rs
@@ -6,10 +6,10 @@ use std::path::Path;
 use std::str::Utf8Error;
 
 use bitflags::{bitflags, bitflags_match};
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase, START as START_PHASE};
-use ecs::sole::Single;
-use ecs::{Component, Sole, declare_entity};
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase, START as START_PHASE};
+use crate::ecs::sole::Single;
+use crate::ecs::{Component, Sole, declare_entity};
 use shader_slang::{
     Blob as SlangBlob,
     ComponentType as SlangComponentType,
@@ -972,9 +972,9 @@ declare_entity!(
 
 pub(crate) struct Extension;
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         let Some(global_session) = SlangGlobalSession::new() else {
             tracing::error!("Unable to create global shader-slang session");
diff --git a/engine/src/shader/default.rs b/engine/src/shader/default.rs
index 7f0d1bb..c217af6 100644
--- a/engine/src/shader/default.rs
+++ b/engine/src/shader/default.rs
@@ -1,10 +1,10 @@
 use std::path::Path;
 use std::sync::LazyLock;
 
-use ecs::Query;
-use ecs::actions::Actions;
-use ecs::query::term::Without;
-use ecs::sole::Single;
+use crate::ecs::Query;
+use crate::ecs::actions::Actions;
+use crate::ecs::query::term::Without;
+use crate::ecs::sole::Single;
 
 use crate::asset::{Assets, Label as AssetLabel};
 use crate::camera::{Active as ActiveCamera, Camera};
diff --git a/engine/src/transform.rs b/engine/src/transform.rs
index 05819bc..e80bd00 100644
--- a/engine/src/transform.rs
+++ b/engine/src/transform.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::builder;
 use crate::vector::Vec3;
diff --git a/engine/src/util.rs b/engine/src/util.rs
index f18a9c7..439fe9a 100644
--- a/engine/src/util.rs
+++ b/engine/src/util.rs
@@ -1,4 +1,4 @@
-use ecs::util::VecExt;
+use crate::ecs::util::VecExt;
 
 #[derive(Debug)]
 pub struct MapVec<Key: Ord, Value>
diff --git a/engine/src/windowing.rs b/engine/src/windowing.rs
index e07ba3e..e34aaf0 100644
--- a/engine/src/windowing.rs
+++ b/engine/src/windowing.rs
@@ -8,16 +8,16 @@ use crossbeam_channel::{
     TrySendError,
     bounded as bounded_channel,
 };
-use ecs::actions::Actions;
-use ecs::component::Component;
-use ecs::entity::obtainer::Obtainer as EntityObtainer;
-use ecs::event::component::{Added, Changed, EventMatchExt, Removed};
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
-use ecs::sole::Single;
-use ecs::system::observer::Observe;
-use ecs::uid::Uid;
-use ecs::{Query, Sole, declare_entity};
+use crate::ecs::actions::Actions;
+use crate::ecs::component::Component;
+use crate::ecs::entity::obtainer::Obtainer as EntityObtainer;
+use crate::ecs::event::component::{Added, Changed, EventMatchExt, Removed};
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
+use crate::ecs::sole::Single;
+use crate::ecs::system::observer::Observe;
+use crate::ecs::uid::Uid;
+use crate::ecs::{Query, Sole, declare_entity};
 use raw_window_handle::{DisplayHandle, HandleError, HasDisplayHandle, WindowHandle};
 use winit::application::ApplicationHandler;
 use winit::dpi::PhysicalPosition;
@@ -74,9 +74,9 @@ declare_entity!(
 #[non_exhaustive]
 pub struct Extension {}
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         collector.add_sole(Context::default()).ok();
         collector.add_sole(Keyboard::default()).ok();
diff --git a/engine/src/windowing/keyboard.rs b/engine/src/windowing/keyboard.rs
index a1c3e22..0bb70a7 100644
--- a/engine/src/windowing/keyboard.rs
+++ b/engine/src/windowing/keyboard.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use ecs::Sole;
+use crate::ecs::Sole;
 
 #[derive(Debug, Default, Sole)]
 pub struct Keyboard
diff --git a/engine/src/windowing/mouse.rs b/engine/src/windowing/mouse.rs
index 0ea04e2..2a3324e 100644
--- a/engine/src/windowing/mouse.rs
+++ b/engine/src/windowing/mouse.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use ecs::Sole;
+use crate::ecs::Sole;
 
 use crate::vector::Vec2;
 
diff --git a/engine/src/windowing/window.rs b/engine/src/windowing/window.rs
index 627bdec..72c6342 100644
--- a/engine/src/windowing/window.rs
+++ b/engine/src/windowing/window.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::data_types::dimens::Dimens;