diff --git a/packages/entity/traits/behaved.trait.js b/packages/behavior/traits/behaved.trait.js
similarity index 95%
rename from packages/entity/traits/behaved.trait.js
rename to packages/behavior/traits/behaved.trait.js
index 6508e1a..496c2a3 100644
--- a/packages/entity/traits/behaved.trait.js
+++ b/packages/behavior/traits/behaved.trait.js
@@ -1,7 +1,6 @@
 import {compose} from '@avocado/core';
 import {createContext, Routines} from '@avocado/behavior';
-
-import {StateProperty, Trait} from '../trait';
+import {StateProperty, Trait} from '@avocado/entity';
 
 const decorate = compose(
   StateProperty('isBehaving'),
diff --git a/packages/entity/traits/pictured.trait.js b/packages/graphics/traits/pictured.trait.js
similarity index 98%
rename from packages/entity/traits/pictured.trait.js
rename to packages/graphics/traits/pictured.trait.js
index 9f29ac8..820b9de 100644
--- a/packages/entity/traits/pictured.trait.js
+++ b/packages/graphics/traits/pictured.trait.js
@@ -1,9 +1,8 @@
 import {compose} from '@avocado/core';
+import {StateProperty, Trait} from '@avocado/entity';
 import {Image, Sprite} from '@avocado/graphics';
 import {Rectangle, Vector} from '@avocado/math';
 
-import {StateProperty, Trait} from '../trait';
-
 const decorate = compose(
   StateProperty('currentImage', {
     track: true,
diff --git a/packages/entity/traits/visible.trait.js b/packages/graphics/traits/visible.trait.js
similarity index 97%
rename from packages/entity/traits/visible.trait.js
rename to packages/graphics/traits/visible.trait.js
index 8d83327..63c2911 100644
--- a/packages/entity/traits/visible.trait.js
+++ b/packages/graphics/traits/visible.trait.js
@@ -1,9 +1,8 @@
 import {compose} from '@avocado/core';
+import {StateProperty, Trait} from '@avocado/entity';
 import {hasGraphics, Container} from '@avocado/graphics';
 import {Rectangle, Vector} from '@avocado/math';
 
-import {StateProperty, Trait} from '../trait';
-
 const decorate = compose(
   StateProperty('isVisible', {
     track: true,
diff --git a/packages/entity/traits/collider.trait.js b/packages/physics/traits/collider.trait.js
similarity index 94%
rename from packages/entity/traits/collider.trait.js
rename to packages/physics/traits/collider.trait.js
index cca2e75..e5c0ab7 100644
--- a/packages/entity/traits/collider.trait.js
+++ b/packages/physics/traits/collider.trait.js
@@ -1,5 +1,5 @@
 import {compose} from '@avocado/core';
-import {StateProperty, Trait} from '../trait';
+import {StateProperty, Trait} from '@avocado/entity';
 
 const decorate = compose(
   StateProperty('isCheckingCollisions'),
diff --git a/packages/entity/traits/physical.trait.js b/packages/physics/traits/physical.trait.js
similarity index 97%
rename from packages/entity/traits/physical.trait.js
rename to packages/physics/traits/physical.trait.js
index 2849154..059f02d 100644
--- a/packages/entity/traits/physical.trait.js
+++ b/packages/physics/traits/physical.trait.js
@@ -1,9 +1,8 @@
 import {compose} from '@avocado/core';
+import {StateProperty, Trait} from '@avocado/entity';
 import {Vector} from '@avocado/math';
 import {BodyView} from '@avocado/physics';
 
-import {StateProperty, Trait} from '../trait';
-
 const decorate = compose(
   StateProperty('addedToPhysics', {
     track: true,
diff --git a/packages/entity/traits/shaped.trait.js b/packages/physics/traits/shaped.trait.js
similarity index 95%
rename from packages/entity/traits/shaped.trait.js
rename to packages/physics/traits/shaped.trait.js
index 67541ed..4268048 100644
--- a/packages/entity/traits/shaped.trait.js
+++ b/packages/physics/traits/shaped.trait.js
@@ -1,8 +1,7 @@
 import {compose} from '@avocado/core';
+import {Trait} from '@avocado/entity';
 import {shapeFromJSON, ShapeView} from '@avocado/physics';
 
-import {Trait} from '../trait';
-
 const decorate = compose(
 );
 
diff --git a/packages/entity/traits/animated.trait.js b/packages/timing/traits/animated.trait.js
similarity index 99%
rename from packages/entity/traits/animated.trait.js
rename to packages/timing/traits/animated.trait.js
index 206994c..c14a02c 100644
--- a/packages/entity/traits/animated.trait.js
+++ b/packages/timing/traits/animated.trait.js
@@ -1,10 +1,9 @@
 import {compose} from '@avocado/core';
+import {StateProperty, Trait} from '@avocado/entity';
 import {AnimationView} from '@avocado/graphics';
 import {Rectangle, Vector} from '@avocado/math';
 import {Animation} from '@avocado/timing';
 
-import {StateProperty, Trait} from '../trait';
-
 const decorate = compose(
   StateProperty('currentAnimation', {
     track: true,
diff --git a/packages/entity/traits/followed.trait.js b/packages/topdown/traits/followed.trait.js
similarity index 97%
rename from packages/entity/traits/followed.trait.js
rename to packages/topdown/traits/followed.trait.js
index fc1e341..d576bee 100644
--- a/packages/entity/traits/followed.trait.js
+++ b/packages/topdown/traits/followed.trait.js
@@ -1,7 +1,6 @@
+import {Trait} from '@avocado/entity';
 import {Camera} from '@avocado/topdown';
 
-import {Trait} from '../trait';
-
 export class Followed extends Trait {
 
   static defaultParams() {
diff --git a/packages/entity/traits/layered.trait.js b/packages/topdown/traits/layered.trait.js
similarity index 88%
rename from packages/entity/traits/layered.trait.js
rename to packages/topdown/traits/layered.trait.js
index e6d776d..0609f8d 100644
--- a/packages/entity/traits/layered.trait.js
+++ b/packages/topdown/traits/layered.trait.js
@@ -1,4 +1,4 @@
-import {Trait} from '../trait';
+import {Trait} from '@avocado/entity';
 
 export class Layered extends Trait {
 
diff --git a/packages/entity/traits/roomed.trait.js b/packages/topdown/traits/roomed.trait.js
similarity index 89%
rename from packages/entity/traits/roomed.trait.js
rename to packages/topdown/traits/roomed.trait.js
index 430dff1..4f1084f 100644
--- a/packages/entity/traits/roomed.trait.js
+++ b/packages/topdown/traits/roomed.trait.js
@@ -1,4 +1,4 @@
-import {Trait} from '../trait';
+import {Trait} from '@avocado/entity';
 
 export class Roomed extends Trait {