diff --git a/src/Trait.ts b/src/Trait.ts
index c92ebd6..84516b2 100644
--- a/src/Trait.ts
+++ b/src/Trait.ts
@@ -1,6 +1,7 @@
 import { Fn, Pipe, Tuples } from "hotscript"
 import { AbstractClass, Class, Opaque } from "type-fest"
-import { AbstractTag, TraitExpression, emptyTraitExpression } from "."
+import { TraitExpression, emptyTraitExpression } from "./TraitExpression"
+import { AbstractTag } from "./abstract"
 import { ExtendFn, SimplifyFn, StaticMembers, StaticMembersFn } from "./util"
 
 
diff --git a/src/TraitExpression.ts b/src/TraitExpression.ts
index 19a536a..d5bfed3 100644
--- a/src/TraitExpression.ts
+++ b/src/TraitExpression.ts
@@ -1,6 +1,7 @@
 import { Fn, Pipe, Tuples } from "hotscript"
 import { AbstractClass, Class, Opaque } from "type-fest"
-import { AbstractTag, RemoveAbstractFromImplClass, Trait, TraitApplierSuperTag } from "."
+import { RemoveAbstractFromImplClass, Trait, TraitApplierSuperTag } from "./Trait"
+import { AbstractTag } from "./abstract"
 import { ExtendFn, SimplifyFn, StaticMembersFn } from "./util"
 
 
diff --git a/src/TraitExpressionBuilder.ts b/src/TraitExpressionBuilder.ts
index 53abdf4..c1f5064 100644
--- a/src/TraitExpressionBuilder.ts
+++ b/src/TraitExpressionBuilder.ts
@@ -1,6 +1,7 @@
 import { Call, Fn, Pipe, Tuples } from "hotscript"
 import { AbstractClass } from "type-fest"
-import { Trait, TraitExpression, emptyTraitExpression } from "."
+import { Trait } from "./Trait"
+import { TraitExpression, emptyTraitExpression } from "./TraitExpression"
 import { ExtendableFn, StaticMembersFn } from "./util"
 
 
diff --git a/src/index.ts b/src/index.ts
deleted file mode 100644
index bf1c52b..0000000
--- a/src/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./Trait"
-export * from "./TraitExpression"
-export * from "./TraitExpressionBuilder"
-export * from "./abstract"
diff --git a/src/lib.ts b/src/lib.ts
index 9fc1b8f..e7f6bb7 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -1,8 +1,4 @@
-export {
-    Implements,
-    abstract,
-    expression,
-    trait,
-    type Trait,
-    type TraitExpression,
-} from "."
+export { trait, type Trait } from "./Trait"
+export { Implements, type TraitExpression } from "./TraitExpression"
+export { expression } from "./TraitExpressionBuilder"
+export { abstract } from "./abstract"
diff --git a/src/tests.ts b/src/tests.ts
index eebcd3c..7773ed8 100644
--- a/src/tests.ts
+++ b/src/tests.ts
@@ -1,4 +1,7 @@
-import { Implements, Trait, abstract, expression, trait } from "."
+import { Trait, trait } from "./Trait"
+import { Implements } from "./TraitExpression"
+import { expression } from "./TraitExpressionBuilder"
+import { abstract } from "./abstract"
 
 
 const PrintsHelloOnNew = trait(