diff --git a/Cargo.toml b/Cargo.toml
index 4b8409b..707d803 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
     "crates/*",
-    "examples/common",
+    "examples/common*",
     "examples/bevy_gltf_components/*",
     "examples/bevy_gltf_blueprints/*",
     "examples/bevy_gltf_save_load/*",
diff --git a/examples/bevy_gltf_blueprints/animation/Cargo.toml b/examples/bevy_gltf_blueprints/animation/Cargo.toml
index 65cfcdd..3f8a3b2 100644
--- a/examples/bevy_gltf_blueprints/animation/Cargo.toml
+++ b/examples/bevy_gltf_blueprints/animation/Cargo.toml
@@ -7,6 +7,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" }
-bevy_gltf_worlflow_examples_common = { path = "../../common" }
+bevy_gltf_worlflow_examples_common_rapier = { path = "../../common_rapier" }
 bevy_rapier3d = { version = "0.25.0", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] }
 rand = "0.8.5"
diff --git a/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs b/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs
index 6633a95..fcf711b 100644
--- a/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs
+++ b/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs
@@ -1,4 +1,6 @@
-use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning, Player};
+use bevy_gltf_worlflow_examples_common_rapier::{
+    assets::GameAssets, GameState, InAppRunning, Player,
+};
 use bevy_rapier3d::prelude::Velocity;
 use rand::Rng;
 use std::time::Duration;
diff --git a/examples/bevy_gltf_blueprints/animation/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/animation/src/game/in_main_menu.rs
index 55bc750..2b72d42 100644
--- a/examples/bevy_gltf_blueprints/animation/src/game/in_main_menu.rs
+++ b/examples/bevy_gltf_blueprints/animation/src/game/in_main_menu.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, InMainMenu};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, InMainMenu};
 
 pub fn setup_main_menu(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_gltf_blueprints/animation/src/game/mod.rs b/examples/bevy_gltf_blueprints/animation/src/game/mod.rs
index bb44b89..2520bad 100644
--- a/examples/bevy_gltf_blueprints/animation/src/game/mod.rs
+++ b/examples/bevy_gltf_blueprints/animation/src/game/mod.rs
@@ -5,7 +5,7 @@ pub mod in_main_menu;
 pub use in_main_menu::*;
 
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, GameState};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, GameState};
 
 #[derive(Component, Reflect, Default, Debug)]
 #[reflect(Component)]
diff --git a/examples/bevy_gltf_blueprints/animation/src/main.rs b/examples/bevy_gltf_blueprints/animation/src/main.rs
index 9320156..3c95987 100644
--- a/examples/bevy_gltf_blueprints/animation/src/main.rs
+++ b/examples/bevy_gltf_blueprints/animation/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::CommonPlugin;
+use bevy_gltf_worlflow_examples_common_rapier::CommonPlugin;
 
 mod core;
 use crate::core::*;
diff --git a/examples/bevy_gltf_blueprints/basic/Cargo.toml b/examples/bevy_gltf_blueprints/basic/Cargo.toml
index 1458f14..bb9cb2f 100644
--- a/examples/bevy_gltf_blueprints/basic/Cargo.toml
+++ b/examples/bevy_gltf_blueprints/basic/Cargo.toml
@@ -7,6 +7,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" }
-bevy_gltf_worlflow_examples_common = { path = "../../common" }
+bevy_gltf_worlflow_examples_common_rapier = { path = "../../common_rapier" }
 bevy_rapier3d = { version = "0.25.0", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] }
 rand = "0.8.5"
diff --git a/examples/bevy_gltf_blueprints/basic/src/game/in_game.rs b/examples/bevy_gltf_blueprints/basic/src/game/in_game.rs
index 73a201c..3af11d5 100644
--- a/examples/bevy_gltf_blueprints/basic/src/game/in_game.rs
+++ b/examples/bevy_gltf_blueprints/basic/src/game/in_game.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GameWorldTag};
-use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning};
+use bevy_gltf_worlflow_examples_common_rapier::{assets::GameAssets, GameState, InAppRunning};
 use bevy_rapier3d::prelude::Velocity;
 use rand::Rng;
 
diff --git a/examples/bevy_gltf_blueprints/basic/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/basic/src/game/in_main_menu.rs
index a7c88e2..c131150 100644
--- a/examples/bevy_gltf_blueprints/basic/src/game/in_main_menu.rs
+++ b/examples/bevy_gltf_blueprints/basic/src/game/in_main_menu.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, InMainMenu};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, InMainMenu};
 
 pub fn setup_main_menu(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_gltf_blueprints/basic/src/game/mod.rs b/examples/bevy_gltf_blueprints/basic/src/game/mod.rs
index b236141..3436f29 100644
--- a/examples/bevy_gltf_blueprints/basic/src/game/mod.rs
+++ b/examples/bevy_gltf_blueprints/basic/src/game/mod.rs
@@ -5,7 +5,7 @@ pub mod in_main_menu;
 pub use in_main_menu::*;
 
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, GameState};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, GameState};
 
 pub struct GamePlugin;
 impl Plugin for GamePlugin {
diff --git a/examples/bevy_gltf_blueprints/basic/src/main.rs b/examples/bevy_gltf_blueprints/basic/src/main.rs
index 9320156..3c95987 100644
--- a/examples/bevy_gltf_blueprints/basic/src/main.rs
+++ b/examples/bevy_gltf_blueprints/basic/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::CommonPlugin;
+use bevy_gltf_worlflow_examples_common_rapier::CommonPlugin;
 
 mod core;
 use crate::core::*;
diff --git a/examples/bevy_gltf_blueprints/basic_xpbd_physics/Cargo.toml b/examples/bevy_gltf_blueprints/basic_xpbd_physics/Cargo.toml
index 28c2596..16b4878 100644
--- a/examples/bevy_gltf_blueprints/basic_xpbd_physics/Cargo.toml
+++ b/examples/bevy_gltf_blueprints/basic_xpbd_physics/Cargo.toml
@@ -7,6 +7,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" }
-bevy_gltf_worlflow_examples_common = { path = "../../common", default-features = false, features = ["blueprints", "physics_xpbd"] }
+bevy_gltf_worlflow_examples_common_xpbd = { path = "../../common_xpbd" }
 bevy_xpbd_3d = "0.4"
 rand = "0.8.5"
\ No newline at end of file
diff --git a/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/in_game.rs b/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/in_game.rs
index 081f688..3fa60da 100644
--- a/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/in_game.rs
+++ b/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/in_game.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GameWorldTag};
-use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning};
+use bevy_gltf_worlflow_examples_common_xpbd::{assets::GameAssets, GameState, InAppRunning};
 use bevy_xpbd_3d::prelude::*;
 use rand::Rng;
 
diff --git a/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/in_main_menu.rs
index 55bc750..212d1fc 100644
--- a/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/in_main_menu.rs
+++ b/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/in_main_menu.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, InMainMenu};
+use bevy_gltf_worlflow_examples_common_xpbd::{AppState, InMainMenu};
 
 pub fn setup_main_menu(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/mod.rs b/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/mod.rs
index 438f85e..8aff7d6 100644
--- a/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/mod.rs
+++ b/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/game/mod.rs
@@ -5,7 +5,7 @@ pub mod in_main_menu;
 pub use in_main_menu::*;
 
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, GameState};
+use bevy_gltf_worlflow_examples_common_xpbd::{AppState, GameState};
 
 pub struct GamePlugin;
 impl Plugin for GamePlugin {
diff --git a/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/main.rs b/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/main.rs
index 9320156..2de0274 100644
--- a/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/main.rs
+++ b/examples/bevy_gltf_blueprints/basic_xpbd_physics/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::CommonPlugin;
+use bevy_gltf_worlflow_examples_common_xpbd::CommonPlugin;
 
 mod core;
 use crate::core::*;
diff --git a/examples/bevy_gltf_blueprints/materials/Cargo.toml b/examples/bevy_gltf_blueprints/materials/Cargo.toml
index 332938f..a51a690 100644
--- a/examples/bevy_gltf_blueprints/materials/Cargo.toml
+++ b/examples/bevy_gltf_blueprints/materials/Cargo.toml
@@ -7,6 +7,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" }
-bevy_gltf_worlflow_examples_common = { path = "../../common" }
+bevy_gltf_worlflow_examples_common_rapier = { path = "../../common_rapier" }
 bevy_rapier3d = { version = "0.25.0", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] }
 rand = "0.8.5"
\ No newline at end of file
diff --git a/examples/bevy_gltf_blueprints/materials/src/game/in_game.rs b/examples/bevy_gltf_blueprints/materials/src/game/in_game.rs
index 6adecd0..e5fc8b8 100644
--- a/examples/bevy_gltf_blueprints/materials/src/game/in_game.rs
+++ b/examples/bevy_gltf_blueprints/materials/src/game/in_game.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GameWorldTag};
-use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning};
+use bevy_gltf_worlflow_examples_common_rapier::{assets::GameAssets, GameState, InAppRunning};
 
 use bevy_rapier3d::prelude::Velocity;
 use rand::Rng;
diff --git a/examples/bevy_gltf_blueprints/materials/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/materials/src/game/in_main_menu.rs
index 55bc750..2b72d42 100644
--- a/examples/bevy_gltf_blueprints/materials/src/game/in_main_menu.rs
+++ b/examples/bevy_gltf_blueprints/materials/src/game/in_main_menu.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, InMainMenu};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, InMainMenu};
 
 pub fn setup_main_menu(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_gltf_blueprints/materials/src/game/mod.rs b/examples/bevy_gltf_blueprints/materials/src/game/mod.rs
index 890c132..a8e8352 100644
--- a/examples/bevy_gltf_blueprints/materials/src/game/mod.rs
+++ b/examples/bevy_gltf_blueprints/materials/src/game/mod.rs
@@ -5,7 +5,7 @@ pub mod in_main_menu;
 pub use in_main_menu::*;
 
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, GameState};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, GameState};
 
 pub struct GamePlugin;
 impl Plugin for GamePlugin {
diff --git a/examples/bevy_gltf_blueprints/materials/src/main.rs b/examples/bevy_gltf_blueprints/materials/src/main.rs
index 9320156..3c95987 100644
--- a/examples/bevy_gltf_blueprints/materials/src/main.rs
+++ b/examples/bevy_gltf_blueprints/materials/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::CommonPlugin;
+use bevy_gltf_worlflow_examples_common_rapier::CommonPlugin;
 
 mod core;
 use crate::core::*;
diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/Cargo.toml b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/Cargo.toml
index 9cddedd..bea96b6 100644
--- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/Cargo.toml
+++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/Cargo.toml
@@ -7,6 +7,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" }
-bevy_gltf_worlflow_examples_common = { path = "../../common" }
+bevy_gltf_worlflow_examples_common_rapier = { path = "../../common_rapier" }
 bevy_rapier3d = { version = "0.25.0", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] }
 rand = "0.8.5"
\ No newline at end of file
diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_game.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_game.rs
index f090a8e..75be98a 100644
--- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_game.rs
+++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_game.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GameWorldTag};
-use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning};
+use bevy_gltf_worlflow_examples_common_rapier::{assets::GameAssets, GameState, InAppRunning};
 
 use bevy_rapier3d::prelude::Velocity;
 use rand::Rng;
diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_main_menu.rs
index 55bc750..2b72d42 100644
--- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_main_menu.rs
+++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_main_menu.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, InMainMenu};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, InMainMenu};
 
 pub fn setup_main_menu(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/level_transitions.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/level_transitions.rs
index 7fa6f1a..41d5c90 100644
--- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/level_transitions.rs
+++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/level_transitions.rs
@@ -1,6 +1,8 @@
 use bevy::{gltf::Gltf, prelude::*};
 use bevy_gltf_blueprints::GameWorldTag;
-use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning, Player};
+use bevy_gltf_worlflow_examples_common_rapier::{
+    assets::GameAssets, GameState, InAppRunning, Player,
+};
 use bevy_rapier3d::prelude::*;
 
 #[derive(Component, Reflect, Default, Debug)]
diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/mod.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/mod.rs
index 4f467a1..554a044 100644
--- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/mod.rs
+++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/mod.rs
@@ -8,7 +8,7 @@ pub mod level_transitions;
 pub use level_transitions::*;
 
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, GameState};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, GameState};
 
 pub struct GamePlugin;
 impl Plugin for GamePlugin {
diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/main.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/main.rs
index 9320156..3c95987 100644
--- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/main.rs
+++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::CommonPlugin;
+use bevy_gltf_worlflow_examples_common_rapier::CommonPlugin;
 
 mod core;
 use crate::core::*;
diff --git a/examples/bevy_gltf_components/basic/Cargo.toml b/examples/bevy_gltf_components/basic/Cargo.toml
index 504bd2e..ab6eb9d 100644
--- a/examples/bevy_gltf_components/basic/Cargo.toml
+++ b/examples/bevy_gltf_components/basic/Cargo.toml
@@ -7,4 +7,4 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_components = { path = "../../../crates/bevy_gltf_components" }
-bevy_gltf_worlflow_examples_common = { path = "../../common" }
+bevy_gltf_worlflow_examples_common_rapier = { path = "../../common_rapier" }
diff --git a/examples/bevy_gltf_components/basic/src/main.rs b/examples/bevy_gltf_components/basic/src/main.rs
index 3754eae..40df6cf 100644
--- a/examples/bevy_gltf_components/basic/src/main.rs
+++ b/examples/bevy_gltf_components/basic/src/main.rs
@@ -1,6 +1,6 @@
 use bevy::{gltf::Gltf, prelude::*};
 use bevy_gltf_components::ComponentsFromGltfPlugin;
-use bevy_gltf_worlflow_examples_common::CorePlugin;
+use bevy_gltf_worlflow_examples_common_rapier::CorePlugin;
 
 mod test_components;
 use test_components::*;
diff --git a/examples/bevy_gltf_save_load/basic/Cargo.toml b/examples/bevy_gltf_save_load/basic/Cargo.toml
index ae6422b..e1afba2 100644
--- a/examples/bevy_gltf_save_load/basic/Cargo.toml
+++ b/examples/bevy_gltf_save_load/basic/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" }
 bevy_gltf_save_load = { path = "../../../crates/bevy_gltf_save_load" }
-bevy_gltf_worlflow_examples_common = { path = "../../common" }
+bevy_gltf_worlflow_examples_common_rapier = { path = "../../common_rapier" }
 
 serde_json = "1.0.108"
 serde = "1.0.193"
diff --git a/examples/bevy_gltf_save_load/basic/src/core/mod.rs b/examples/bevy_gltf_save_load/basic/src/core/mod.rs
index 6d856d8..c6173bb 100644
--- a/examples/bevy_gltf_save_load/basic/src/core/mod.rs
+++ b/examples/bevy_gltf_save_load/basic/src/core/mod.rs
@@ -6,7 +6,7 @@ use bevy::{
 };
 use bevy_gltf_blueprints::*;
 use bevy_gltf_save_load::*;
-use bevy_gltf_worlflow_examples_common::{CameraTrackingOffset, Pickable};
+use bevy_gltf_worlflow_examples_common_rapier::{CameraTrackingOffset, Pickable};
 use bevy_rapier3d::dynamics::Velocity;
 use std::any::TypeId;
 
diff --git a/examples/bevy_gltf_save_load/basic/src/game/in_game.rs b/examples/bevy_gltf_save_load/basic/src/game/in_game.rs
index 954dd94..3322e46 100644
--- a/examples/bevy_gltf_save_load/basic/src/game/in_game.rs
+++ b/examples/bevy_gltf_save_load/basic/src/game/in_game.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GameWorldTag, Library, NoInBlueprint};
 use bevy_gltf_save_load::{Dynamic, DynamicEntitiesRoot, StaticEntitiesRoot};
-use bevy_gltf_worlflow_examples_common::{GameState, InAppRunning, Player};
+use bevy_gltf_worlflow_examples_common_rapier::{GameState, InAppRunning, Player};
 use bevy_rapier3d::prelude::Velocity;
 use rand::Rng;
 
diff --git a/examples/bevy_gltf_save_load/basic/src/game/in_game_loading.rs b/examples/bevy_gltf_save_load/basic/src/game/in_game_loading.rs
index 9b1e965..76474de 100644
--- a/examples/bevy_gltf_save_load/basic/src/game/in_game_loading.rs
+++ b/examples/bevy_gltf_save_load/basic/src/game/in_game_loading.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::InGameLoading;
+use bevy_gltf_worlflow_examples_common_rapier::InGameLoading;
 
 pub fn setup_loading_screen(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_gltf_save_load/basic/src/game/in_game_saving.rs b/examples/bevy_gltf_save_load/basic/src/game/in_game_saving.rs
index 8a48a9a..f5a815d 100644
--- a/examples/bevy_gltf_save_load/basic/src/game/in_game_saving.rs
+++ b/examples/bevy_gltf_save_load/basic/src/game/in_game_saving.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::InGameSaving;
+use bevy_gltf_worlflow_examples_common_rapier::InGameSaving;
 
 pub fn setup_saving_screen(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_gltf_save_load/basic/src/game/in_main_menu.rs b/examples/bevy_gltf_save_load/basic/src/game/in_main_menu.rs
index 5be2502..6cea380 100644
--- a/examples/bevy_gltf_save_load/basic/src/game/in_main_menu.rs
+++ b/examples/bevy_gltf_save_load/basic/src/game/in_main_menu.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, InMainMenu};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, InMainMenu};
 
 pub fn setup_main_menu(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_gltf_save_load/basic/src/game/mod.rs b/examples/bevy_gltf_save_load/basic/src/game/mod.rs
index 7bf9ef3..a119802 100644
--- a/examples/bevy_gltf_save_load/basic/src/game/mod.rs
+++ b/examples/bevy_gltf_save_load/basic/src/game/mod.rs
@@ -1,5 +1,5 @@
 pub mod in_game;
-use bevy_gltf_worlflow_examples_common::{AppState, GameState};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, GameState};
 pub use in_game::*;
 
 pub mod in_main_menu;
diff --git a/examples/bevy_gltf_save_load/basic/src/main.rs b/examples/bevy_gltf_save_load/basic/src/main.rs
index 9320156..3c95987 100644
--- a/examples/bevy_gltf_save_load/basic/src/main.rs
+++ b/examples/bevy_gltf_save_load/basic/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::CommonPlugin;
+use bevy_gltf_worlflow_examples_common_rapier::CommonPlugin;
 
 mod core;
 use crate::core::*;
diff --git a/examples/bevy_registry_export/basic/Cargo.toml b/examples/bevy_registry_export/basic/Cargo.toml
index fef7651..346510e 100644
--- a/examples/bevy_registry_export/basic/Cargo.toml
+++ b/examples/bevy_registry_export/basic/Cargo.toml
@@ -8,6 +8,6 @@ license = "MIT OR Apache-2.0"
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" }
 bevy_registry_export = { path = "../../../crates/bevy_registry_export" }
-bevy_gltf_worlflow_examples_common = { path = "../../common" }
+bevy_gltf_worlflow_examples_common_rapier = { path = "../../common_rapier" }
 bevy_rapier3d = { version = "0.25.0", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] }
 rand = "0.8.5"
diff --git a/examples/bevy_registry_export/basic/src/game/in_game.rs b/examples/bevy_registry_export/basic/src/game/in_game.rs
index f090a8e..75be98a 100644
--- a/examples/bevy_registry_export/basic/src/game/in_game.rs
+++ b/examples/bevy_registry_export/basic/src/game/in_game.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GameWorldTag};
-use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning};
+use bevy_gltf_worlflow_examples_common_rapier::{assets::GameAssets, GameState, InAppRunning};
 
 use bevy_rapier3d::prelude::Velocity;
 use rand::Rng;
diff --git a/examples/bevy_registry_export/basic/src/game/in_main_menu.rs b/examples/bevy_registry_export/basic/src/game/in_main_menu.rs
index 55bc750..2b72d42 100644
--- a/examples/bevy_registry_export/basic/src/game/in_main_menu.rs
+++ b/examples/bevy_registry_export/basic/src/game/in_main_menu.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, InMainMenu};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, InMainMenu};
 
 pub fn setup_main_menu(mut commands: Commands) {
     commands.spawn((
diff --git a/examples/bevy_registry_export/basic/src/game/mod.rs b/examples/bevy_registry_export/basic/src/game/mod.rs
index 890c132..a8e8352 100644
--- a/examples/bevy_registry_export/basic/src/game/mod.rs
+++ b/examples/bevy_registry_export/basic/src/game/mod.rs
@@ -5,7 +5,7 @@ pub mod in_main_menu;
 pub use in_main_menu::*;
 
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::{AppState, GameState};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, GameState};
 
 pub struct GamePlugin;
 impl Plugin for GamePlugin {
diff --git a/examples/bevy_registry_export/basic/src/main.rs b/examples/bevy_registry_export/basic/src/main.rs
index 9320156..3c95987 100644
--- a/examples/bevy_registry_export/basic/src/main.rs
+++ b/examples/bevy_registry_export/basic/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::CommonPlugin;
+use bevy_gltf_worlflow_examples_common_rapier::CommonPlugin;
 
 mod core;
 use crate::core::*;
diff --git a/examples/common/src/core/mod.rs b/examples/common/src/core/mod.rs
index 2711ecd..4d8dde2 100644
--- a/examples/common/src/core/mod.rs
+++ b/examples/common/src/core/mod.rs
@@ -4,29 +4,11 @@ pub use camera::*;
 //pub mod relationships;
 //pub use relationships::*;
 
-#[cfg(feature = "physics_rapier")]
-#[allow(ambiguous_glob_reexports)]
-pub mod physics_rapier;
-#[cfg(feature = "physics_rapier")]
-pub use physics_rapier::*;
-
-#[cfg(feature = "physics_xpbd")]
-#[allow(ambiguous_glob_reexports)]
-pub mod physics_xpbd;
-#[cfg(feature = "physics_xpbd")]
-pub use physics_xpbd::*;
-
 use bevy::prelude::*;
 
 pub struct CorePlugin;
 impl Plugin for CorePlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins(CameraPlugin);
-
-        #[cfg(feature = "physics_rapier")]
-        app.add_plugins(PhysicsPlugin);
-
-        #[cfg(feature = "physics_xpbd")]
-        app.add_plugins(PhysicsPluginXPBD);
     }
 }
diff --git a/examples/common/src/core/physics_xpbd/mod.rs b/examples/common/src/core/physics_xpbd/mod.rs
deleted file mode 100644
index 2e55436..0000000
--- a/examples/common/src/core/physics_xpbd/mod.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-pub(crate) mod physics_replace_proxies;
-pub(crate) use physics_replace_proxies::*;
-
-pub(crate) mod utils;
-
-pub(crate) mod controls;
-pub(crate) use controls::*;
-
-use bevy::prelude::*;
-use bevy_xpbd_3d::prelude::*;
-
-use crate::state::GameState;
-use bevy_gltf_blueprints::GltfBlueprintsSet;
-
-pub struct PhysicsPluginXPBD;
-impl Plugin for PhysicsPluginXPBD {
-    fn build(&self, app: &mut App) {
-        app.add_plugins((PhysicsPlugins::default(), PhysicsDebugPlugin::default()))
-            .register_type::<AutoAABBCollider>()
-            .register_type::<physics_replace_proxies::Collider>()
-            .add_systems(
-                Update,
-                physics_replace_proxies.after(GltfBlueprintsSet::AfterSpawn),
-            )
-            .add_systems(Update, toggle_physics_debug)
-            .add_systems(OnEnter(GameState::InGame), resume_physics)
-            .add_systems(OnExit(GameState::InGame), pause_physics);
-    }
-}
diff --git a/examples/common_rapier/Cargo.toml b/examples/common_rapier/Cargo.toml
new file mode 100644
index 0000000..5289163
--- /dev/null
+++ b/examples/common_rapier/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "bevy_gltf_worlflow_examples_common_rapier"
+version = "0.1.0"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+
+[features]
+blueprints = ["dep:bevy_gltf_blueprints"]
+default = ["blueprints"]
+
+
+[dependencies]
+bevy = { version = "0.13", features = ["dynamic_linking"] }
+bevy_gltf_worlflow_examples_common = { path = "../common" }
+bevy_gltf_blueprints = { path = "../../crates/bevy_gltf_blueprints", optional = true }
+bevy_rapier3d = { version = "0.25", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] }
+bevy_asset_loader = { version = "0.20", features = ["standard_dynamic_assets"] }
+bevy_editor_pls = { version = "0.8" }
+rand = "0.8.5"
diff --git a/examples/common_rapier/src/lib.rs b/examples/common_rapier/src/lib.rs
new file mode 100644
index 0000000..0df818d
--- /dev/null
+++ b/examples/common_rapier/src/lib.rs
@@ -0,0 +1,13 @@
+use bevy::prelude::*;
+use bevy_gltf_worlflow_examples_common::CommonPlugin as CommonBasePlugin;
+
+pub use bevy_gltf_worlflow_examples_common::*;
+
+mod physics;
+
+pub struct CommonPlugin;
+impl Plugin for CommonPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins((physics::plugin, CommonBasePlugin));
+    }
+}
diff --git a/examples/common/src/core/physics_rapier/controls.rs b/examples/common_rapier/src/physics/controls.rs
similarity index 100%
rename from examples/common/src/core/physics_rapier/controls.rs
rename to examples/common_rapier/src/physics/controls.rs
diff --git a/examples/common_rapier/src/physics/mod.rs b/examples/common_rapier/src/physics/mod.rs
new file mode 100644
index 0000000..f8f00b6
--- /dev/null
+++ b/examples/common_rapier/src/physics/mod.rs
@@ -0,0 +1,31 @@
+pub(crate) mod physics_replace_proxies;
+pub(crate) use physics_replace_proxies::*;
+
+pub(crate) mod utils;
+
+pub(crate) mod controls;
+pub(crate) use controls::*;
+
+use bevy::prelude::*;
+use bevy_gltf_blueprints::GltfBlueprintsSet;
+use bevy_gltf_worlflow_examples_common::state::GameState;
+use bevy_rapier3d::{
+    prelude::{NoUserData, RapierPhysicsPlugin},
+    render::RapierDebugRenderPlugin,
+};
+
+pub(crate) fn plugin(app: &mut App) {
+    app.add_plugins((
+        RapierPhysicsPlugin::<NoUserData>::default(),
+        RapierDebugRenderPlugin::default(),
+    ))
+    .register_type::<AutoAABBCollider>()
+    .register_type::<physics_replace_proxies::Collider>()
+    .add_systems(
+        Update,
+        physics_replace_proxies.after(GltfBlueprintsSet::AfterSpawn),
+    )
+    .add_systems(Update, toggle_physics_debug)
+    .add_systems(OnEnter(GameState::InGame), resume_physics)
+    .add_systems(OnExit(GameState::InGame), pause_physics);
+}
diff --git a/examples/common/src/core/physics_rapier/physics_replace_proxies.rs b/examples/common_rapier/src/physics/physics_replace_proxies.rs
similarity index 100%
rename from examples/common/src/core/physics_rapier/physics_replace_proxies.rs
rename to examples/common_rapier/src/physics/physics_replace_proxies.rs
diff --git a/examples/common/src/core/physics_rapier/utils.rs b/examples/common_rapier/src/physics/utils.rs
similarity index 100%
rename from examples/common/src/core/physics_rapier/utils.rs
rename to examples/common_rapier/src/physics/utils.rs
diff --git a/examples/common_xpbd/Cargo.toml b/examples/common_xpbd/Cargo.toml
new file mode 100644
index 0000000..2582a73
--- /dev/null
+++ b/examples/common_xpbd/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "bevy_gltf_worlflow_examples_common_xpbd"
+version = "0.1.0"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+
+[features]
+blueprints = ["dep:bevy_gltf_blueprints"]
+default = ["blueprints"]
+
+
+[dependencies]
+bevy = { version = "0.13", features = ["dynamic_linking"] }
+bevy_gltf_worlflow_examples_common = { path = "../common" }
+bevy_gltf_blueprints = { path = "../../crates/bevy_gltf_blueprints", optional = true }
+bevy_xpbd_3d = { version = "0.4" }
+bevy_asset_loader = { version = "0.20", features = ["standard_dynamic_assets"] }
+bevy_editor_pls = { version = "0.8" }
+rand = "0.8.5"
diff --git a/examples/common_xpbd/src/lib.rs b/examples/common_xpbd/src/lib.rs
new file mode 100644
index 0000000..0df818d
--- /dev/null
+++ b/examples/common_xpbd/src/lib.rs
@@ -0,0 +1,13 @@
+use bevy::prelude::*;
+use bevy_gltf_worlflow_examples_common::CommonPlugin as CommonBasePlugin;
+
+pub use bevy_gltf_worlflow_examples_common::*;
+
+mod physics;
+
+pub struct CommonPlugin;
+impl Plugin for CommonPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins((physics::plugin, CommonBasePlugin));
+    }
+}
diff --git a/examples/common/src/core/physics_xpbd/controls.rs b/examples/common_xpbd/src/physics/controls.rs
similarity index 100%
rename from examples/common/src/core/physics_xpbd/controls.rs
rename to examples/common_xpbd/src/physics/controls.rs
diff --git a/examples/common/src/core/physics_rapier/mod.rs b/examples/common_xpbd/src/physics/mod.rs
similarity index 62%
rename from examples/common/src/core/physics_rapier/mod.rs
rename to examples/common_xpbd/src/physics/mod.rs
index bb0055d..8d6b701 100644
--- a/examples/common/src/core/physics_rapier/mod.rs
+++ b/examples/common_xpbd/src/physics/mod.rs
@@ -6,21 +6,14 @@ pub(crate) mod utils;
 pub(crate) mod controls;
 pub(crate) use controls::*;
 
-use crate::state::GameState;
 use bevy::prelude::*;
-use bevy_gltf_blueprints::GltfBlueprintsSet;
-use bevy_rapier3d::{
-    prelude::{NoUserData, RapierPhysicsPlugin},
-    render::RapierDebugRenderPlugin,
-};
+use bevy_xpbd_3d::prelude::*;
 
-pub struct PhysicsPlugin;
-impl Plugin for PhysicsPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugins((
-            RapierPhysicsPlugin::<NoUserData>::default(),
-            RapierDebugRenderPlugin::default(),
-        ))
+use bevy_gltf_blueprints::GltfBlueprintsSet;
+use bevy_gltf_worlflow_examples_common::state::GameState;
+
+pub(crate) fn plugin(app: &mut App) {
+    app.add_plugins((PhysicsPlugins::default(), PhysicsDebugPlugin::default()))
         .register_type::<AutoAABBCollider>()
         .register_type::<physics_replace_proxies::Collider>()
         .add_systems(
@@ -30,5 +23,4 @@ impl Plugin for PhysicsPlugin {
         .add_systems(Update, toggle_physics_debug)
         .add_systems(OnEnter(GameState::InGame), resume_physics)
         .add_systems(OnExit(GameState::InGame), pause_physics);
-    }
 }
diff --git a/examples/common/src/core/physics_xpbd/physics_replace_proxies.rs b/examples/common_xpbd/src/physics/physics_replace_proxies.rs
similarity index 100%
rename from examples/common/src/core/physics_xpbd/physics_replace_proxies.rs
rename to examples/common_xpbd/src/physics/physics_replace_proxies.rs
diff --git a/examples/common/src/core/physics_xpbd/utils.rs b/examples/common_xpbd/src/physics/utils.rs
similarity index 100%
rename from examples/common/src/core/physics_xpbd/utils.rs
rename to examples/common_xpbd/src/physics/utils.rs
diff --git a/testing/bevy_example/Cargo.toml b/testing/bevy_example/Cargo.toml
index 4ec7306..3dbc4ca 100644
--- a/testing/bevy_example/Cargo.toml
+++ b/testing/bevy_example/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 bevy = { version = "0.13", features = ["dynamic_linking"] }
 bevy_gltf_blueprints = { path = "../../crates/bevy_gltf_blueprints" }
 bevy_registry_export = { path = "../../crates/bevy_registry_export" }
-bevy_gltf_worlflow_examples_common = { path = "../../examples/common" }
+bevy_gltf_worlflow_examples_common_rapier = { path = "../../examples/common_rapier" }
 
 bevy_rapier3d = { version = "0.25.0", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] }
 bevy_asset_loader = { version = "0.20", features = ["standard_dynamic_assets"] }
diff --git a/testing/bevy_example/src/game/in_game.rs b/testing/bevy_example/src/game/in_game.rs
index f090a8e..75be98a 100644
--- a/testing/bevy_example/src/game/in_game.rs
+++ b/testing/bevy_example/src/game/in_game.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GameWorldTag};
-use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning};
+use bevy_gltf_worlflow_examples_common_rapier::{assets::GameAssets, GameState, InAppRunning};
 
 use bevy_rapier3d::prelude::Velocity;
 use rand::Rng;
diff --git a/testing/bevy_example/src/game/mod.rs b/testing/bevy_example/src/game/mod.rs
index 38145f0..99b9b3f 100644
--- a/testing/bevy_example/src/game/mod.rs
+++ b/testing/bevy_example/src/game/mod.rs
@@ -11,7 +11,7 @@ use bevy::{
     prelude::*, render::view::screenshot::ScreenshotManager, time::common_conditions::on_timer,
     window::PrimaryWindow,
 };
-use bevy_gltf_worlflow_examples_common::{AppState, GameState};
+use bevy_gltf_worlflow_examples_common_rapier::{AppState, GameState};
 
 use crate::{TupleTestF32, UnitTest};
 
diff --git a/testing/bevy_example/src/main.rs b/testing/bevy_example/src/main.rs
index 9320156..3c95987 100644
--- a/testing/bevy_example/src/main.rs
+++ b/testing/bevy_example/src/main.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_gltf_worlflow_examples_common::CommonPlugin;
+use bevy_gltf_worlflow_examples_common_rapier::CommonPlugin;
 
 mod core;
 use crate::core::*;