diff --git a/packages/entity/index.js b/packages/entity/index.js
index c8db6b0..88eb87b 100644
--- a/packages/entity/index.js
+++ b/packages/entity/index.js
@@ -7,7 +7,7 @@ import {EventEmitter} from '@avocado/mixins';
 import {Resource} from '@avocado/resource';
 import {Synchronized} from '@avocado/state';
 
-import {hasTrait, lookupTrait} from './trait-registry';
+import {hasTrait, lookupTrait} from './trait/registry';
 
 const debug = D('@avocado:entity:traits');
 
@@ -297,6 +297,6 @@ export {
   hasTrait,
   lookupTrait,
   registerTrait,
-} from './trait-registry';
+} from './trait/registry';
 
 export {StateProperty, Trait} from './trait';
diff --git a/packages/entity/trait.js b/packages/entity/trait/index.js
similarity index 100%
rename from packages/entity/trait.js
rename to packages/entity/trait/index.js
diff --git a/packages/entity/trait-registry.js b/packages/entity/trait/registry.js
similarity index 100%
rename from packages/entity/trait-registry.js
rename to packages/entity/trait/registry.js