diff --git a/lib/actions/index.ts b/lib/actions/index.ts
index 1b32d34..603684b 100644
--- a/lib/actions/index.ts
+++ b/lib/actions/index.ts
@@ -1,3 +1,3 @@
-export { CreatedAction, createAction } from "./createAction"
+import "./createAction"
 
-export { setupActions } from "./setupActions"
+import "./setupActions"
diff --git a/lib/autoconfig/index.ts b/lib/autoconfig/index.ts
index 2f6deda..031733b 100644
--- a/lib/autoconfig/index.ts
+++ b/lib/autoconfig/index.ts
@@ -5,5 +5,5 @@ export type ReadonlyDeep<A> =
 export type MaybePromise<A> = Promise<A> | A
 export type Message = string
 
-export { AutoConfig } from "./AutoConfig"
-export { setupAutoConfig } from "./setupAutoConfig"
+import "./AutoConfig"
+import "./setupAutoConfig"
diff --git a/lib/backup/index.ts b/lib/backup/index.ts
index b56fc0e..fe9cd85 100644
--- a/lib/backup/index.ts
+++ b/lib/backup/index.ts
@@ -1,3 +1,3 @@
-export { Backups } from "./Backups"
+import "./Backups"
 
-export { setupBackups } from "./setupBackups"
+import "./setupBackups"
diff --git a/lib/backup/setupBackups.ts b/lib/backup/setupBackups.ts
index a101661..e802cef 100644
--- a/lib/backup/setupBackups.ts
+++ b/lib/backup/setupBackups.ts
@@ -1,5 +1,5 @@
 import { string } from "ts-matches"
-import { Backups } from "."
+import { Backups } from "./Backups"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { BackupOptions, ExpectedExports } from "../types"
 import { _ } from "../util"
diff --git a/lib/config/builder/index.ts b/lib/config/builder/index.ts
index 80ab296..a0d794b 100644
--- a/lib/config/builder/index.ts
+++ b/lib/config/builder/index.ts
@@ -1,14 +1,4 @@
-import { Config, topConfig } from "./config"
-import { List } from "./list"
-import { Value } from "./value"
-import { Variants } from "./variants"
-
-export {
-  /** @typedef { import("./config").Config } Pet
-   */
-  Config,
-  List,
-  Value,
-  Variants,
-  topConfig,
-}
+import "./config"
+import "./list"
+import "./value"
+import "./variants"
diff --git a/lib/config/builder/value.ts b/lib/config/builder/value.ts
index 72760ee..d3e1d3c 100644
--- a/lib/config/builder/value.ts
+++ b/lib/config/builder/value.ts
@@ -8,7 +8,6 @@ import {
   ValueSpecText,
   ValueSpecTextarea,
 } from "../configTypes"
-import { once } from "../../util"
 import { DefaultString } from "../configTypes"
 import { _ } from "../../util"
 import {
@@ -23,6 +22,7 @@ import {
   string,
   unknown,
 } from "ts-matches"
+import { once } from "../../util/once"
 
 type RequiredDefault<A> =
   | false
diff --git a/lib/config/builder/variants.ts b/lib/config/builder/variants.ts
index 5b625eb..12e8481 100644
--- a/lib/config/builder/variants.ts
+++ b/lib/config/builder/variants.ts
@@ -1,6 +1,5 @@
 import { InputSpec, ValueSpecUnion } from "../configTypes"
-import { Config } from "."
-import { LazyBuild } from "./config"
+import { LazyBuild, Config } from "./config"
 import { Parser, anyOf, literals, object } from "ts-matches"
 
 /**
diff --git a/lib/config/constants.ts b/lib/config/constants.ts
index f2cc730..a28f412 100644
--- a/lib/config/constants.ts
+++ b/lib/config/constants.ts
@@ -1,5 +1,7 @@
 import { SmtpValue } from "../types"
-import { Config, Value, Variants, topConfig } from "./builder"
+import { Config } from "./builder/config"
+import { Value } from "./builder/value"
+import { Variants } from "./builder/variants"
 
 export const smtpConfig = Value.union(
   {
diff --git a/lib/config/index.ts b/lib/config/index.ts
index 95942ce..ab95a64 100644
--- a/lib/config/index.ts
+++ b/lib/config/index.ts
@@ -1,5 +1,5 @@
-export * as configBuilder from "./builder"
+import "./builder"
 
-export { setupConfig } from "./setupConfig"
-export * as dependencies from "./dependencies"
-export * as constants from "./constants"
+import "./setupConfig"
+import "./dependencies"
+import "./constants"
diff --git a/lib/config/setupConfig.ts b/lib/config/setupConfig.ts
index bc6c00a..a72ade3 100644
--- a/lib/config/setupConfig.ts
+++ b/lib/config/setupConfig.ts
@@ -1,10 +1,10 @@
-import { Config } from "./builder"
 import { DeepPartial, Dependencies, Effects, ExpectedExports } from "../types"
 import { InputSpec } from "./configTypes"
-import { Utils, nullIfEmpty, once, utils } from "../util"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import * as D from "./dependencies"
-import { ExtractConfigType } from "./builder/config"
+import { Config, ExtractConfigType } from "./builder/config"
+import { Utils, utils } from "../util"
+import nullIfEmpty from "../util/nullIfEmpty"
 
 declare const dependencyProof: unique symbol
 export type DependenciesReceipt = void & {
diff --git a/lib/health/index.ts b/lib/health/index.ts
index 45a2b3c..e9216bd 100644
--- a/lib/health/index.ts
+++ b/lib/health/index.ts
@@ -1,6 +1,6 @@
-export * as checkFns from "./checkFns"
-export * as trigger from "./trigger"
+import "./checkFns"
+import "./trigger"
 
-export { TriggerInput } from "./trigger/TriggerInput"
-export { HealthReceipt } from "./HealthReceipt"
-export { ReadyProof } from "../mainFn/ReadyProof"
+import "./trigger/TriggerInput"
+import "./HealthReceipt"
+import "../mainFn/ReadyProof"
diff --git a/lib/index.ts b/lib/index.ts
index 79bd444..3d389a4 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -1,18 +1,18 @@
-export * as backup from "./backup"
-export * as config from "./config"
-export * as configBuilder from "./config/builder"
-export * as configTypes from "./config/configTypes"
-export * as health from "./health"
-export * as healthUtil from "./health/checkFns"
-export * as mainFn from "./mainFn"
-export * as matches from "ts-matches"
-export * as T from "./types"
-export * as TOML from "@iarna/toml"
-export * as Types from "./types"
-export * as util from "./util"
-export * as YAML from "yaml"
-export * as properties from "./properties"
-export * as autoconfig from "./autoconfig"
-export * as actions from "./actions"
-export * as manifest from "./manifest"
-export * as inits from "./inits"
+import "./backup"
+import "./config"
+import "./config/builder"
+import "./config/configTypes"
+import "./health"
+import "./health/checkFns"
+import "./mainFn"
+import "ts-matches"
+import "./types"
+import "@iarna/toml"
+import "./types"
+import "./util"
+import "yaml"
+import "./properties"
+import "./autoconfig"
+import "./actions"
+import "./manifest"
+import "./inits"
diff --git a/lib/inits/index.ts b/lib/inits/index.ts
index 09dbb98..0a326a6 100644
--- a/lib/inits/index.ts
+++ b/lib/inits/index.ts
@@ -1,3 +1,3 @@
-export { setupInit } from "./setupInit"
-export { setupUninstall } from "./setupUninstall"
-export { setupInstall } from "./setupInstall"
+import "./setupInit"
+import "./setupUninstall"
+import "./setupInstall"
diff --git a/lib/mainFn/index.ts b/lib/mainFn/index.ts
index 36725b6..21b1fd3 100644
--- a/lib/mainFn/index.ts
+++ b/lib/mainFn/index.ts
@@ -1,16 +1,16 @@
 import { Effects, ExpectedExports } from "../types"
 import { Utils, utils } from "../util"
 import { Daemons } from "./Daemons"
-export * as network from "./exportInterfaces"
-export { LocalBinding } from "./LocalBinding"
-export { LocalPort } from "./LocalPort"
-export { NetworkBuilder } from "./NetworkBuilder"
-export { NetworkInterfaceBuilder } from "./NetworkInterfaceBuilder"
-export { Origin } from "./Origin"
-export { TorBinding } from "./TorBinding"
-export { TorHostname } from "./TorHostname"
+import "./exportInterfaces"
+import "./LocalBinding"
+import "./LocalPort"
+import "./NetworkBuilder"
+import "./NetworkInterfaceBuilder"
+import "./Origin"
+import "./TorBinding"
+import "./TorHostname"
 
-export { Daemons } from "./Daemons"
+import "./Daemons"
 
 /**
  * Used to ensure that the main function is running with the valid proofs.
diff --git a/lib/manifest/index.ts b/lib/manifest/index.ts
index 9f82e84..806ef5e 100644
--- a/lib/manifest/index.ts
+++ b/lib/manifest/index.ts
@@ -1,2 +1,2 @@
-export { setupManifest } from "./setupManifest"
-export * as ManifestTypes from "./ManifestTypes"
+import "./setupManifest"
+import "./ManifestTypes"
diff --git a/lib/properties/index.ts b/lib/properties/index.ts
index c5afe99..ee33f38 100644
--- a/lib/properties/index.ts
+++ b/lib/properties/index.ts
@@ -2,10 +2,8 @@ import { ExpectedExports, Properties } from "../types"
 
 import { PropertyGroup } from "./PropertyGroup"
 import { PropertyString } from "./PropertyString"
-export { PropertyGroup } from "./PropertyGroup"
-export { PropertyString } from "./PropertyString"
-
-export const test = ""
+import "./PropertyGroup"
+import "./PropertyString"
 
 export type UnionToIntersection<T> = ((x: T) => any) extends (x: infer R) => any
   ? R
diff --git a/lib/test/output.test.ts b/lib/test/output.test.ts
index 08fb620..37c0b48 100644
--- a/lib/test/output.test.ts
+++ b/lib/test/output.test.ts
@@ -4,10 +4,10 @@ import {
   UnionValueKey,
   unionValueKey,
 } from "../config/configTypes"
-import { deepMerge } from "../util"
 import { ConfigSpec, matchConfigSpec } from "./output"
 import * as _I from "../index"
 import { camelCase } from "../../scripts/oldSpecToBuilder"
+import { deepMerge } from "../util/deepMerge"
 
 export type IfEquals<T, U, Y = unknown, N = never> = (<G>() => G extends T
   ? 1
diff --git a/lib/test/util.deepMerge.test.ts b/lib/test/util.deepMerge.test.ts
index 5878850..25a4a7d 100644
--- a/lib/test/util.deepMerge.test.ts
+++ b/lib/test/util.deepMerge.test.ts
@@ -1,4 +1,4 @@
-import { deepEqual } from "../util"
+import { deepEqual } from "../util/deepEqual"
 import { deepMerge } from "../util/deepMerge"
 
 describe("deepMerge", () => {
diff --git a/lib/test/wrapperData.test.ts b/lib/test/wrapperData.test.ts
index 1be474d..76e6360 100644
--- a/lib/test/wrapperData.test.ts
+++ b/lib/test/wrapperData.test.ts
@@ -1,4 +1,4 @@
-import { T } from ".."
+import { Effects } from "../types"
 import { utils } from "../util"
 
 type WrapperType = {
@@ -13,106 +13,101 @@ const noop = () => {}
 describe("wrapperData", () => {
   test("types", async () => {
     ;async () => {
-      utils<WrapperType>(todo<T.Effects>()).setOwnWrapperData("/config", {
+      utils<WrapperType>(todo<Effects>()).setOwnWrapperData("/config", {
         someValue: "a",
       })
-      utils<WrapperType>(todo<T.Effects>()).setOwnWrapperData(
+      utils<WrapperType>(todo<Effects>()).setOwnWrapperData(
         "/config/someValue",
         "b",
       )
-      utils<WrapperType>(todo<T.Effects>()).setOwnWrapperData("", {
+      utils<WrapperType>(todo<Effects>()).setOwnWrapperData("", {
         config: { someValue: "b" },
       })
-      utils<WrapperType>(todo<T.Effects>()).setOwnWrapperData(
+      utils<WrapperType>(todo<Effects>()).setOwnWrapperData(
         "/config/someValue",
 
         // @ts-expect-error Type is wrong for the setting value
         5,
       )
-      utils<WrapperType>(todo<T.Effects>()).setOwnWrapperData(
+      utils<WrapperType>(todo<Effects>()).setOwnWrapperData(
         // @ts-expect-error Path is wrong
         "/config/someVae3lue",
         "someValue",
       )
 
-      todo<T.Effects>().setWrapperData<WrapperType, "/config/someValue">({
+      todo<Effects>().setWrapperData<WrapperType, "/config/someValue">({
         path: "/config/someValue",
         value: "b",
       })
-      todo<T.Effects>().setWrapperData<WrapperType, "/config/some2Value">({
+      todo<Effects>().setWrapperData<WrapperType, "/config/some2Value">({
         //@ts-expect-error Path is wrong
         path: "/config/someValue",
         //@ts-expect-error Path is wrong
         value: "someValueIn",
       })
-      todo<T.Effects>().setWrapperData<WrapperType, "/config/someValue">({
+      todo<Effects>().setWrapperData<WrapperType, "/config/someValue">({
         //@ts-expect-error Path is wrong
         path: "/config/some2Value",
         value: "a",
       })
-      ;(await utils<WrapperType, {}>(todo<T.Effects>())
+      ;(await utils<WrapperType, {}>(todo<Effects>())
         .getOwnWrapperData("/config/someValue")
         .const()) satisfies string
-      ;(await utils<WrapperType, {}>(todo<T.Effects>())
+      ;(await utils<WrapperType, {}>(todo<Effects>())
         .getOwnWrapperData("/config")
         .const()) satisfies WrapperType["config"]
-      await utils<WrapperType, {}>(todo<T.Effects>())
+      await utils<WrapperType, {}>(todo<Effects>())
         // @ts-expect-error Path is wrong
         .getOwnWrapperData("/config/somdsfeValue")
         .const()
       ///  ----------------- ERRORS -----------------
 
-      utils<WrapperType>(todo<T.Effects>()).setOwnWrapperData("", {
+      utils<WrapperType>(todo<Effects>()).setOwnWrapperData("", {
         // @ts-expect-error Type is wrong for the setting value
         config: { someValue: "notInAOrB" },
       })
-      utils<WrapperType>(todo<T.Effects>()).setOwnWrapperData(
+      utils<WrapperType>(todo<Effects>()).setOwnWrapperData(
         "/config/someValue",
         // @ts-expect-error Type is wrong for the setting value
         "notInAOrB",
       )
-      ;(await utils<WrapperType>(todo<T.Effects>())
+      ;(await utils<WrapperType>(todo<Effects>())
         .getOwnWrapperData("/config/someValue")
         // @ts-expect-error Const should normally not be callable
         .const()) satisfies string
-      ;(await utils<WrapperType>(todo<T.Effects>())
+      ;(await utils<WrapperType>(todo<Effects>())
         .getOwnWrapperData("/config")
         // @ts-expect-error Const should normally not be callable
         .const()) satisfies WrapperType["config"]
-      await utils<WrapperType>(todo<T.Effects>())
+      await utils<WrapperType>(todo<Effects>())
         // @ts-expect-error Path is wrong
         .getOwnWrapperData("/config/somdsfeValue")
         // @ts-expect-error Const should normally not be callable
         .const()
 
       ///
-      ;(await utils<WrapperType>(todo<T.Effects>())
+      ;(await utils<WrapperType>(todo<Effects>())
         .getOwnWrapperData("/config/someValue")
         // @ts-expect-error satisfies type is wrong
         .const()) satisfies number
-      ;(await utils<WrapperType, {}>(todo<T.Effects>())
+      ;(await utils<WrapperType, {}>(todo<Effects>())
         // @ts-expect-error Path is wrong
         .getOwnWrapperData("/config/")
         .const()) satisfies WrapperType["config"]
-      ;(await todo<T.Effects>().getWrapperData<
-        WrapperType,
-        "/config/someValue"
-      >({
+      ;(await todo<Effects>().getWrapperData<WrapperType, "/config/someValue">({
         path: "/config/someValue",
         callback: noop,
       })) satisfies string
-      await todo<T.Effects>().getWrapperData<WrapperType, "/config/someValue">({
+      await todo<Effects>().getWrapperData<WrapperType, "/config/someValue">({
         // @ts-expect-error Path is wrong as in it doesn't match above
         path: "/config/someV2alue",
         callback: noop,
       })
-      await todo<T.Effects>().getWrapperData<WrapperType, "/config/someV2alue">(
-        {
-          // @ts-expect-error Path is wrong as in it doesn't exists in wrapper type
-          path: "/config/someV2alue",
-          callback: noop,
-        },
-      )
+      await todo<Effects>().getWrapperData<WrapperType, "/config/someV2alue">({
+        // @ts-expect-error Path is wrong as in it doesn't exists in wrapper type
+        path: "/config/someV2alue",
+        callback: noop,
+      })
     }
   })
 })
diff --git a/lib/util/index.ts b/lib/util/index.ts
index b3713ce..fa5eb72 100644
--- a/lib/util/index.ts
+++ b/lib/util/index.ts
@@ -8,16 +8,19 @@ import {
   checkPortListening,
   checkWebUrl,
 } from "../health/checkFns"
-import { LocalBinding, LocalPort, NetworkBuilder, TorHostname } from "../mainFn"
 import { ExtractWrapperData } from "../types"
 import { GetSystemSmtp } from "./GetSystemSmtp"
 
-export { default as nullIfEmpty } from "./nullIfEmpty"
-export { FileHelper } from "./fileHelper"
-export { getWrapperData } from "./getWrapperData"
-export { deepEqual } from "./deepEqual"
-export { deepMerge } from "./deepMerge"
-export { once } from "./once"
+import "./nullIfEmpty"
+import "./fileHelper"
+import "./getWrapperData"
+import "./deepEqual"
+import "./deepMerge"
+import "./once"
+import { LocalBinding } from "../mainFn/LocalBinding"
+import { LocalPort } from "../mainFn/LocalPort"
+import { NetworkBuilder } from "../mainFn/NetworkBuilder"
+import { TorHostname } from "../mainFn/TorHostname"
 
 // prettier-ignore
 export type FlattenIntersection<T> =