diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index f8454714ed2..a6fdcbfa510 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 module.exports = {
-  ignorePatterns: ["dist", "build", "*.mjs", "docs", "*.md"],
+  ignorePatterns: ["dist", "*.mjs", "docs", "*.md"],
   parser: "@typescript-eslint/parser",
   parserOptions: {
     ecmaVersion: 2018,
diff --git a/.gitignore b/.gitignore
index d6ac700d4fa..7ede8bbfb37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,5 @@ node_modules/
 .DS_Store
 tmp/
 dist/
-build/
 docs/examples/
 .direnv/
diff --git a/package.json b/package.json
index ca810d010ee..6fb7228e5bc 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,7 @@
   "type": "module",
   "packageManager": "pnpm@8.10.0",
   "publishConfig": {
-    "access": "public",
-    "directory": "dist"
+    "access": "public"
   },
   "author": "Michael Arnaldi <michael.arnaldi@effectful.co>",
   "license": "MIT",
@@ -32,13 +31,17 @@
     "algebraic-data-types",
     "functional-programming"
   ],
+  "files": [
+    "dist",
+    "src"
+  ],
   "scripts": {
-    "build": "pnpm build-prepare && pnpm build-esm && pnpm build-cjs && pnpm build-annotate && build-utils pack-v2",
+    "build": "pnpm build-prepare && pnpm build-esm && pnpm build-cjs && pnpm build-annotate && echo '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
     "build-prepare": "build-utils prepare-v2",
     "build-esm": "tsc -b tsconfig.build.json",
-    "build-cjs": "babel build/esm --plugins @babel/transform-export-namespace-from --plugins @babel/transform-modules-commonjs --out-dir build/cjs --source-maps",
-    "build-annotate": "babel build --plugins annotate-pure-calls --out-dir build --source-maps",
-    "clean": "rimraf build dist coverage .tsbuildinfo",
+    "build-cjs": "babel dist/esm --plugins @babel/transform-export-namespace-from --plugins @babel/transform-modules-commonjs --out-dir dist/cjs --source-maps",
+    "build-annotate": "babel dist --plugins annotate-pure-calls --out-dir dist --source-maps",
+    "clean": "rimraf dist coverage .tsbuildinfo",
     "test": "vitest",
     "check": "tsc -b tsconfig.json",
     "coverage": "vitest run --coverage",
@@ -48,7 +51,731 @@
     "lint-fix": "eslint src test --fix",
     "docgen": "docgen",
     "dtslint": "dtslint dtslint",
-    "dtslint-clean": "dtslint --installAll"
+    "dtslint-clean": "dtslint --installAll",
+    "prepare": "pnpm clean && pnpm run build"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "types": "./dist/dts/index.d.ts",
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    },
+    "./BigDecimal": {
+      "types": "./dist/dts/BigDecimal.d.ts",
+      "import": "./dist/esm/BigDecimal.js",
+      "require": "./dist/cjs/BigDecimal.js"
+    },
+    "./BigInt": {
+      "types": "./dist/dts/BigInt.d.ts",
+      "import": "./dist/esm/BigInt.js",
+      "require": "./dist/cjs/BigInt.js"
+    },
+    "./Boolean": {
+      "types": "./dist/dts/Boolean.d.ts",
+      "import": "./dist/esm/Boolean.js",
+      "require": "./dist/cjs/Boolean.js"
+    },
+    "./Brand": {
+      "types": "./dist/dts/Brand.d.ts",
+      "import": "./dist/esm/Brand.js",
+      "require": "./dist/cjs/Brand.js"
+    },
+    "./Cache": {
+      "types": "./dist/dts/Cache.d.ts",
+      "import": "./dist/esm/Cache.js",
+      "require": "./dist/cjs/Cache.js"
+    },
+    "./Cause": {
+      "types": "./dist/dts/Cause.d.ts",
+      "import": "./dist/esm/Cause.js",
+      "require": "./dist/cjs/Cause.js"
+    },
+    "./Channel": {
+      "types": "./dist/dts/Channel.d.ts",
+      "import": "./dist/esm/Channel.js",
+      "require": "./dist/cjs/Channel.js"
+    },
+    "./ChildExecutorDecision": {
+      "types": "./dist/dts/ChildExecutorDecision.d.ts",
+      "import": "./dist/esm/ChildExecutorDecision.js",
+      "require": "./dist/cjs/ChildExecutorDecision.js"
+    },
+    "./Chunk": {
+      "types": "./dist/dts/Chunk.d.ts",
+      "import": "./dist/esm/Chunk.js",
+      "require": "./dist/cjs/Chunk.js"
+    },
+    "./Clock": {
+      "types": "./dist/dts/Clock.d.ts",
+      "import": "./dist/esm/Clock.js",
+      "require": "./dist/cjs/Clock.js"
+    },
+    "./Config": {
+      "types": "./dist/dts/Config.d.ts",
+      "import": "./dist/esm/Config.js",
+      "require": "./dist/cjs/Config.js"
+    },
+    "./ConfigError": {
+      "types": "./dist/dts/ConfigError.d.ts",
+      "import": "./dist/esm/ConfigError.js",
+      "require": "./dist/cjs/ConfigError.js"
+    },
+    "./ConfigProvider": {
+      "types": "./dist/dts/ConfigProvider.d.ts",
+      "import": "./dist/esm/ConfigProvider.js",
+      "require": "./dist/cjs/ConfigProvider.js"
+    },
+    "./ConfigProviderPathPatch": {
+      "types": "./dist/dts/ConfigProviderPathPatch.d.ts",
+      "import": "./dist/esm/ConfigProviderPathPatch.js",
+      "require": "./dist/cjs/ConfigProviderPathPatch.js"
+    },
+    "./ConfigSecret": {
+      "types": "./dist/dts/ConfigSecret.d.ts",
+      "import": "./dist/esm/ConfigSecret.js",
+      "require": "./dist/cjs/ConfigSecret.js"
+    },
+    "./Console": {
+      "types": "./dist/dts/Console.d.ts",
+      "import": "./dist/esm/Console.js",
+      "require": "./dist/cjs/Console.js"
+    },
+    "./Context": {
+      "types": "./dist/dts/Context.d.ts",
+      "import": "./dist/esm/Context.js",
+      "require": "./dist/cjs/Context.js"
+    },
+    "./Data": {
+      "types": "./dist/dts/Data.d.ts",
+      "import": "./dist/esm/Data.js",
+      "require": "./dist/cjs/Data.js"
+    },
+    "./DefaultServices": {
+      "types": "./dist/dts/DefaultServices.d.ts",
+      "import": "./dist/esm/DefaultServices.js",
+      "require": "./dist/cjs/DefaultServices.js"
+    },
+    "./Deferred": {
+      "types": "./dist/dts/Deferred.d.ts",
+      "import": "./dist/esm/Deferred.js",
+      "require": "./dist/cjs/Deferred.js"
+    },
+    "./Differ": {
+      "types": "./dist/dts/Differ.d.ts",
+      "import": "./dist/esm/Differ.js",
+      "require": "./dist/cjs/Differ.js"
+    },
+    "./Duration": {
+      "types": "./dist/dts/Duration.d.ts",
+      "import": "./dist/esm/Duration.js",
+      "require": "./dist/cjs/Duration.js"
+    },
+    "./Effect": {
+      "types": "./dist/dts/Effect.d.ts",
+      "import": "./dist/esm/Effect.js",
+      "require": "./dist/cjs/Effect.js"
+    },
+    "./Effectable": {
+      "types": "./dist/dts/Effectable.d.ts",
+      "import": "./dist/esm/Effectable.js",
+      "require": "./dist/cjs/Effectable.js"
+    },
+    "./Either": {
+      "types": "./dist/dts/Either.d.ts",
+      "import": "./dist/esm/Either.js",
+      "require": "./dist/cjs/Either.js"
+    },
+    "./Encoding": {
+      "types": "./dist/dts/Encoding.d.ts",
+      "import": "./dist/esm/Encoding.js",
+      "require": "./dist/cjs/Encoding.js"
+    },
+    "./Equal": {
+      "types": "./dist/dts/Equal.d.ts",
+      "import": "./dist/esm/Equal.js",
+      "require": "./dist/cjs/Equal.js"
+    },
+    "./Equivalence": {
+      "types": "./dist/dts/Equivalence.d.ts",
+      "import": "./dist/esm/Equivalence.js",
+      "require": "./dist/cjs/Equivalence.js"
+    },
+    "./ExecutionStrategy": {
+      "types": "./dist/dts/ExecutionStrategy.d.ts",
+      "import": "./dist/esm/ExecutionStrategy.js",
+      "require": "./dist/cjs/ExecutionStrategy.js"
+    },
+    "./Exit": {
+      "types": "./dist/dts/Exit.d.ts",
+      "import": "./dist/esm/Exit.js",
+      "require": "./dist/cjs/Exit.js"
+    },
+    "./Fiber": {
+      "types": "./dist/dts/Fiber.d.ts",
+      "import": "./dist/esm/Fiber.js",
+      "require": "./dist/cjs/Fiber.js"
+    },
+    "./FiberId": {
+      "types": "./dist/dts/FiberId.d.ts",
+      "import": "./dist/esm/FiberId.js",
+      "require": "./dist/cjs/FiberId.js"
+    },
+    "./FiberRef": {
+      "types": "./dist/dts/FiberRef.d.ts",
+      "import": "./dist/esm/FiberRef.js",
+      "require": "./dist/cjs/FiberRef.js"
+    },
+    "./FiberRefs": {
+      "types": "./dist/dts/FiberRefs.d.ts",
+      "import": "./dist/esm/FiberRefs.js",
+      "require": "./dist/cjs/FiberRefs.js"
+    },
+    "./FiberRefsPatch": {
+      "types": "./dist/dts/FiberRefsPatch.d.ts",
+      "import": "./dist/esm/FiberRefsPatch.js",
+      "require": "./dist/cjs/FiberRefsPatch.js"
+    },
+    "./FiberStatus": {
+      "types": "./dist/dts/FiberStatus.d.ts",
+      "import": "./dist/esm/FiberStatus.js",
+      "require": "./dist/cjs/FiberStatus.js"
+    },
+    "./Function": {
+      "types": "./dist/dts/Function.d.ts",
+      "import": "./dist/esm/Function.js",
+      "require": "./dist/cjs/Function.js"
+    },
+    "./GlobalValue": {
+      "types": "./dist/dts/GlobalValue.d.ts",
+      "import": "./dist/esm/GlobalValue.js",
+      "require": "./dist/cjs/GlobalValue.js"
+    },
+    "./GroupBy": {
+      "types": "./dist/dts/GroupBy.d.ts",
+      "import": "./dist/esm/GroupBy.js",
+      "require": "./dist/cjs/GroupBy.js"
+    },
+    "./HKT": {
+      "types": "./dist/dts/HKT.d.ts",
+      "import": "./dist/esm/HKT.js",
+      "require": "./dist/cjs/HKT.js"
+    },
+    "./Hash": {
+      "types": "./dist/dts/Hash.d.ts",
+      "import": "./dist/esm/Hash.js",
+      "require": "./dist/cjs/Hash.js"
+    },
+    "./HashMap": {
+      "types": "./dist/dts/HashMap.d.ts",
+      "import": "./dist/esm/HashMap.js",
+      "require": "./dist/cjs/HashMap.js"
+    },
+    "./HashSet": {
+      "types": "./dist/dts/HashSet.d.ts",
+      "import": "./dist/esm/HashSet.js",
+      "require": "./dist/cjs/HashSet.js"
+    },
+    "./Inspectable": {
+      "types": "./dist/dts/Inspectable.d.ts",
+      "import": "./dist/esm/Inspectable.js",
+      "require": "./dist/cjs/Inspectable.js"
+    },
+    "./KeyedPool": {
+      "types": "./dist/dts/KeyedPool.d.ts",
+      "import": "./dist/esm/KeyedPool.js",
+      "require": "./dist/cjs/KeyedPool.js"
+    },
+    "./Layer": {
+      "types": "./dist/dts/Layer.d.ts",
+      "import": "./dist/esm/Layer.js",
+      "require": "./dist/cjs/Layer.js"
+    },
+    "./List": {
+      "types": "./dist/dts/List.d.ts",
+      "import": "./dist/esm/List.js",
+      "require": "./dist/cjs/List.js"
+    },
+    "./LogLevel": {
+      "types": "./dist/dts/LogLevel.d.ts",
+      "import": "./dist/esm/LogLevel.js",
+      "require": "./dist/cjs/LogLevel.js"
+    },
+    "./LogSpan": {
+      "types": "./dist/dts/LogSpan.d.ts",
+      "import": "./dist/esm/LogSpan.js",
+      "require": "./dist/cjs/LogSpan.js"
+    },
+    "./Logger": {
+      "types": "./dist/dts/Logger.d.ts",
+      "import": "./dist/esm/Logger.js",
+      "require": "./dist/cjs/Logger.js"
+    },
+    "./Match": {
+      "types": "./dist/dts/Match.d.ts",
+      "import": "./dist/esm/Match.js",
+      "require": "./dist/cjs/Match.js"
+    },
+    "./MergeDecision": {
+      "types": "./dist/dts/MergeDecision.d.ts",
+      "import": "./dist/esm/MergeDecision.js",
+      "require": "./dist/cjs/MergeDecision.js"
+    },
+    "./MergeState": {
+      "types": "./dist/dts/MergeState.d.ts",
+      "import": "./dist/esm/MergeState.js",
+      "require": "./dist/cjs/MergeState.js"
+    },
+    "./MergeStrategy": {
+      "types": "./dist/dts/MergeStrategy.d.ts",
+      "import": "./dist/esm/MergeStrategy.js",
+      "require": "./dist/cjs/MergeStrategy.js"
+    },
+    "./Metric": {
+      "types": "./dist/dts/Metric.d.ts",
+      "import": "./dist/esm/Metric.js",
+      "require": "./dist/cjs/Metric.js"
+    },
+    "./MetricBoundaries": {
+      "types": "./dist/dts/MetricBoundaries.d.ts",
+      "import": "./dist/esm/MetricBoundaries.js",
+      "require": "./dist/cjs/MetricBoundaries.js"
+    },
+    "./MetricHook": {
+      "types": "./dist/dts/MetricHook.d.ts",
+      "import": "./dist/esm/MetricHook.js",
+      "require": "./dist/cjs/MetricHook.js"
+    },
+    "./MetricKey": {
+      "types": "./dist/dts/MetricKey.d.ts",
+      "import": "./dist/esm/MetricKey.js",
+      "require": "./dist/cjs/MetricKey.js"
+    },
+    "./MetricKeyType": {
+      "types": "./dist/dts/MetricKeyType.d.ts",
+      "import": "./dist/esm/MetricKeyType.js",
+      "require": "./dist/cjs/MetricKeyType.js"
+    },
+    "./MetricLabel": {
+      "types": "./dist/dts/MetricLabel.d.ts",
+      "import": "./dist/esm/MetricLabel.js",
+      "require": "./dist/cjs/MetricLabel.js"
+    },
+    "./MetricPair": {
+      "types": "./dist/dts/MetricPair.d.ts",
+      "import": "./dist/esm/MetricPair.js",
+      "require": "./dist/cjs/MetricPair.js"
+    },
+    "./MetricPolling": {
+      "types": "./dist/dts/MetricPolling.d.ts",
+      "import": "./dist/esm/MetricPolling.js",
+      "require": "./dist/cjs/MetricPolling.js"
+    },
+    "./MetricRegistry": {
+      "types": "./dist/dts/MetricRegistry.d.ts",
+      "import": "./dist/esm/MetricRegistry.js",
+      "require": "./dist/cjs/MetricRegistry.js"
+    },
+    "./MetricState": {
+      "types": "./dist/dts/MetricState.d.ts",
+      "import": "./dist/esm/MetricState.js",
+      "require": "./dist/cjs/MetricState.js"
+    },
+    "./MutableHashMap": {
+      "types": "./dist/dts/MutableHashMap.d.ts",
+      "import": "./dist/esm/MutableHashMap.js",
+      "require": "./dist/cjs/MutableHashMap.js"
+    },
+    "./MutableHashSet": {
+      "types": "./dist/dts/MutableHashSet.d.ts",
+      "import": "./dist/esm/MutableHashSet.js",
+      "require": "./dist/cjs/MutableHashSet.js"
+    },
+    "./MutableList": {
+      "types": "./dist/dts/MutableList.d.ts",
+      "import": "./dist/esm/MutableList.js",
+      "require": "./dist/cjs/MutableList.js"
+    },
+    "./MutableQueue": {
+      "types": "./dist/dts/MutableQueue.d.ts",
+      "import": "./dist/esm/MutableQueue.js",
+      "require": "./dist/cjs/MutableQueue.js"
+    },
+    "./MutableRef": {
+      "types": "./dist/dts/MutableRef.d.ts",
+      "import": "./dist/esm/MutableRef.js",
+      "require": "./dist/cjs/MutableRef.js"
+    },
+    "./NonEmptyIterable": {
+      "types": "./dist/dts/NonEmptyIterable.d.ts",
+      "import": "./dist/esm/NonEmptyIterable.js",
+      "require": "./dist/cjs/NonEmptyIterable.js"
+    },
+    "./Number": {
+      "types": "./dist/dts/Number.d.ts",
+      "import": "./dist/esm/Number.js",
+      "require": "./dist/cjs/Number.js"
+    },
+    "./Option": {
+      "types": "./dist/dts/Option.d.ts",
+      "import": "./dist/esm/Option.js",
+      "require": "./dist/cjs/Option.js"
+    },
+    "./Order": {
+      "types": "./dist/dts/Order.d.ts",
+      "import": "./dist/esm/Order.js",
+      "require": "./dist/cjs/Order.js"
+    },
+    "./Ordering": {
+      "types": "./dist/dts/Ordering.d.ts",
+      "import": "./dist/esm/Ordering.js",
+      "require": "./dist/cjs/Ordering.js"
+    },
+    "./Pipeable": {
+      "types": "./dist/dts/Pipeable.d.ts",
+      "import": "./dist/esm/Pipeable.js",
+      "require": "./dist/cjs/Pipeable.js"
+    },
+    "./Pool": {
+      "types": "./dist/dts/Pool.d.ts",
+      "import": "./dist/esm/Pool.js",
+      "require": "./dist/cjs/Pool.js"
+    },
+    "./Predicate": {
+      "types": "./dist/dts/Predicate.d.ts",
+      "import": "./dist/esm/Predicate.js",
+      "require": "./dist/cjs/Predicate.js"
+    },
+    "./PubSub": {
+      "types": "./dist/dts/PubSub.d.ts",
+      "import": "./dist/esm/PubSub.js",
+      "require": "./dist/cjs/PubSub.js"
+    },
+    "./Queue": {
+      "types": "./dist/dts/Queue.d.ts",
+      "import": "./dist/esm/Queue.js",
+      "require": "./dist/cjs/Queue.js"
+    },
+    "./Random": {
+      "types": "./dist/dts/Random.d.ts",
+      "import": "./dist/esm/Random.js",
+      "require": "./dist/cjs/Random.js"
+    },
+    "./ReadonlyArray": {
+      "types": "./dist/dts/ReadonlyArray.d.ts",
+      "import": "./dist/esm/ReadonlyArray.js",
+      "require": "./dist/cjs/ReadonlyArray.js"
+    },
+    "./ReadonlyRecord": {
+      "types": "./dist/dts/ReadonlyRecord.d.ts",
+      "import": "./dist/esm/ReadonlyRecord.js",
+      "require": "./dist/cjs/ReadonlyRecord.js"
+    },
+    "./RedBlackTree": {
+      "types": "./dist/dts/RedBlackTree.d.ts",
+      "import": "./dist/esm/RedBlackTree.js",
+      "require": "./dist/cjs/RedBlackTree.js"
+    },
+    "./Ref": {
+      "types": "./dist/dts/Ref.d.ts",
+      "import": "./dist/esm/Ref.js",
+      "require": "./dist/cjs/Ref.js"
+    },
+    "./Reloadable": {
+      "types": "./dist/dts/Reloadable.d.ts",
+      "import": "./dist/esm/Reloadable.js",
+      "require": "./dist/cjs/Reloadable.js"
+    },
+    "./Request": {
+      "types": "./dist/dts/Request.d.ts",
+      "import": "./dist/esm/Request.js",
+      "require": "./dist/cjs/Request.js"
+    },
+    "./RequestBlock": {
+      "types": "./dist/dts/RequestBlock.d.ts",
+      "import": "./dist/esm/RequestBlock.js",
+      "require": "./dist/cjs/RequestBlock.js"
+    },
+    "./RequestResolver": {
+      "types": "./dist/dts/RequestResolver.d.ts",
+      "import": "./dist/esm/RequestResolver.js",
+      "require": "./dist/cjs/RequestResolver.js"
+    },
+    "./Resource": {
+      "types": "./dist/dts/Resource.d.ts",
+      "import": "./dist/esm/Resource.js",
+      "require": "./dist/cjs/Resource.js"
+    },
+    "./Runtime": {
+      "types": "./dist/dts/Runtime.d.ts",
+      "import": "./dist/esm/Runtime.js",
+      "require": "./dist/cjs/Runtime.js"
+    },
+    "./RuntimeFlags": {
+      "types": "./dist/dts/RuntimeFlags.d.ts",
+      "import": "./dist/esm/RuntimeFlags.js",
+      "require": "./dist/cjs/RuntimeFlags.js"
+    },
+    "./RuntimeFlagsPatch": {
+      "types": "./dist/dts/RuntimeFlagsPatch.d.ts",
+      "import": "./dist/esm/RuntimeFlagsPatch.js",
+      "require": "./dist/cjs/RuntimeFlagsPatch.js"
+    },
+    "./STM": {
+      "types": "./dist/dts/STM.d.ts",
+      "import": "./dist/esm/STM.js",
+      "require": "./dist/cjs/STM.js"
+    },
+    "./Schedule": {
+      "types": "./dist/dts/Schedule.d.ts",
+      "import": "./dist/esm/Schedule.js",
+      "require": "./dist/cjs/Schedule.js"
+    },
+    "./ScheduleDecision": {
+      "types": "./dist/dts/ScheduleDecision.d.ts",
+      "import": "./dist/esm/ScheduleDecision.js",
+      "require": "./dist/cjs/ScheduleDecision.js"
+    },
+    "./ScheduleInterval": {
+      "types": "./dist/dts/ScheduleInterval.d.ts",
+      "import": "./dist/esm/ScheduleInterval.js",
+      "require": "./dist/cjs/ScheduleInterval.js"
+    },
+    "./ScheduleIntervals": {
+      "types": "./dist/dts/ScheduleIntervals.d.ts",
+      "import": "./dist/esm/ScheduleIntervals.js",
+      "require": "./dist/cjs/ScheduleIntervals.js"
+    },
+    "./Scheduler": {
+      "types": "./dist/dts/Scheduler.d.ts",
+      "import": "./dist/esm/Scheduler.js",
+      "require": "./dist/cjs/Scheduler.js"
+    },
+    "./Scope": {
+      "types": "./dist/dts/Scope.d.ts",
+      "import": "./dist/esm/Scope.js",
+      "require": "./dist/cjs/Scope.js"
+    },
+    "./ScopedCache": {
+      "types": "./dist/dts/ScopedCache.d.ts",
+      "import": "./dist/esm/ScopedCache.js",
+      "require": "./dist/cjs/ScopedCache.js"
+    },
+    "./ScopedRef": {
+      "types": "./dist/dts/ScopedRef.d.ts",
+      "import": "./dist/esm/ScopedRef.js",
+      "require": "./dist/cjs/ScopedRef.js"
+    },
+    "./SingleProducerAsyncInput": {
+      "types": "./dist/dts/SingleProducerAsyncInput.d.ts",
+      "import": "./dist/esm/SingleProducerAsyncInput.js",
+      "require": "./dist/cjs/SingleProducerAsyncInput.js"
+    },
+    "./Sink": {
+      "types": "./dist/dts/Sink.d.ts",
+      "import": "./dist/esm/Sink.js",
+      "require": "./dist/cjs/Sink.js"
+    },
+    "./SortedMap": {
+      "types": "./dist/dts/SortedMap.d.ts",
+      "import": "./dist/esm/SortedMap.js",
+      "require": "./dist/cjs/SortedMap.js"
+    },
+    "./SortedSet": {
+      "types": "./dist/dts/SortedSet.d.ts",
+      "import": "./dist/esm/SortedSet.js",
+      "require": "./dist/cjs/SortedSet.js"
+    },
+    "./Stream": {
+      "types": "./dist/dts/Stream.d.ts",
+      "import": "./dist/esm/Stream.js",
+      "require": "./dist/cjs/Stream.js"
+    },
+    "./StreamEmit": {
+      "types": "./dist/dts/StreamEmit.d.ts",
+      "import": "./dist/esm/StreamEmit.js",
+      "require": "./dist/cjs/StreamEmit.js"
+    },
+    "./StreamHaltStrategy": {
+      "types": "./dist/dts/StreamHaltStrategy.d.ts",
+      "import": "./dist/esm/StreamHaltStrategy.js",
+      "require": "./dist/cjs/StreamHaltStrategy.js"
+    },
+    "./Streamable": {
+      "types": "./dist/dts/Streamable.d.ts",
+      "import": "./dist/esm/Streamable.js",
+      "require": "./dist/cjs/Streamable.js"
+    },
+    "./String": {
+      "types": "./dist/dts/String.d.ts",
+      "import": "./dist/esm/String.js",
+      "require": "./dist/cjs/String.js"
+    },
+    "./Struct": {
+      "types": "./dist/dts/Struct.d.ts",
+      "import": "./dist/esm/Struct.js",
+      "require": "./dist/cjs/Struct.js"
+    },
+    "./SubscriptionRef": {
+      "types": "./dist/dts/SubscriptionRef.d.ts",
+      "import": "./dist/esm/SubscriptionRef.js",
+      "require": "./dist/cjs/SubscriptionRef.js"
+    },
+    "./Supervisor": {
+      "types": "./dist/dts/Supervisor.d.ts",
+      "import": "./dist/esm/Supervisor.js",
+      "require": "./dist/cjs/Supervisor.js"
+    },
+    "./Symbol": {
+      "types": "./dist/dts/Symbol.d.ts",
+      "import": "./dist/esm/Symbol.js",
+      "require": "./dist/cjs/Symbol.js"
+    },
+    "./SynchronizedRef": {
+      "types": "./dist/dts/SynchronizedRef.d.ts",
+      "import": "./dist/esm/SynchronizedRef.js",
+      "require": "./dist/cjs/SynchronizedRef.js"
+    },
+    "./TArray": {
+      "types": "./dist/dts/TArray.d.ts",
+      "import": "./dist/esm/TArray.js",
+      "require": "./dist/cjs/TArray.js"
+    },
+    "./TDeferred": {
+      "types": "./dist/dts/TDeferred.d.ts",
+      "import": "./dist/esm/TDeferred.js",
+      "require": "./dist/cjs/TDeferred.js"
+    },
+    "./TMap": {
+      "types": "./dist/dts/TMap.d.ts",
+      "import": "./dist/esm/TMap.js",
+      "require": "./dist/cjs/TMap.js"
+    },
+    "./TPriorityQueue": {
+      "types": "./dist/dts/TPriorityQueue.d.ts",
+      "import": "./dist/esm/TPriorityQueue.js",
+      "require": "./dist/cjs/TPriorityQueue.js"
+    },
+    "./TPubSub": {
+      "types": "./dist/dts/TPubSub.d.ts",
+      "import": "./dist/esm/TPubSub.js",
+      "require": "./dist/cjs/TPubSub.js"
+    },
+    "./TQueue": {
+      "types": "./dist/dts/TQueue.d.ts",
+      "import": "./dist/esm/TQueue.js",
+      "require": "./dist/cjs/TQueue.js"
+    },
+    "./TRandom": {
+      "types": "./dist/dts/TRandom.d.ts",
+      "import": "./dist/esm/TRandom.js",
+      "require": "./dist/cjs/TRandom.js"
+    },
+    "./TReentrantLock": {
+      "types": "./dist/dts/TReentrantLock.d.ts",
+      "import": "./dist/esm/TReentrantLock.js",
+      "require": "./dist/cjs/TReentrantLock.js"
+    },
+    "./TRef": {
+      "types": "./dist/dts/TRef.d.ts",
+      "import": "./dist/esm/TRef.js",
+      "require": "./dist/cjs/TRef.js"
+    },
+    "./TSemaphore": {
+      "types": "./dist/dts/TSemaphore.d.ts",
+      "import": "./dist/esm/TSemaphore.js",
+      "require": "./dist/cjs/TSemaphore.js"
+    },
+    "./TSet": {
+      "types": "./dist/dts/TSet.d.ts",
+      "import": "./dist/esm/TSet.js",
+      "require": "./dist/cjs/TSet.js"
+    },
+    "./Take": {
+      "types": "./dist/dts/Take.d.ts",
+      "import": "./dist/esm/Take.js",
+      "require": "./dist/cjs/Take.js"
+    },
+    "./TestAnnotation": {
+      "types": "./dist/dts/TestAnnotation.d.ts",
+      "import": "./dist/esm/TestAnnotation.js",
+      "require": "./dist/cjs/TestAnnotation.js"
+    },
+    "./TestAnnotationMap": {
+      "types": "./dist/dts/TestAnnotationMap.d.ts",
+      "import": "./dist/esm/TestAnnotationMap.js",
+      "require": "./dist/cjs/TestAnnotationMap.js"
+    },
+    "./TestAnnotations": {
+      "types": "./dist/dts/TestAnnotations.d.ts",
+      "import": "./dist/esm/TestAnnotations.js",
+      "require": "./dist/cjs/TestAnnotations.js"
+    },
+    "./TestClock": {
+      "types": "./dist/dts/TestClock.d.ts",
+      "import": "./dist/esm/TestClock.js",
+      "require": "./dist/cjs/TestClock.js"
+    },
+    "./TestConfig": {
+      "types": "./dist/dts/TestConfig.d.ts",
+      "import": "./dist/esm/TestConfig.js",
+      "require": "./dist/cjs/TestConfig.js"
+    },
+    "./TestContext": {
+      "types": "./dist/dts/TestContext.d.ts",
+      "import": "./dist/esm/TestContext.js",
+      "require": "./dist/cjs/TestContext.js"
+    },
+    "./TestLive": {
+      "types": "./dist/dts/TestLive.d.ts",
+      "import": "./dist/esm/TestLive.js",
+      "require": "./dist/cjs/TestLive.js"
+    },
+    "./TestServices": {
+      "types": "./dist/dts/TestServices.d.ts",
+      "import": "./dist/esm/TestServices.js",
+      "require": "./dist/cjs/TestServices.js"
+    },
+    "./TestSized": {
+      "types": "./dist/dts/TestSized.d.ts",
+      "import": "./dist/esm/TestSized.js",
+      "require": "./dist/cjs/TestSized.js"
+    },
+    "./Tracer": {
+      "types": "./dist/dts/Tracer.d.ts",
+      "import": "./dist/esm/Tracer.js",
+      "require": "./dist/cjs/Tracer.js"
+    },
+    "./Tuple": {
+      "types": "./dist/dts/Tuple.d.ts",
+      "import": "./dist/esm/Tuple.js",
+      "require": "./dist/cjs/Tuple.js"
+    },
+    "./Types": {
+      "types": "./dist/dts/Types.d.ts",
+      "import": "./dist/esm/Types.js",
+      "require": "./dist/cjs/Types.js"
+    },
+    "./Unify": {
+      "types": "./dist/dts/Unify.d.ts",
+      "import": "./dist/esm/Unify.js",
+      "require": "./dist/cjs/Unify.js"
+    },
+    "./UpstreamPullRequest": {
+      "types": "./dist/dts/UpstreamPullRequest.d.ts",
+      "import": "./dist/esm/UpstreamPullRequest.js",
+      "require": "./dist/cjs/UpstreamPullRequest.js"
+    },
+    "./UpstreamPullStrategy": {
+      "types": "./dist/dts/UpstreamPullStrategy.d.ts",
+      "import": "./dist/esm/UpstreamPullStrategy.js",
+      "require": "./dist/cjs/UpstreamPullStrategy.js"
+    },
+    "./Utils": {
+      "types": "./dist/dts/Utils.d.ts",
+      "import": "./dist/esm/Utils.js",
+      "require": "./dist/cjs/Utils.js"
+    }
   },
   "devDependencies": {
     "@babel/cli": "^7.23.0",
@@ -58,7 +785,7 @@
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
     "@edge-runtime/vm": "^3.1.6",
-    "@effect/build-utils": "^0.3.0",
+    "@effect/build-utils": "^0.2.0",
     "@effect/docgen": "^0.3.0",
     "@effect/dtslint": "^0.0.3",
     "@effect/eslint-plugin": "^0.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8a672e5a42f..456c91a287f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,8 +27,8 @@ devDependencies:
     specifier: ^3.1.6
     version: 3.1.6
   '@effect/build-utils':
-    specifier: ^0.3.0
-    version: 0.3.0
+    specifier: ^0.2.0
+    version: 0.2.0
   '@effect/docgen':
     specifier: ^0.3.0
     version: 0.3.0(fast-check@3.13.2)(tsx@3.14.0)(typescript@5.2.2)
@@ -621,8 +621,8 @@ packages:
       '@edge-runtime/primitives': 4.0.4
     dev: true
 
-  /@effect/build-utils@0.3.0:
-    resolution: {integrity: sha512-t8YEfEMGObi8vuCyUe1hVQLLZPzfV4K1c8LdRa9w+Uwk3CXASUER0crjvDoPTT2A7dclVlOdhCie2oyGav8YQQ==}
+  /@effect/build-utils@0.2.0:
+    resolution: {integrity: sha512-GlvCwP0O0ViwfmPk+1u6CHkBYUDMI4Mjff4sCMdkGqJNkw55aT9wmOg0K/6GSbRi01lX13HJZBoetMPed6QdSQ==}
     engines: {node: '>=16.17.1'}
     hasBin: true
     dev: true
@@ -6011,5 +6011,3 @@ packages:
       repeat-string: 1.6.1
       strip-color: 0.1.0
     dev: true
-
-publishDirectory: dist
diff --git a/tsconfig.build.json b/tsconfig.build.json
index c8cdb19b8e8..3500e98160b 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -4,8 +4,8 @@
     "src"
   ],
   "compilerOptions": {
-    "outDir": "build/esm",
-    "declarationDir": "build/dts",
+    "outDir": "dist/esm",
+    "declarationDir": "dist/dts",
     "tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo",
     "rootDir": "src"
   }