diff --git a/src/components/BubbleComponent.ts b/src/components/BubbleComponent.ts
index fff1dc1..c006fa8 100644
--- a/src/components/BubbleComponent.ts
+++ b/src/components/BubbleComponent.ts
@@ -1,13 +1,14 @@
 
 import { defineComponent, useEntityContext, setComponent } from "@etherealengine/ecs"
-import { NameComponent } from "@etherealengine/engine/src/common/NameComponent"
-import { addObjectToGroup } from "@etherealengine/engine/src/renderer/components/GroupComponent"
-import { VisibleComponent } from "@etherealengine/engine/src/renderer/components/VisibleComponent"
+
 import { Mesh, SphereGeometry, MeshStandardMaterial, Color } from "three"
 import matches from "ts-matches"
 
 import React, { useEffect } from "react"
-import { TransformComponent } from "@etherealengine/engine/src/transform/components/TransformComponent"
+import { VisibleComponent } from "@etherealengine/spatial/src/renderer/components/VisibleComponent"
+import { NameComponent } from "@etherealengine/spatial/src/common/NameComponent"
+import { addObjectToGroup } from "@etherealengine/spatial/src/renderer/components/GroupComponent"
+import { TransformComponent } from "@etherealengine/spatial/src/transform/components/TransformComponent"
 
 export const BubbleComponent = defineComponent({
   //name: The human-readable label for the component. This will be displayed in the editor and debugging tools.
diff --git a/src/components/BubbleEmitterComponent.ts b/src/components/BubbleEmitterComponent.ts
index 598af46..586b7f4 100644
--- a/src/components/BubbleEmitterComponent.ts
+++ b/src/components/BubbleEmitterComponent.ts
@@ -1,14 +1,14 @@
 import { EntityUUID } from "@etherealengine/common/src/interfaces/EntityUUID"
 import { defineComponent, Entity, useEntityContext, useComponent, removeEntity, getComponent, useExecute, createEntity, setComponent, SimulationSystemGroup, getMutableComponent } from "@etherealengine/ecs"
-import { EngineState } from "@etherealengine/engine/src/EngineState"
-import { GroupComponent } from "@etherealengine/engine/src/renderer/components/GroupComponent"
-import { EntityTreeComponent } from "@etherealengine/engine/src/transform/components/EntityTree"
+
 import { getState, NO_PROXY } from "@etherealengine/hyperflux"
 import { Color, Vector3, Mesh, BufferGeometry, MeshStandardMaterial, MathUtils } from "three"
 import { BubbleComponent } from "./BubbleComponent"
 
 import React, { useEffect } from "react"
 import { ECSState } from "@etherealengine/ecs/src/ECSState"
+import { GroupComponent } from "@etherealengine/spatial/src/renderer/components/GroupComponent"
+import { EntityTreeComponent } from "@etherealengine/spatial/src/transform/components/EntityTree"
 
 
 export const BubbleEmitterComponent = defineComponent({
diff --git a/src/systems/BubbleSystem.ts b/src/systems/BubbleSystem.ts
index bd5907d..e93cb02 100644
--- a/src/systems/BubbleSystem.ts
+++ b/src/systems/BubbleSystem.ts
@@ -1,7 +1,7 @@
 import { defineQuery, defineSystem, SimulationSystemGroup, getComponent } from "@etherealengine/ecs"
 import { Vector3 } from "three"
 import { BubbleEmitterComponent } from "../components/BubbleEmitterComponent"
-import { TransformComponent } from "@etherealengine/engine/src/transform/components/TransformComponent"
+import { TransformComponent } from "@etherealengine/spatial/src/transform/components/TransformComponent"
 
 const bubbleEmitterQuery = defineQuery([BubbleEmitterComponent])
 const velocity = new Vector3(0,0,0)
diff --git a/src/worldInjection.ts b/src/worldInjection.ts
index e5330bb..9fbb50c 100644
--- a/src/worldInjection.ts
+++ b/src/worldInjection.ts
@@ -5,7 +5,7 @@ import { BubbleEmitterComponent } from "./components/BubbleEmitterComponent";
 import { BubbleNodeEditor } from "./editors/BubbleComponentNodeEditor";
 import { BubbleSystem } from "./systems/BubbleSystem";
 import { isClient } from '@etherealengine/common/src/utils/getEnvironment';
-import { EngineState } from '@etherealengine/engine/src/EngineState';
+import { EngineState } from '@etherealengine/spatial/src/EngineState';
 
 export default async function worldInjection() {
   if (isClient) {