diff --git a/packages/crdt/src/index.ts b/packages/crdt/src/index.ts
index 1badb84a..cee12030 100644
--- a/packages/crdt/src/index.ts
+++ b/packages/crdt/src/index.ts
@@ -1,5 +1,4 @@
-// TODO dumb export logic, fix this
-export { IGCounter, GCounter } from "./builtins/GCounter/index.js";
-export { PNCounter } from "./builtins/PNCounter/index.js";
-export { GSet } from "./builtins/GSet/index.js";
-export { TwoPSet } from "./builtins/2PSet/index.js";
+export * from "./builtins/GCounter/index.js";
+export * from "./builtins/PNCounter/index.js";
+export * from "./builtins/GSet/index.js";
+export * from "./builtins/2PSet/index.js";
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
index 3f664d0f..945f610e 100644
--- a/packages/node/src/index.ts
+++ b/packages/node/src/index.ts
@@ -6,7 +6,7 @@ import {
   streamToString,
 } from "@topology-foundation/network";
 import { TopologyObject } from "@topology-foundation/object";
-import { TopologyObjectStore } from "./store.js";
+import { TopologyObjectStore } from "./store";
 import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
 import { toString as uint8ArrayToString } from "uint8arrays/to-string";
 
diff --git a/packages/node/src/store.ts b/packages/node/src/store/index.ts
similarity index 100%
rename from packages/node/src/store.ts
rename to packages/node/src/store/index.ts