diff --git a/packages/behavior/index.js b/packages/behavior/index.js
index e9ded26..fa36c74 100644
--- a/packages/behavior/index.js
+++ b/packages/behavior/index.js
@@ -8,4 +8,3 @@ export {
   fromJSON as behaviorItemFromJSON,
   register as registerBehaviorItem
 } from './item/registry';
-export {Routines} from './item/routines';
diff --git a/packages/behavior/traits/behaved.trait.js b/packages/behavior/traits/behaved.trait.js
index 496c2a3..d83ed6d 100644
--- a/packages/behavior/traits/behaved.trait.js
+++ b/packages/behavior/traits/behaved.trait.js
@@ -1,7 +1,9 @@
 import {compose} from '@avocado/core';
-import {createContext, Routines} from '@avocado/behavior';
 import {StateProperty, Trait} from '@avocado/entity';
 
+import {createContext} from '../context';
+import {Routines} from '../item/routines';
+
 const decorate = compose(
   StateProperty('isBehaving'),
   StateProperty('currentRoutine'),
diff --git a/packages/graphics/traits/pictured.trait.js b/packages/graphics/traits/pictured.trait.js
index 820b9de..99f21a4 100644
--- a/packages/graphics/traits/pictured.trait.js
+++ b/packages/graphics/traits/pictured.trait.js
@@ -1,8 +1,10 @@
 import {compose} from '@avocado/core';
 import {StateProperty, Trait} from '@avocado/entity';
-import {Image, Sprite} from '@avocado/graphics';
 import {Rectangle, Vector} from '@avocado/math';
 
+import {Image} from '../image';
+import {Sprite} from '../sprite';
+
 const decorate = compose(
   StateProperty('currentImage', {
     track: true,
diff --git a/packages/graphics/traits/visible.trait.js b/packages/graphics/traits/visible.trait.js
index 63c2911..1f17153 100644
--- a/packages/graphics/traits/visible.trait.js
+++ b/packages/graphics/traits/visible.trait.js
@@ -1,8 +1,10 @@
 import {compose} from '@avocado/core';
 import {StateProperty, Trait} from '@avocado/entity';
-import {hasGraphics, Container} from '@avocado/graphics';
 import {Rectangle, Vector} from '@avocado/math';
 
+import {Container} from '../container';
+import {hasGraphics} from '../has-graphics';
+
 const decorate = compose(
   StateProperty('isVisible', {
     track: true,
diff --git a/packages/physics/index.js b/packages/physics/index.js
index 307fa3a..c2c4add 100644
--- a/packages/physics/index.js
+++ b/packages/physics/index.js
@@ -1,34 +1,7 @@
 export {BodyView} from './body-view';
-
-import {PolygonShape} from './polygon';
-export {PolygonShape};
-
-import {CircleShape} from './circle';
-export {CircleShape};
-
-import {RectangleShape} from './rectangle';
-export {RectangleShape};
-
-import {ShapeList} from './list';
-export {ShapeList};
-
+export {CircleShape} from './circle';
+export {ShapeList} from './list';
+export {PolygonShape} from './polygon';
+export {RectangleShape} from './rectangle';
+export {shapeFromJSON} from './shape-from-json';
 export {ShapeView} from './shape-view';
-
-export function shapeFromJSON(json) {
-  let shape;
-  switch (json.type) {
-    case 'circle':
-      shape = new CircleShape();
-      break;
-    case 'list':
-      shape = new ShapeList();
-      break;
-    case 'polygon':
-      shape = new PolygonShape();
-      break;
-    case 'rectangle':
-      shape = new RectangleShape();
-      break;
-  }
-  return shape.fromJSON(json);
-}
diff --git a/packages/physics/shape-from-json.js b/packages/physics/shape-from-json.js
new file mode 100644
index 0000000..1109ec8
--- /dev/null
+++ b/packages/physics/shape-from-json.js
@@ -0,0 +1,23 @@
+import {PolygonShape} from './polygon';
+import {CircleShape} from './circle';
+import {RectangleShape} from './rectangle';
+import {ShapeList} from './list';
+
+export function shapeFromJSON(json) {
+  let shape;
+  switch (json.type) {
+    case 'circle':
+      shape = new CircleShape();
+      break;
+    case 'list':
+      shape = new ShapeList();
+      break;
+    case 'polygon':
+      shape = new PolygonShape();
+      break;
+    case 'rectangle':
+      shape = new RectangleShape();
+      break;
+  }
+  return shape.fromJSON(json);
+}
diff --git a/packages/physics/traits/physical.trait.js b/packages/physics/traits/physical.trait.js
index 059f02d..00c4661 100644
--- a/packages/physics/traits/physical.trait.js
+++ b/packages/physics/traits/physical.trait.js
@@ -1,7 +1,8 @@
 import {compose} from '@avocado/core';
 import {StateProperty, Trait} from '@avocado/entity';
 import {Vector} from '@avocado/math';
-import {BodyView} from '@avocado/physics';
+
+import {BodyView} from '../body-view';
 
 const decorate = compose(
   StateProperty('addedToPhysics', {
diff --git a/packages/physics/traits/shaped.trait.js b/packages/physics/traits/shaped.trait.js
index 4268048..da2adf9 100644
--- a/packages/physics/traits/shaped.trait.js
+++ b/packages/physics/traits/shaped.trait.js
@@ -1,6 +1,8 @@
 import {compose} from '@avocado/core';
 import {Trait} from '@avocado/entity';
-import {shapeFromJSON, ShapeView} from '@avocado/physics';
+
+import {shapeFromJSON} from '../shape-from-json';
+import {ShapeView} from '../shape-view';
 
 const decorate = compose(
 );
diff --git a/packages/timing/traits/animated.trait.js b/packages/timing/traits/animated.trait.js
index ad6f3d0..76b0163 100644
--- a/packages/timing/traits/animated.trait.js
+++ b/packages/timing/traits/animated.trait.js
@@ -1,7 +1,9 @@
 import {compose} from '@avocado/core';
 import {StateProperty, Trait} from '@avocado/entity';
 import {Rectangle, Vector} from '@avocado/math';
-import {Animation, AnimationView} from '@avocado/timing';
+
+import {Animation} from '../animation';
+import {AnimationView} from '../animation-view';
 
 const decorate = compose(
   StateProperty('currentAnimation', {
diff --git a/packages/topdown/traits/followed.trait.js b/packages/topdown/traits/followed.trait.js
index d576bee..4b5bea0 100644
--- a/packages/topdown/traits/followed.trait.js
+++ b/packages/topdown/traits/followed.trait.js
@@ -1,5 +1,6 @@
 import {Trait} from '@avocado/entity';
-import {Camera} from '@avocado/topdown';
+
+import {Camera} from '../camera';
 
 export class Followed extends Trait {