From 9ed4fbbe3c2fa0119e79d75a201da52f03f2e261 Mon Sep 17 00:00:00 2001
From: Ben Allfree <ben@benallfree.com>
Date: Thu, 6 Jun 2024 22:39:03 -0700
Subject: [PATCH] chore(dashboard,pockethost,superadmin): fix frontend dev mode
 and expose pure js common

---
 .../src/components/ProvisioningStatus.svelte  |  2 +-
 .../src/components/SubscriptionStatus.svelte  |  2 +-
 .../dashboard/src/components/helpers/theme.ts |  2 +-
 .../tables/pricing-table/PricingTable.svelte  |  2 +-
 packages/dashboard/src/env.ts                 |  2 +-
 .../src/pocketbase-client/PocketbaseClient.ts |  2 +-
 .../dashboard/src/routes/account/+page.svelte |  2 +-
 .../app/instances/[instanceId]/+layout.svelte |  2 +-
 .../app/instances/[instanceId]/+page.svelte   |  2 +-
 .../instances/[instanceId]/logs/+page.svelte  |  2 +-
 .../[instanceId]/logs/LoggingInner.svelte     |  6 +++-
 .../[instanceId]/secrets/+page.svelte         |  2 +-
 .../[instanceId]/secrets/Form.svelte          |  2 +-
 .../[instanceId]/settings/+page.svelte        |  2 +-
 .../[instanceId]/settings/CustomDomain.svelte |  2 +-
 .../app/instances/[instanceId]/store.ts       |  2 +-
 .../dashboard/src/routes/app/new/+page.svelte |  2 +-
 .../src/routes/app/new/Paywall.svelte         |  2 +-
 .../src/routes/dashboard/InstanceList.svelte  |  2 +-
 .../src/routes/dashboard/InstanceRow.svelte   |  2 +-
 packages/dashboard/src/services.ts            |  2 +-
 .../dashboard/src/util/componentCleanup.ts    |  2 +-
 packages/dashboard/src/util/stores.ts         |  2 +-
 packages/dashboard/tsconfig.json              |  1 +
 packages/pockethost/common.ts                 |  1 +
 packages/pockethost/core.ts                   |  2 ++
 packages/pockethost/package.json              |  4 +--
 .../DaemonCommand/ServeCommand/daemon.ts      | 10 +++---
 .../EdgeCommand/FtpCommand/FtpService/PhFs.ts | 10 ++++--
 .../FtpCommand/FtpService/index.ts            | 16 +++++----
 .../FtpCommand/ServeCommand/ftp.ts            |  3 +-
 .../SyslogCommand/ServeCommand/syslog.ts      |  6 ++--
 .../ServeCommand/firewall/server.ts           | 23 +++++++------
 .../cli/commands/HealthCommand/checkHealth.ts | 14 ++++----
 .../src/cli/commands/HealthCommand/index.ts   |  2 +-
 .../ServeCommand/mothership.ts                | 12 +++----
 .../freshenPocketbaseVersions.ts              |  3 +-
 .../SendMailCommand/SqliteService/index.ts    |  4 +--
 .../src/cli/commands/SendMailCommand/index.ts |  2 +-
 .../cli/commands/SendMailCommand/sendmail.ts  | 10 +++---
 .../src/cli/commands/ServeCommand/index.ts    |  2 +-
 packages/pockethost/src/cli/index.ts          | 12 +++++--
 .../{public-api => common}/CleanupManager.ts  |  2 +-
 .../src/{public-api => common}/Logger.ts      |  4 +--
 .../{public-api => common}/TimerManager.ts    |  2 +-
 .../src/{public-api => common}/assert.ts      |  0
 .../src/{public-api => common}/events.ts      |  0
 .../src/{public-api => common}/index.ts       | 12 -------
 .../src/{public-api => common}/ioc.ts         |  0
 .../src/{public-api => common}/mergeConfig.ts |  0
 .../src/{public-api => common}/mkSingleton.ts |  0
 .../src/{public-api => common}/newId.ts       |  0
 .../src/{public-api => common}/now.ts         |  0
 .../src/{public-api => common}/plugin.ts      |  3 +-
 .../pocketbase-client-helpers/RestHelper.ts   | 11 +++---
 .../pocketbase-client-helpers/index.ts        |  0
 .../src/{public-api => common}/pocketbase.ts  |  0
 .../{public-api => common}/schema/Instance.ts |  3 +-
 .../schema/InstanceLog.ts                     |  0
 .../schema/Rest/CreateInstance.ts             |  3 +-
 .../schema/Rest/DeleteInstance.ts             |  2 +-
 .../schema/Rest/GetUserTokenInfo.ts           |  2 +-
 .../schema/Rest/UpdateInstance.ts             |  3 +-
 .../schema/Rest/index.ts                      |  0
 .../src/{public-api => common}/schema/User.ts |  0
 .../{public-api => common}/schema/index.ts    |  0
 .../{public-api => common}/schema/types.ts    |  0
 .../src/{public-api => common}/schema/util.ts |  0
 .../src/{public-api => common}/stringify.ts   |  0
 packages/pockethost/src/constants.ts          | 16 ++++-----
 .../{public-api => core}/PromiseAllocator.ts  |  0
 .../src/{public-api => core}/Settings.ts      |  2 +-
 .../src/{public-api => core}/SyslogLogger.ts  |  4 +--
 .../asyncExecutionGuard.ts                    |  2 +-
 .../src/{public-api => core}/discordAlert.ts  |  4 +--
 .../src/{public-api => core}/env.ts           |  0
 .../src/{public-api => core}/exit.ts          |  0
 packages/pockethost/src/core/index.ts         | 12 +++++++
 .../src/{public-api => core}/internal.ts      |  0
 .../src/{public-api => core}/pexec.ts         |  2 +-
 .../src/{public-api => core}/process.ts       |  2 +-
 .../src/{public-api => core}/smartFetch.ts    |  2 +-
 .../src/{public-api => core}/tryFetch.ts      |  2 +-
 packages/pockethost/src/index.ts              |  2 +-
 .../services/InstanceLoggerService/index.ts   | 10 +++---
 .../src/services/InstanceService/index.ts     | 30 ++++++++--------
 .../InstanceService/mkInstanceCache.ts        |  6 ++--
 .../InstanceMIxin.ts                          |  4 +--
 .../createAdminPbClient.ts                    |  4 +--
 .../MothershipAdminClientService/index.ts     | 10 +++---
 .../src/services/PocketBaseService/index.ts   | 34 +++++++++----------
 .../pockethost/src/services/PortService.ts    |  8 +++--
 .../pockethost/src/services/ProxyService.ts   | 16 ++++-----
 .../pockethost/src/services/RealtimeLog.ts    |  6 ++--
 packages/pockethost/tsconfig.json             |  9 +----
 .../src/components/helpers/theme.ts           |  2 +-
 .../src/pocketbase-client/PocketbaseClient.ts |  2 +-
 packages/superadmin/src/services.ts           |  2 +-
 .../superadmin/src/util/componentCleanup.ts   |  2 +-
 packages/superadmin/src/util/stores.ts        |  6 +++-
 100 files changed, 228 insertions(+), 207 deletions(-)
 create mode 100644 packages/pockethost/common.ts
 create mode 100644 packages/pockethost/core.ts
 rename packages/pockethost/src/{public-api => common}/CleanupManager.ts (97%)
 rename packages/pockethost/src/{public-api => common}/Logger.ts (96%)
 rename packages/pockethost/src/{public-api => common}/TimerManager.ts (97%)
 rename packages/pockethost/src/{public-api => common}/assert.ts (100%)
 rename packages/pockethost/src/{public-api => common}/events.ts (100%)
 rename packages/pockethost/src/{public-api => common}/index.ts (54%)
 rename packages/pockethost/src/{public-api => common}/ioc.ts (100%)
 rename packages/pockethost/src/{public-api => common}/mergeConfig.ts (100%)
 rename packages/pockethost/src/{public-api => common}/mkSingleton.ts (100%)
 rename packages/pockethost/src/{public-api => common}/newId.ts (100%)
 rename packages/pockethost/src/{public-api => common}/now.ts (100%)
 rename packages/pockethost/src/{public-api => common}/plugin.ts (97%)
 rename packages/pockethost/src/{public-api => common}/pocketbase-client-helpers/RestHelper.ts (91%)
 rename packages/pockethost/src/{public-api => common}/pocketbase-client-helpers/index.ts (100%)
 rename packages/pockethost/src/{public-api => common}/pocketbase.ts (100%)
 rename packages/pockethost/src/{public-api => common}/schema/Instance.ts (90%)
 rename packages/pockethost/src/{public-api => common}/schema/InstanceLog.ts (100%)
 rename packages/pockethost/src/{public-api => common}/schema/Rest/CreateInstance.ts (83%)
 rename packages/pockethost/src/{public-api => common}/schema/Rest/DeleteInstance.ts (91%)
 rename packages/pockethost/src/{public-api => common}/schema/Rest/GetUserTokenInfo.ts (92%)
 rename packages/pockethost/src/{public-api => common}/schema/Rest/UpdateInstance.ts (94%)
 rename packages/pockethost/src/{public-api => common}/schema/Rest/index.ts (100%)
 rename packages/pockethost/src/{public-api => common}/schema/User.ts (100%)
 rename packages/pockethost/src/{public-api => common}/schema/index.ts (100%)
 rename packages/pockethost/src/{public-api => common}/schema/types.ts (100%)
 rename packages/pockethost/src/{public-api => common}/schema/util.ts (100%)
 rename packages/pockethost/src/{public-api => common}/stringify.ts (100%)
 rename packages/pockethost/src/{public-api => core}/PromiseAllocator.ts (100%)
 rename packages/pockethost/src/{public-api => core}/Settings.ts (98%)
 rename packages/pockethost/src/{public-api => core}/SyslogLogger.ts (91%)
 rename packages/pockethost/src/{public-api => core}/asyncExecutionGuard.ts (96%)
 rename packages/pockethost/src/{public-api => core}/discordAlert.ts (86%)
 rename packages/pockethost/src/{public-api => core}/env.ts (100%)
 rename packages/pockethost/src/{public-api => core}/exit.ts (100%)
 create mode 100644 packages/pockethost/src/core/index.ts
 rename packages/pockethost/src/{public-api => core}/internal.ts (100%)
 rename packages/pockethost/src/{public-api => core}/pexec.ts (92%)
 rename packages/pockethost/src/{public-api => core}/process.ts (93%)
 rename packages/pockethost/src/{public-api => core}/smartFetch.ts (95%)
 rename packages/pockethost/src/{public-api => core}/tryFetch.ts (97%)

diff --git a/packages/dashboard/src/components/ProvisioningStatus.svelte b/packages/dashboard/src/components/ProvisioningStatus.svelte
index 890855aa..7ff63bcd 100644
--- a/packages/dashboard/src/components/ProvisioningStatus.svelte
+++ b/packages/dashboard/src/components/ProvisioningStatus.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { InstanceStatus } from 'pockethost'
+  import { InstanceStatus } from 'pockethost/common'
   import { onMount } from 'svelte'
 
   export let status: InstanceStatus = InstanceStatus.Idle
diff --git a/packages/dashboard/src/components/SubscriptionStatus.svelte b/packages/dashboard/src/components/SubscriptionStatus.svelte
index 83897671..b00b46fa 100644
--- a/packages/dashboard/src/components/SubscriptionStatus.svelte
+++ b/packages/dashboard/src/components/SubscriptionStatus.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { isUserFounder, userSubscriptionType } from '$util/stores'
-  import { PLAN_NAMES, SubscriptionType } from 'pockethost'
+  import { PLAN_NAMES, SubscriptionType } from 'pockethost/common'
 
   isUserFounder
 
diff --git a/packages/dashboard/src/components/helpers/theme.ts b/packages/dashboard/src/components/helpers/theme.ts
index ff7418d1..613cc4b3 100644
--- a/packages/dashboard/src/components/helpers/theme.ts
+++ b/packages/dashboard/src/components/helpers/theme.ts
@@ -1,4 +1,4 @@
-import { assertTruthy } from 'pockethost'
+import { assertTruthy } from 'pockethost/common'
 
 export const html = () => {
   const htmlElement = document.querySelector('html')
diff --git a/packages/dashboard/src/components/tables/pricing-table/PricingTable.svelte b/packages/dashboard/src/components/tables/pricing-table/PricingTable.svelte
index 4debe182..5b4923f9 100644
--- a/packages/dashboard/src/components/tables/pricing-table/PricingTable.svelte
+++ b/packages/dashboard/src/components/tables/pricing-table/PricingTable.svelte
@@ -5,7 +5,7 @@
   import MobileTable from '$components/tables/pricing-table/MobileTable.svelte'
   import { DISCORD_URL, DOCS_URL } from '$src/env'
   import { isUserFounder, userSubscriptionType } from '$util/stores'
-  import { PLAN_NAMES, SubscriptionType } from 'pockethost'
+  import { PLAN_NAMES, SubscriptionType } from 'pockethost/common'
 
   type ItemValue = '1' | 'Unlimited' | 'YesBlock' | 'NoBlock'
 
diff --git a/packages/dashboard/src/env.ts b/packages/dashboard/src/env.ts
index 3a83c9b3..6aab9e9f 100644
--- a/packages/dashboard/src/env.ts
+++ b/packages/dashboard/src/env.ts
@@ -1,5 +1,5 @@
 import { boolean } from 'boolean'
-import { InstanceFields } from 'pockethost'
+import { InstanceFields } from 'pockethost/common'
 
 /**
  * These environment variables default to pointing to the production build so
diff --git a/packages/dashboard/src/pocketbase-client/PocketbaseClient.ts b/packages/dashboard/src/pocketbase-client/PocketbaseClient.ts
index 47f6b841..81614537 100644
--- a/packages/dashboard/src/pocketbase-client/PocketbaseClient.ts
+++ b/packages/dashboard/src/pocketbase-client/PocketbaseClient.ts
@@ -23,7 +23,7 @@ import {
   type InstanceFields,
   type InstanceId,
   type InstanceLogFields,
-} from 'pockethost'
+} from 'pockethost/common'
 
 export type AuthToken = string
 export type AuthStoreProps = {
diff --git a/packages/dashboard/src/routes/account/+page.svelte b/packages/dashboard/src/routes/account/+page.svelte
index 10f81dff..4df4b090 100644
--- a/packages/dashboard/src/routes/account/+page.svelte
+++ b/packages/dashboard/src/routes/account/+page.svelte
@@ -10,7 +10,7 @@
     userStore,
     userSubscriptionType,
   } from '$util/stores'
-  import { PLAN_NAMES, SubscriptionType } from 'pockethost'
+  import { PLAN_NAMES, SubscriptionType } from 'pockethost/common'
   import { onMount } from 'svelte'
   import { writable } from 'svelte/store'
 
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte
index 62e36695..79813308 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte
@@ -3,7 +3,7 @@
   import AlertBar from '$components/AlertBar.svelte'
   import { INSTANCE_ADMIN_URL } from '$src/env'
   import { globalInstancesStore } from '$util/stores'
-  import { assert } from 'pockethost'
+  import { assert } from 'pockethost/common'
   import { instance } from './store'
 
   let isReady = false
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/+page.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/+page.svelte
index f4146efb..d9711bbe 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/+page.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { assertExists } from 'pockethost'
+  import { assertExists } from 'pockethost/common'
   import Code from './Code.svelte'
   import Ftp from './Ftpx.svelte'
   import { instance } from './store'
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/logs/+page.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/logs/+page.svelte
index 73996a2a..85c36427 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/logs/+page.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/logs/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { assertExists } from 'pockethost'
+  import { assertExists } from 'pockethost/common'
   import { instance } from '../store'
   import LoggingInner from './LoggingInner.svelte'
 
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/logs/LoggingInner.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/logs/LoggingInner.svelte
index dde90c64..9718963d 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/logs/LoggingInner.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/logs/LoggingInner.svelte
@@ -1,7 +1,11 @@
 <script lang="ts">
   import { client } from '$src/pocketbase-client'
   import { mkCleanup } from '$util/componentCleanup'
-  import { StreamNames, Unsubscribe, type InstanceLogFields } from 'pockethost'
+  import {
+    StreamNames,
+    Unsubscribe,
+    type InstanceLogFields,
+  } from 'pockethost/common'
   import { onMount, tick } from 'svelte'
   import { derived, writable } from 'svelte/store'
   import { instance } from '../store'
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/secrets/+page.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/secrets/+page.svelte
index 10efdbe6..a33f3d47 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/secrets/+page.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/secrets/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { assertExists } from 'pockethost'
+  import { assertExists } from 'pockethost/common'
   import { instance } from '../store'
   import SecretsInner from './SecretsInner.svelte'
 
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/secrets/Form.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/secrets/Form.svelte
index 4068f8ba..91adb3b7 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/secrets/Form.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/secrets/Form.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import AlertBar from '$components/AlertBar.svelte'
   import { client } from '$src/pocketbase-client/index.js'
-  import { SECRET_KEY_REGEX, UpdateInstancePayload } from 'pockethost'
   import { reduce } from '@s-libs/micro-dash'
+  import { SECRET_KEY_REGEX, UpdateInstancePayload } from 'pockethost/common'
   import { instance } from '../store.js'
   import { items } from './stores.js'
 
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/settings/+page.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/settings/+page.svelte
index dc97cc30..9068c606 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/settings/+page.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/settings/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { assertExists } from 'pockethost'
+  import { assertExists } from 'pockethost/common'
   import { instance } from '../store'
   import AdminSync from './AdminSync.svelte'
   import CustomDomain from './CustomDomain.svelte'
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/settings/CustomDomain.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/settings/CustomDomain.svelte
index 670e9d16..cb94d531 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/settings/CustomDomain.svelte
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/settings/CustomDomain.svelte
@@ -6,7 +6,7 @@
   import { DOCS_URL, INSTANCE_BARE_HOST } from '$src/env'
   import { client } from '$src/pocketbase-client'
   import { userSubscriptionType } from '$util/stores'
-  import { SubscriptionType } from 'pockethost'
+  import { SubscriptionType } from 'pockethost/common'
   import { dns } from 'svelte-highlight/languages'
   import { instance } from '../store'
 
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/store.ts b/packages/dashboard/src/routes/app/instances/[instanceId]/store.ts
index 75a158a0..77574e86 100644
--- a/packages/dashboard/src/routes/app/instances/[instanceId]/store.ts
+++ b/packages/dashboard/src/routes/app/instances/[instanceId]/store.ts
@@ -1,4 +1,4 @@
-import type { InstanceFields } from 'pockethost'
+import type { InstanceFields } from 'pockethost/common'
 import { writable } from 'svelte/store'
 
 export const instance = writable<InstanceFields>()
diff --git a/packages/dashboard/src/routes/app/new/+page.svelte b/packages/dashboard/src/routes/app/new/+page.svelte
index e33e9e4c..579c1e16 100644
--- a/packages/dashboard/src/routes/app/new/+page.svelte
+++ b/packages/dashboard/src/routes/app/new/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { globalInstancesStore, userSubscriptionType } from '$util/stores'
-  import { SubscriptionType } from 'pockethost'
   import { values } from '@s-libs/micro-dash'
+  import { SubscriptionType } from 'pockethost/common'
   import Creator from './Creator.svelte'
   import Paywall from './Paywall.svelte'
 
diff --git a/packages/dashboard/src/routes/app/new/Paywall.svelte b/packages/dashboard/src/routes/app/new/Paywall.svelte
index 3747282d..7f48f24a 100644
--- a/packages/dashboard/src/routes/app/new/Paywall.svelte
+++ b/packages/dashboard/src/routes/app/new/Paywall.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { userSubscriptionType } from '$util/stores'
-  import { SubscriptionType } from 'pockethost'
+  import { SubscriptionType } from 'pockethost/common'
 </script>
 
 <div class="card max-w-sm bg-base-100 shadow-xl">
diff --git a/packages/dashboard/src/routes/dashboard/InstanceList.svelte b/packages/dashboard/src/routes/dashboard/InstanceList.svelte
index 3226238c..d78cb10a 100644
--- a/packages/dashboard/src/routes/dashboard/InstanceList.svelte
+++ b/packages/dashboard/src/routes/dashboard/InstanceList.svelte
@@ -3,8 +3,8 @@
   import CardHeader from '$components/cards/CardHeader.svelte'
   import InstanceRow from '$src/routes/dashboard/InstanceRow.svelte'
   import { globalInstancesStore } from '$util/stores'
-  import { InstanceFields } from 'pockethost'
   import { values } from '@s-libs/micro-dash'
+  import { InstanceFields } from 'pockethost/common'
 
   let arrayOfActiveInstances: InstanceFields[] = []
   let arrayOfMaintenanceInstances: InstanceFields[] = []
diff --git a/packages/dashboard/src/routes/dashboard/InstanceRow.svelte b/packages/dashboard/src/routes/dashboard/InstanceRow.svelte
index f454036a..fdcc9af1 100644
--- a/packages/dashboard/src/routes/dashboard/InstanceRow.svelte
+++ b/packages/dashboard/src/routes/dashboard/InstanceRow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { INSTANCE_ADMIN_URL } from '$src/env.js'
-  import { InstanceFields } from 'pockethost'
+  import { InstanceFields } from 'pockethost/common'
 
   export let instance: InstanceFields
   export let index: number
diff --git a/packages/dashboard/src/services.ts b/packages/dashboard/src/services.ts
index 4b6ee048..7c60bd4b 100644
--- a/packages/dashboard/src/services.ts
+++ b/packages/dashboard/src/services.ts
@@ -1,4 +1,4 @@
-import { LoggerService, LogLevelName } from 'pockethost'
+import { LoggerService, LogLevelName } from 'pockethost/common'
 import { PUBLIC_DEBUG } from './env'
 
 // Initiate the logging service
diff --git a/packages/dashboard/src/util/componentCleanup.ts b/packages/dashboard/src/util/componentCleanup.ts
index 21ae93ae..ae572cc6 100644
--- a/packages/dashboard/src/util/componentCleanup.ts
+++ b/packages/dashboard/src/util/componentCleanup.ts
@@ -1,4 +1,4 @@
-import { createCleanupManager } from 'pockethost'
+import { createCleanupManager } from 'pockethost/common'
 import { onDestroy } from 'svelte'
 
 // TODO: Document this more
diff --git a/packages/dashboard/src/util/stores.ts b/packages/dashboard/src/util/stores.ts
index e412f60f..50585daa 100644
--- a/packages/dashboard/src/util/stores.ts
+++ b/packages/dashboard/src/util/stores.ts
@@ -7,7 +7,7 @@ import {
   type InstanceFields,
   type InstanceId,
   type UnsubscribeFunc,
-} from 'pockethost'
+} from 'pockethost/common'
 import { writable } from 'svelte/store'
 // TODO: Removing this will cause the app to crash
 // Theres a reference inside of `createPocketbaseClient.ts` that needs the information that comes from this file
diff --git a/packages/dashboard/tsconfig.json b/packages/dashboard/tsconfig.json
index 5b820070..ad69c012 100644
--- a/packages/dashboard/tsconfig.json
+++ b/packages/dashboard/tsconfig.json
@@ -12,6 +12,7 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
+    "baseUrl": ".",
     "paths": {
       "$util/*": ["./src/util/*"],
       "$src/*": ["./src/*"],
diff --git a/packages/pockethost/common.ts b/packages/pockethost/common.ts
new file mode 100644
index 00000000..12ca7d42
--- /dev/null
+++ b/packages/pockethost/common.ts
@@ -0,0 +1 @@
+export * from './src/common'
diff --git a/packages/pockethost/core.ts b/packages/pockethost/core.ts
new file mode 100644
index 00000000..95d6da4b
--- /dev/null
+++ b/packages/pockethost/core.ts
@@ -0,0 +1,2 @@
+export * from './src/common'
+export * from './src/core'
diff --git a/packages/pockethost/package.json b/packages/pockethost/package.json
index 55af276d..e22d3a22 100644
--- a/packages/pockethost/package.json
+++ b/packages/pockethost/package.json
@@ -6,8 +6,8 @@
     "url": "https://github.com/benallfree"
   },
   "license": "MIT",
-  "main": "src/index.ts",
-  "module": "src/index.ts",
+  "main": "./common.ts",
+  "module": "./common.ts",
   "type": "module",
   "bin": {
     "pockethost": "src/cli/index.ts"
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/daemon.ts b/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/daemon.ts
index 0933b801..7ebe8b3c 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/daemon.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/DaemonCommand/ServeCommand/daemon.ts
@@ -1,9 +1,12 @@
+import { ErrorRequestHandler } from 'express'
+import { LoggerService } from '../../../../../common'
 import {
   MOTHERSHIP_ADMIN_PASSWORD,
   MOTHERSHIP_ADMIN_USERNAME,
   MOTHERSHIP_INTERNAL_URL,
-} from '$constants'
-import { LoggerService, discordAlert, tryFetch } from '$public'
+  discordAlert,
+  tryFetch,
+} from '../../../../../core'
 import {
   MothershipAdminClientService,
   PocketbaseService,
@@ -11,8 +14,7 @@ import {
   instanceService,
   proxyService,
   realtimeLog,
-} from '$services'
-import { ErrorRequestHandler } from 'express'
+} from '../../../../../services'
 
 export async function daemon() {
   const logger = LoggerService().create(`EdgeDaemonCommand`)
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/PhFs.ts b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/PhFs.ts
index b1eb9b12..40cd34ef 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/PhFs.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/PhFs.ts
@@ -1,5 +1,3 @@
-import { DATA_ROOT } from '$constants'
-import { InstanceFields, Logger, PocketBase, assert, newId } from '$public'
 import { compact, map } from '@s-libs/micro-dash'
 import {
   Mode,
@@ -18,6 +16,14 @@ import {
   VirtualFolderNames,
   virtualFolderGuard,
 } from '.'
+import {
+  InstanceFields,
+  Logger,
+  PocketBase,
+  assert,
+  newId,
+} from '../../../../../common'
+import { DATA_ROOT } from '../../../../../core'
 import * as fsAsync from './fs-async'
 
 export type PathError = {
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/index.ts b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/index.ts
index b2ea7593..4dfca964 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/index.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/FtpService/index.ts
@@ -1,20 +1,22 @@
+import { keys, values } from '@s-libs/micro-dash'
+import { readFileSync } from 'fs'
+import { FtpSrv } from 'ftp-srv'
 import {
   LoggerService,
+  PocketBase,
+  mergeConfig,
+  mkSingleton,
+} from '../../../../../common'
+import {
   MOTHERSHIP_INTERNAL_URL,
   PH_FTP_PASV_IP,
   PH_FTP_PASV_PORT_MAX,
   PH_FTP_PASV_PORT_MIN,
   PH_FTP_PORT,
-  PocketBase,
   SSL_CERT,
   SSL_KEY,
   asyncExitHook,
-  mergeConfig,
-  mkSingleton,
-} from '$public'
-import { keys, values } from '@s-libs/micro-dash'
-import { readFileSync } from 'fs'
-import { FtpSrv } from 'ftp-srv'
+} from '../../../../../core'
 import { PhFs } from './PhFs'
 
 export type FtpConfig = { mothershipUrl: string }
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/ftp.ts b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/ftp.ts
index 1c3c6ece..9bc1720a 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/ftp.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/FtpCommand/ServeCommand/ftp.ts
@@ -1,4 +1,5 @@
-import { LoggerService, MOTHERSHIP_INTERNAL_URL, tryFetch } from '$public'
+import { LoggerService } from '../../../../../common'
+import { MOTHERSHIP_INTERNAL_URL, tryFetch } from '../../../../../core'
 import { ftpService } from '../FtpService'
 
 export async function ftp() {
diff --git a/packages/pockethost/src/cli/commands/EdgeCommand/SyslogCommand/ServeCommand/syslog.ts b/packages/pockethost/src/cli/commands/EdgeCommand/SyslogCommand/ServeCommand/syslog.ts
index 38d69d71..2935028b 100644
--- a/packages/pockethost/src/cli/commands/EdgeCommand/SyslogCommand/ServeCommand/syslog.ts
+++ b/packages/pockethost/src/cli/commands/EdgeCommand/SyslogCommand/ServeCommand/syslog.ts
@@ -1,8 +1,8 @@
-import { SYSLOGD_PORT } from '$constants'
-import { LoggerService } from '$public'
-import { InstanceLogger } from '$services'
 import * as dgram from 'dgram'
 import parse from 'syslog-parse'
+import { LoggerService } from '../../../../../common'
+import { SYSLOGD_PORT } from '../../../../../core'
+import { InstanceLogger } from '../../../../../services'
 
 export function syslog() {
   return new Promise<void>((resolve) => {
diff --git a/packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts b/packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts
index 77c28dd9..d04525f0 100644
--- a/packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts
+++ b/packages/pockethost/src/cli/commands/FirewallCommand/ServeCommand/firewall/server.ts
@@ -1,3 +1,13 @@
+import { forEach } from '@s-libs/micro-dash'
+import cors from 'cors'
+import express, { ErrorRequestHandler } from 'express'
+import 'express-async-errors'
+import enforce from 'express-sslify'
+import fs from 'fs'
+import http from 'http'
+import { createProxyMiddleware } from 'http-proxy-middleware'
+import https from 'https'
+import { LoggerService } from '../../../../../common'
 import {
   APEX_DOMAIN,
   APP_NAME,
@@ -8,17 +18,8 @@ import {
   MOTHERSHIP_PORT,
   SSL_CERT,
   SSL_KEY,
-} from '$constants'
-import { LoggerService, discordAlert } from '$public'
-import { forEach } from '@s-libs/micro-dash'
-import cors from 'cors'
-import express, { ErrorRequestHandler } from 'express'
-import 'express-async-errors'
-import enforce from 'express-sslify'
-import fs from 'fs'
-import http from 'http'
-import { createProxyMiddleware } from 'http-proxy-middleware'
-import https from 'https'
+  discordAlert,
+} from '../../../../../core'
 import { createIpWhitelistMiddleware } from './cidr'
 import { createVhostProxyMiddleware } from './createVhostProxyMiddleware'
 
diff --git a/packages/pockethost/src/cli/commands/HealthCommand/checkHealth.ts b/packages/pockethost/src/cli/commands/HealthCommand/checkHealth.ts
index 4bff353c..c5d0a732 100644
--- a/packages/pockethost/src/cli/commands/HealthCommand/checkHealth.ts
+++ b/packages/pockethost/src/cli/commands/HealthCommand/checkHealth.ts
@@ -1,14 +1,16 @@
-import {
-  DAEMON_PORT,
-  DISCORD_HEALTH_CHANNEL_URL,
-  MOTHERSHIP_PORT,
-} from '$constants'
-import { LoggerService, discordAlert, stringify } from '$public'
 import Bottleneck from 'bottleneck'
 import { execSync } from 'child_process'
 import fetch from 'node-fetch'
 import { default as osu } from 'node-os-utils'
 import { freemem } from 'os'
+import {
+  DAEMON_PORT,
+  DISCORD_HEALTH_CHANNEL_URL,
+  LoggerService,
+  MOTHERSHIP_PORT,
+  discordAlert,
+  stringify,
+} from '../../../../core'
 
 export const checkHealth = async () => {
   const { cpu, drive } = osu
diff --git a/packages/pockethost/src/cli/commands/HealthCommand/index.ts b/packages/pockethost/src/cli/commands/HealthCommand/index.ts
index 7c950554..3a8b3221 100644
--- a/packages/pockethost/src/cli/commands/HealthCommand/index.ts
+++ b/packages/pockethost/src/cli/commands/HealthCommand/index.ts
@@ -1,5 +1,5 @@
-import { LoggerService } from '$public'
 import { Command } from 'commander'
+import { LoggerService } from '../../../../core'
 import { checkHealth } from './checkHealth'
 
 type Options = {
diff --git a/packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts b/packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts
index ed5c16b7..4647630a 100644
--- a/packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts
+++ b/packages/pockethost/src/cli/commands/MothershipCommand/ServeCommand/mothership.ts
@@ -1,19 +1,19 @@
+import copyfiles from 'copyfiles'
+import { GobotOptions, gobot } from 'gobot'
+import { rimraf } from 'rimraf'
 import {
   DEBUG,
   IS_DEV,
   LS_WEBHOOK_SECRET,
+  LoggerService,
   MOTHERSHIP_DATA_ROOT,
   MOTHERSHIP_HOOKS_DIR,
   MOTHERSHIP_MIGRATIONS_DIR,
   MOTHERSHIP_PORT,
   MOTHERSHIP_SEMVER,
   mkContainerHomePath,
-} from '$constants'
-import { LoggerService } from '$public'
-import { PortService } from '$services'
-import copyfiles from 'copyfiles'
-import { GobotOptions, gobot } from 'gobot'
-import { rimraf } from 'rimraf'
+} from '../../../../../core'
+import { PortService } from '../../../../services'
 import { freshenPocketbaseVersions } from '../freshenPocketbaseVersions'
 
 export type MothershipConfig = { isolate: boolean }
diff --git a/packages/pockethost/src/cli/commands/MothershipCommand/freshenPocketbaseVersions.ts b/packages/pockethost/src/cli/commands/MothershipCommand/freshenPocketbaseVersions.ts
index 7635b37c..2ef64524 100644
--- a/packages/pockethost/src/cli/commands/MothershipCommand/freshenPocketbaseVersions.ts
+++ b/packages/pockethost/src/cli/commands/MothershipCommand/freshenPocketbaseVersions.ts
@@ -1,7 +1,6 @@
-import { MOTHERSHIP_DATA_ROOT } from '$constants'
-import { stringify } from '$public'
 import { writeFileSync } from 'fs'
 import { gobot } from 'gobot'
+import { MOTHERSHIP_DATA_ROOT, stringify } from '../../../../core'
 
 function compareSemVer(a: string, b: string): number {
   // Consider wildcards as higher than any version number, hence represented by a large number for comparison
diff --git a/packages/pockethost/src/cli/commands/SendMailCommand/SqliteService/index.ts b/packages/pockethost/src/cli/commands/SendMailCommand/SqliteService/index.ts
index 6a71bbc4..46e0a79c 100644
--- a/packages/pockethost/src/cli/commands/SendMailCommand/SqliteService/index.ts
+++ b/packages/pockethost/src/cli/commands/SendMailCommand/SqliteService/index.ts
@@ -1,11 +1,11 @@
+import knex from 'knex'
 import {
   createCleanupManager,
   LoggerService,
   mkSingleton,
   serialAsyncExecutionGuard,
   SingletonBaseConfig,
-} from '$public'
-import knex from 'knex'
+} from '../../../../../core'
 
 export type SqliteServiceApi = ReturnType<typeof knex>
 export type SqliteServiceConfig = SingletonBaseConfig & {}
diff --git a/packages/pockethost/src/cli/commands/SendMailCommand/index.ts b/packages/pockethost/src/cli/commands/SendMailCommand/index.ts
index 39215080..132fecea 100644
--- a/packages/pockethost/src/cli/commands/SendMailCommand/index.ts
+++ b/packages/pockethost/src/cli/commands/SendMailCommand/index.ts
@@ -1,5 +1,5 @@
-import { LoggerService } from '$public'
 import { Command } from 'commander'
+import { LoggerService } from '../../../../core'
 import { sendMail } from './sendmail'
 
 type Options = {
diff --git a/packages/pockethost/src/cli/commands/SendMailCommand/sendmail.ts b/packages/pockethost/src/cli/commands/SendMailCommand/sendmail.ts
index 551475cb..5914f5b1 100644
--- a/packages/pockethost/src/cli/commands/SendMailCommand/sendmail.ts
+++ b/packages/pockethost/src/cli/commands/SendMailCommand/sendmail.ts
@@ -1,3 +1,7 @@
+import { map } from '@s-libs/micro-dash'
+import Bottleneck from 'bottleneck'
+import { InvalidArgumentError, program } from 'commander'
+import { LoggerService, PocketBase, UserFields } from '../../../common'
 import {
   MOTHERSHIP_ADMIN_PASSWORD,
   MOTHERSHIP_ADMIN_USERNAME,
@@ -5,11 +9,7 @@ import {
   MOTHERSHIP_INTERNAL_URL,
   MOTHERSHIP_URL,
   TEST_EMAIL,
-} from '$constants'
-import { LoggerService, PocketBase, UserFields } from '$public'
-import { map } from '@s-libs/micro-dash'
-import Bottleneck from 'bottleneck'
-import { InvalidArgumentError, program } from 'commander'
+} from '../../../core'
 import { SqliteService } from './SqliteService'
 
 const TBL_SENT_MESSAGES = `sent_messages`
diff --git a/packages/pockethost/src/cli/commands/ServeCommand/index.ts b/packages/pockethost/src/cli/commands/ServeCommand/index.ts
index ae747489..1c904276 100644
--- a/packages/pockethost/src/cli/commands/ServeCommand/index.ts
+++ b/packages/pockethost/src/cli/commands/ServeCommand/index.ts
@@ -1,5 +1,5 @@
-import { LoggerService } from '$public'
 import { Command } from 'commander'
+import { LoggerService } from '../../../common'
 import { daemon } from '../EdgeCommand/DaemonCommand/ServeCommand/daemon'
 import { syslog } from '../EdgeCommand/SyslogCommand/ServeCommand/syslog'
 import { firewall } from '../FirewallCommand/ServeCommand/firewall/server'
diff --git a/packages/pockethost/src/cli/index.ts b/packages/pockethost/src/cli/index.ts
index 651abdad..221b733a 100755
--- a/packages/pockethost/src/cli/index.ts
+++ b/packages/pockethost/src/cli/index.ts
@@ -1,15 +1,23 @@
 #!/usr/bin/env node
 
-import { DEBUG, DefaultSettingsService, PH_PLUGINS, SETTINGS } from '$constants'
-import { LogLevelName, LoggerService, loadPlugins } from '$public'
 import { program } from 'commander'
 import EventSource from 'eventsource'
+import {
+  DEBUG,
+  DefaultSettingsService,
+  LogLevelName,
+  LoggerService,
+  PH_PLUGINS,
+  SETTINGS,
+  loadPlugins,
+} from '../../core'
 import { EdgeCommand } from './commands/EdgeCommand'
 import { FirewallCommand } from './commands/FirewallCommand'
 import { HealthCommand } from './commands/HealthCommand'
 import { MothershipCommand } from './commands/MothershipCommand'
 import { SendMailCommand } from './commands/SendMailCommand'
 import { ServeCommand } from './commands/ServeCommand'
+
 export type GlobalOptions = {
   logLevel?: LogLevelName
   debug: boolean
diff --git a/packages/pockethost/src/public-api/CleanupManager.ts b/packages/pockethost/src/common/CleanupManager.ts
similarity index 97%
rename from packages/pockethost/src/public-api/CleanupManager.ts
rename to packages/pockethost/src/common/CleanupManager.ts
index 33104904..e7b3a5f7 100644
--- a/packages/pockethost/src/public-api/CleanupManager.ts
+++ b/packages/pockethost/src/common/CleanupManager.ts
@@ -1,6 +1,6 @@
 import { reduce, values } from '@s-libs/micro-dash'
 import { nanoid } from 'nanoid'
-import { LoggerService } from './Logger'
+import { LoggerService } from '.'
 
 export type CleanupFunc = () => Promise<void> | void
 
diff --git a/packages/pockethost/src/public-api/Logger.ts b/packages/pockethost/src/common/Logger.ts
similarity index 96%
rename from packages/pockethost/src/public-api/Logger.ts
rename to packages/pockethost/src/common/Logger.ts
index e692eb3e..5df76376 100644
--- a/packages/pockethost/src/public-api/Logger.ts
+++ b/packages/pockethost/src/common/Logger.ts
@@ -2,9 +2,7 @@
 
 import chalk from 'chalk'
 import stringify from 'json-stringify-safe'
-import { mergeConfig } from './mergeConfig'
-import { mkSingleton } from './mkSingleton'
-import { PocketHostAction, action } from './plugin'
+import { PocketHostAction, action, mergeConfig, mkSingleton } from '.'
 
 export type LoggerConfig = {
   level: LogLevelName
diff --git a/packages/pockethost/src/public-api/TimerManager.ts b/packages/pockethost/src/common/TimerManager.ts
similarity index 97%
rename from packages/pockethost/src/public-api/TimerManager.ts
rename to packages/pockethost/src/common/TimerManager.ts
index 785a35ea..6b97e266 100644
--- a/packages/pockethost/src/public-api/TimerManager.ts
+++ b/packages/pockethost/src/common/TimerManager.ts
@@ -1,5 +1,5 @@
 import { forEach, values } from '@s-libs/micro-dash'
-import { LoggerService } from './Logger'
+import { LoggerService } from '.'
 
 export type UnixTimestampMs = number
 export type TimerCanceler = () => void
diff --git a/packages/pockethost/src/public-api/assert.ts b/packages/pockethost/src/common/assert.ts
similarity index 100%
rename from packages/pockethost/src/public-api/assert.ts
rename to packages/pockethost/src/common/assert.ts
diff --git a/packages/pockethost/src/public-api/events.ts b/packages/pockethost/src/common/events.ts
similarity index 100%
rename from packages/pockethost/src/public-api/events.ts
rename to packages/pockethost/src/common/events.ts
diff --git a/packages/pockethost/src/public-api/index.ts b/packages/pockethost/src/common/index.ts
similarity index 54%
rename from packages/pockethost/src/public-api/index.ts
rename to packages/pockethost/src/common/index.ts
index cebedbe0..7c1ec79b 100644
--- a/packages/pockethost/src/public-api/index.ts
+++ b/packages/pockethost/src/common/index.ts
@@ -1,17 +1,8 @@
-export * from '$constants'
 export * from './CleanupManager'
 export * from './Logger'
-export * from './PromiseAllocator'
-export * from './Settings'
-export * from './SyslogLogger'
 export * from './TimerManager'
 export * from './assert'
-export * from './asyncExecutionGuard'
-export * from './discordAlert'
-export * from './env'
 export * from './events'
-export * from './exit'
-export * from './internal'
 export * from './ioc'
 export * from './mergeConfig'
 export * from './mkSingleton'
@@ -20,8 +11,5 @@ export * from './now'
 export * from './plugin'
 export * from './pocketbase'
 export * from './pocketbase-client-helpers'
-export * from './process'
 export * from './schema'
-export * from './smartFetch'
 export * from './stringify'
-export * from './tryFetch'
diff --git a/packages/pockethost/src/public-api/ioc.ts b/packages/pockethost/src/common/ioc.ts
similarity index 100%
rename from packages/pockethost/src/public-api/ioc.ts
rename to packages/pockethost/src/common/ioc.ts
diff --git a/packages/pockethost/src/public-api/mergeConfig.ts b/packages/pockethost/src/common/mergeConfig.ts
similarity index 100%
rename from packages/pockethost/src/public-api/mergeConfig.ts
rename to packages/pockethost/src/common/mergeConfig.ts
diff --git a/packages/pockethost/src/public-api/mkSingleton.ts b/packages/pockethost/src/common/mkSingleton.ts
similarity index 100%
rename from packages/pockethost/src/public-api/mkSingleton.ts
rename to packages/pockethost/src/common/mkSingleton.ts
diff --git a/packages/pockethost/src/public-api/newId.ts b/packages/pockethost/src/common/newId.ts
similarity index 100%
rename from packages/pockethost/src/public-api/newId.ts
rename to packages/pockethost/src/common/newId.ts
diff --git a/packages/pockethost/src/public-api/now.ts b/packages/pockethost/src/common/now.ts
similarity index 100%
rename from packages/pockethost/src/public-api/now.ts
rename to packages/pockethost/src/common/now.ts
diff --git a/packages/pockethost/src/public-api/plugin.ts b/packages/pockethost/src/common/plugin.ts
similarity index 97%
rename from packages/pockethost/src/public-api/plugin.ts
rename to packages/pockethost/src/common/plugin.ts
index 7d7bfa24..e9d97a9a 100644
--- a/packages/pockethost/src/public-api/plugin.ts
+++ b/packages/pockethost/src/common/plugin.ts
@@ -1,7 +1,6 @@
 import { isString } from '@s-libs/micro-dash'
 import { Request } from 'express'
-import { LogLevelName } from './Logger'
-import { InstanceFields } from './schema'
+import { InstanceFields, LogLevelName } from '.'
 
 export enum PocketHostAction {
   Request = 'request',
diff --git a/packages/pockethost/src/public-api/pocketbase-client-helpers/RestHelper.ts b/packages/pockethost/src/common/pocketbase-client-helpers/RestHelper.ts
similarity index 91%
rename from packages/pockethost/src/public-api/pocketbase-client-helpers/RestHelper.ts
rename to packages/pockethost/src/common/pocketbase-client-helpers/RestHelper.ts
index 6e6bb170..731f4388 100644
--- a/packages/pockethost/src/public-api/pocketbase-client-helpers/RestHelper.ts
+++ b/packages/pockethost/src/common/pocketbase-client-helpers/RestHelper.ts
@@ -1,9 +1,12 @@
 import Ajv, { JSONSchemaType } from 'ajv'
-import { ClientResponseError } from 'pocketbase'
 import type { JsonObject } from 'type-fest'
-import { PocketBase } from '..'
-import { LoggerService } from '../Logger'
-import { RestCommands, RestMethods } from '../schema'
+import {
+  ClientResponseError,
+  LoggerService,
+  PocketBase,
+  RestCommands,
+  RestMethods,
+} from '..'
 
 export type RestHelperConfig = {
   client: PocketBase
diff --git a/packages/pockethost/src/public-api/pocketbase-client-helpers/index.ts b/packages/pockethost/src/common/pocketbase-client-helpers/index.ts
similarity index 100%
rename from packages/pockethost/src/public-api/pocketbase-client-helpers/index.ts
rename to packages/pockethost/src/common/pocketbase-client-helpers/index.ts
diff --git a/packages/pockethost/src/public-api/pocketbase.ts b/packages/pockethost/src/common/pocketbase.ts
similarity index 100%
rename from packages/pockethost/src/public-api/pocketbase.ts
rename to packages/pockethost/src/common/pocketbase.ts
diff --git a/packages/pockethost/src/public-api/schema/Instance.ts b/packages/pockethost/src/common/schema/Instance.ts
similarity index 90%
rename from packages/pockethost/src/public-api/schema/Instance.ts
rename to packages/pockethost/src/common/schema/Instance.ts
index 4063f3dd..9f062874 100644
--- a/packages/pockethost/src/public-api/schema/Instance.ts
+++ b/packages/pockethost/src/common/schema/Instance.ts
@@ -1,5 +1,4 @@
-import { BaseFields, RecordId, Subdomain, UserId } from './types'
-import { UserFields } from './User'
+import { BaseFields, RecordId, Subdomain, UserFields, UserId } from '.'
 
 export type VersionId = string
 
diff --git a/packages/pockethost/src/public-api/schema/InstanceLog.ts b/packages/pockethost/src/common/schema/InstanceLog.ts
similarity index 100%
rename from packages/pockethost/src/public-api/schema/InstanceLog.ts
rename to packages/pockethost/src/common/schema/InstanceLog.ts
diff --git a/packages/pockethost/src/public-api/schema/Rest/CreateInstance.ts b/packages/pockethost/src/common/schema/Rest/CreateInstance.ts
similarity index 83%
rename from packages/pockethost/src/public-api/schema/Rest/CreateInstance.ts
rename to packages/pockethost/src/common/schema/Rest/CreateInstance.ts
index 0c2d920b..bee10ab2 100644
--- a/packages/pockethost/src/public-api/schema/Rest/CreateInstance.ts
+++ b/packages/pockethost/src/common/schema/Rest/CreateInstance.ts
@@ -1,6 +1,5 @@
 import { JSONSchemaType } from 'ajv'
-import { InstanceFields } from '../Instance'
-import { Subdomain } from '../types'
+import { InstanceFields, Subdomain } from '..'
 
 export type CreateInstancePayload = {
   subdomain: Subdomain
diff --git a/packages/pockethost/src/public-api/schema/Rest/DeleteInstance.ts b/packages/pockethost/src/common/schema/Rest/DeleteInstance.ts
similarity index 91%
rename from packages/pockethost/src/public-api/schema/Rest/DeleteInstance.ts
rename to packages/pockethost/src/common/schema/Rest/DeleteInstance.ts
index 18c743bd..991c34fc 100644
--- a/packages/pockethost/src/public-api/schema/Rest/DeleteInstance.ts
+++ b/packages/pockethost/src/common/schema/Rest/DeleteInstance.ts
@@ -1,5 +1,5 @@
 import { JSONSchemaType } from 'ajv'
-import { InstanceId } from '../types'
+import { InstanceId } from '..'
 
 export type DeleteInstancePayload = {
   id: InstanceId
diff --git a/packages/pockethost/src/public-api/schema/Rest/GetUserTokenInfo.ts b/packages/pockethost/src/common/schema/Rest/GetUserTokenInfo.ts
similarity index 92%
rename from packages/pockethost/src/public-api/schema/Rest/GetUserTokenInfo.ts
rename to packages/pockethost/src/common/schema/Rest/GetUserTokenInfo.ts
index 44101173..a393377b 100644
--- a/packages/pockethost/src/public-api/schema/Rest/GetUserTokenInfo.ts
+++ b/packages/pockethost/src/common/schema/Rest/GetUserTokenInfo.ts
@@ -1,5 +1,5 @@
 import { JSONSchemaType } from 'ajv'
-import { UserId } from '../types'
+import { UserId } from '..'
 
 export type GetUserTokenPayload = {
   id: UserId
diff --git a/packages/pockethost/src/public-api/schema/Rest/UpdateInstance.ts b/packages/pockethost/src/common/schema/Rest/UpdateInstance.ts
similarity index 94%
rename from packages/pockethost/src/public-api/schema/Rest/UpdateInstance.ts
rename to packages/pockethost/src/common/schema/Rest/UpdateInstance.ts
index be90f281..8f5af998 100644
--- a/packages/pockethost/src/public-api/schema/Rest/UpdateInstance.ts
+++ b/packages/pockethost/src/common/schema/Rest/UpdateInstance.ts
@@ -1,6 +1,5 @@
 import { JSONSchemaType } from 'ajv'
-import { InstanceFields } from '../Instance'
-import { InstanceId } from '../types'
+import { InstanceFields, InstanceId } from '..'
 
 export type UpdateInstancePayload = {
   id: InstanceId
diff --git a/packages/pockethost/src/public-api/schema/Rest/index.ts b/packages/pockethost/src/common/schema/Rest/index.ts
similarity index 100%
rename from packages/pockethost/src/public-api/schema/Rest/index.ts
rename to packages/pockethost/src/common/schema/Rest/index.ts
diff --git a/packages/pockethost/src/public-api/schema/User.ts b/packages/pockethost/src/common/schema/User.ts
similarity index 100%
rename from packages/pockethost/src/public-api/schema/User.ts
rename to packages/pockethost/src/common/schema/User.ts
diff --git a/packages/pockethost/src/public-api/schema/index.ts b/packages/pockethost/src/common/schema/index.ts
similarity index 100%
rename from packages/pockethost/src/public-api/schema/index.ts
rename to packages/pockethost/src/common/schema/index.ts
diff --git a/packages/pockethost/src/public-api/schema/types.ts b/packages/pockethost/src/common/schema/types.ts
similarity index 100%
rename from packages/pockethost/src/public-api/schema/types.ts
rename to packages/pockethost/src/common/schema/types.ts
diff --git a/packages/pockethost/src/public-api/schema/util.ts b/packages/pockethost/src/common/schema/util.ts
similarity index 100%
rename from packages/pockethost/src/public-api/schema/util.ts
rename to packages/pockethost/src/common/schema/util.ts
diff --git a/packages/pockethost/src/public-api/stringify.ts b/packages/pockethost/src/common/stringify.ts
similarity index 100%
rename from packages/pockethost/src/public-api/stringify.ts
rename to packages/pockethost/src/common/stringify.ts
diff --git a/packages/pockethost/src/constants.ts b/packages/pockethost/src/constants.ts
index 9f45b0e4..fbfcda12 100644
--- a/packages/pockethost/src/constants.ts
+++ b/packages/pockethost/src/constants.ts
@@ -1,3 +1,10 @@
+import { forEach } from '@s-libs/micro-dash'
+import devcert from 'devcert'
+import envPaths from 'env-paths'
+import { mkdirSync, realpathSync, writeFileSync } from 'fs'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
+import { LogEntry } from 'winston'
 import {
   InstanceFields,
   InstanceId,
@@ -11,14 +18,7 @@ import {
   mkPath,
   mkSingleton,
   mkString,
-} from '$public'
-import { forEach } from '@s-libs/micro-dash'
-import devcert from 'devcert'
-import envPaths from 'env-paths'
-import { mkdirSync, realpathSync, writeFileSync } from 'fs'
-import { dirname, join } from 'path'
-import { fileURLToPath } from 'url'
-import { LogEntry } from 'winston'
+} from '../core'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
diff --git a/packages/pockethost/src/public-api/PromiseAllocator.ts b/packages/pockethost/src/core/PromiseAllocator.ts
similarity index 100%
rename from packages/pockethost/src/public-api/PromiseAllocator.ts
rename to packages/pockethost/src/core/PromiseAllocator.ts
diff --git a/packages/pockethost/src/public-api/Settings.ts b/packages/pockethost/src/core/Settings.ts
similarity index 98%
rename from packages/pockethost/src/public-api/Settings.ts
rename to packages/pockethost/src/core/Settings.ts
index c5323fe1..f5fd4346 100644
--- a/packages/pockethost/src/public-api/Settings.ts
+++ b/packages/pockethost/src/core/Settings.ts
@@ -1,6 +1,6 @@
-import { mkSingleton } from '$public'
 import { boolean as castToBoolean } from 'boolean'
 import { existsSync, mkdirSync } from 'fs'
+import { mkSingleton } from '../common'
 
 export type SettingsCaster<TValue, TConfig = {}> = {
   stringToType: (value: string, config?: Partial<TConfig>) => TValue
diff --git a/packages/pockethost/src/public-api/SyslogLogger.ts b/packages/pockethost/src/core/SyslogLogger.ts
similarity index 91%
rename from packages/pockethost/src/public-api/SyslogLogger.ts
rename to packages/pockethost/src/core/SyslogLogger.ts
index 32a846e1..240b27df 100644
--- a/packages/pockethost/src/public-api/SyslogLogger.ts
+++ b/packages/pockethost/src/core/SyslogLogger.ts
@@ -1,7 +1,7 @@
-import { SYSLOGD_PORT } from '$constants'
-import { LoggerService } from '$public'
 import * as winston from 'winston'
 import 'winston-syslog'
+import { SYSLOGD_PORT } from '..'
+import { LoggerService } from '../common'
 
 export function SyslogLogger(instanceId: string, target: string) {
   // @ts-ignore
diff --git a/packages/pockethost/src/public-api/asyncExecutionGuard.ts b/packages/pockethost/src/core/asyncExecutionGuard.ts
similarity index 96%
rename from packages/pockethost/src/public-api/asyncExecutionGuard.ts
rename to packages/pockethost/src/core/asyncExecutionGuard.ts
index 0a9871be..d6c61a1b 100644
--- a/packages/pockethost/src/public-api/asyncExecutionGuard.ts
+++ b/packages/pockethost/src/core/asyncExecutionGuard.ts
@@ -1,7 +1,7 @@
 import { uniqueId } from '@s-libs/micro-dash'
 import Bottleneck from 'bottleneck'
 import { SetReturnType } from 'type-fest'
-import { LoggerService } from './Logger'
+import { LoggerService } from '../common/Logger'
 
 const limiters: { [lane: string]: Bottleneck } = {}
 export const serialAsyncExecutionGuard = <
diff --git a/packages/pockethost/src/public-api/discordAlert.ts b/packages/pockethost/src/core/discordAlert.ts
similarity index 86%
rename from packages/pockethost/src/public-api/discordAlert.ts
rename to packages/pockethost/src/core/discordAlert.ts
index 175aae26..8bbd7617 100644
--- a/packages/pockethost/src/public-api/discordAlert.ts
+++ b/packages/pockethost/src/core/discordAlert.ts
@@ -1,5 +1,5 @@
-import { DISCORD_ALERT_CHANNEL_URL } from '$constants'
-import { stringify } from '$public'
+import { DISCORD_ALERT_CHANNEL_URL } from '.'
+import { stringify } from '../common'
 
 const cache: { [_: string]: NodeJS.Timeout } = {}
 
diff --git a/packages/pockethost/src/public-api/env.ts b/packages/pockethost/src/core/env.ts
similarity index 100%
rename from packages/pockethost/src/public-api/env.ts
rename to packages/pockethost/src/core/env.ts
diff --git a/packages/pockethost/src/public-api/exit.ts b/packages/pockethost/src/core/exit.ts
similarity index 100%
rename from packages/pockethost/src/public-api/exit.ts
rename to packages/pockethost/src/core/exit.ts
diff --git a/packages/pockethost/src/core/index.ts b/packages/pockethost/src/core/index.ts
new file mode 100644
index 00000000..8912f593
--- /dev/null
+++ b/packages/pockethost/src/core/index.ts
@@ -0,0 +1,12 @@
+export * from '../constants'
+export * from './PromiseAllocator'
+export * from './Settings'
+export * from './SyslogLogger'
+export * from './asyncExecutionGuard'
+export * from './discordAlert'
+export * from './env'
+export * from './exit'
+export * from './internal'
+export * from './process'
+export * from './smartFetch'
+export * from './tryFetch'
diff --git a/packages/pockethost/src/public-api/internal.ts b/packages/pockethost/src/core/internal.ts
similarity index 100%
rename from packages/pockethost/src/public-api/internal.ts
rename to packages/pockethost/src/core/internal.ts
diff --git a/packages/pockethost/src/public-api/pexec.ts b/packages/pockethost/src/core/pexec.ts
similarity index 92%
rename from packages/pockethost/src/public-api/pexec.ts
rename to packages/pockethost/src/core/pexec.ts
index 19b8ec8b..f06e4829 100644
--- a/packages/pockethost/src/public-api/pexec.ts
+++ b/packages/pockethost/src/core/pexec.ts
@@ -1,5 +1,5 @@
-import { Logger } from '$public'
 import { exec } from 'child_process'
+import { Logger } from '../common'
 
 export const pexec = (logger: Logger) => (cmd: string) => {
   const { dbg, error } = logger.create('pexec')
diff --git a/packages/pockethost/src/public-api/process.ts b/packages/pockethost/src/core/process.ts
similarity index 93%
rename from packages/pockethost/src/public-api/process.ts
rename to packages/pockethost/src/core/process.ts
index 1bd00fd0..9cfa132c 100644
--- a/packages/pockethost/src/public-api/process.ts
+++ b/packages/pockethost/src/core/process.ts
@@ -1,4 +1,4 @@
-import { ioc } from '$constants'
+import { ioc } from '.'
 import { discordAlert } from './discordAlert'
 import { gracefulExit } from './exit'
 ;['unhandledRejection', 'uncaughtException'].forEach((type) => {
diff --git a/packages/pockethost/src/public-api/smartFetch.ts b/packages/pockethost/src/core/smartFetch.ts
similarity index 95%
rename from packages/pockethost/src/public-api/smartFetch.ts
rename to packages/pockethost/src/core/smartFetch.ts
index 72989d2b..86a7dea5 100644
--- a/packages/pockethost/src/public-api/smartFetch.ts
+++ b/packages/pockethost/src/core/smartFetch.ts
@@ -1,7 +1,7 @@
-import { LoggerService } from '$public'
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs'
 import fetch from 'node-fetch'
 import { dirname } from 'path'
+import { LoggerService } from '../common'
 
 export const smartFetch = async <TRet>(
   url: string,
diff --git a/packages/pockethost/src/public-api/tryFetch.ts b/packages/pockethost/src/core/tryFetch.ts
similarity index 97%
rename from packages/pockethost/src/public-api/tryFetch.ts
rename to packages/pockethost/src/core/tryFetch.ts
index 6dc91c2d..feb73fcf 100644
--- a/packages/pockethost/src/public-api/tryFetch.ts
+++ b/packages/pockethost/src/core/tryFetch.ts
@@ -1,5 +1,5 @@
-import { LoggerService } from '$public'
 import fetch, { Response } from 'node-fetch'
+import { LoggerService } from '../common'
 
 export const TRYFETCH_RETRY_MS = 50
 
diff --git a/packages/pockethost/src/index.ts b/packages/pockethost/src/index.ts
index 3d5a0170..46d458ad 100644
--- a/packages/pockethost/src/index.ts
+++ b/packages/pockethost/src/index.ts
@@ -1 +1 @@
-export * from './public-api'
+export * from './core'
diff --git a/packages/pockethost/src/services/InstanceLoggerService/index.ts b/packages/pockethost/src/services/InstanceLoggerService/index.ts
index 3f1de782..7d90dc16 100644
--- a/packages/pockethost/src/services/InstanceLoggerService/index.ts
+++ b/packages/pockethost/src/services/InstanceLoggerService/index.ts
@@ -1,14 +1,14 @@
-import { mkInstanceDataPath } from '$constants'
+import * as fs from 'fs'
+import { Tail } from 'tail'
+import * as winston from 'winston'
 import {
   LoggerService,
   asyncExitHook,
   createCleanupManager,
   mergeConfig,
+  mkInstanceDataPath,
   stringify,
-} from '$public'
-import * as fs from 'fs'
-import { Tail } from 'tail'
-import * as winston from 'winston'
+} from '../../../core'
 
 type UnsubFunc = () => void
 
diff --git a/packages/pockethost/src/services/InstanceService/index.ts b/packages/pockethost/src/services/InstanceService/index.ts
index 04b10981..76358c4f 100644
--- a/packages/pockethost/src/services/InstanceService/index.ts
+++ b/packages/pockethost/src/services/InstanceService/index.ts
@@ -1,32 +1,35 @@
+import { flatten, map, values } from '@s-libs/micro-dash'
+import Bottleneck from 'bottleneck'
+import { globSync } from 'glob'
+import { basename, join } from 'path'
+import { AsyncReturnType } from 'type-fest'
 import {
   APP_URL,
+  CLEANUP_PRIORITY_LAST,
+  ClientResponseError,
   DAEMON_PB_IDLE_TTL,
   DOCS_URL,
   EDGE_APEX_DOMAIN,
   INSTANCE_APP_HOOK_DIR,
   INSTANCE_APP_MIGRATIONS_DIR,
-  UPGRADE_MODE,
-  mkAppUrl,
-  mkContainerHomePath,
-  mkDocUrl,
-  mkEdgeUrl,
-} from '$constants'
-import {
-  CLEANUP_PRIORITY_LAST,
-  ClientResponseError,
   InstanceFields,
   InstanceId,
   InstanceStatus,
   LoggerService,
   SingletonBaseConfig,
+  UPGRADE_MODE,
   asyncExitHook,
   createCleanupManager,
   createTimerManager,
+  mkAppUrl,
+  mkContainerHomePath,
+  mkDocUrl,
+  mkEdgeUrl,
   mkInternalUrl,
   mkSingleton,
   now,
   stringify,
-} from '$public'
+} from '../../../core'
 import {
   InstanceLogger,
   MothershipAdminClientService,
@@ -34,12 +37,7 @@ import {
   PortService,
   SpawnConfig,
   proxyService,
-} from '$services'
-import { flatten, map, values } from '@s-libs/micro-dash'
-import Bottleneck from 'bottleneck'
-import { globSync } from 'glob'
-import { basename, join } from 'path'
-import { AsyncReturnType } from 'type-fest'
+} from '../../services'
 import { mkInstanceCache } from './mkInstanceCache'
 
 enum InstanceApiStatus {
diff --git a/packages/pockethost/src/services/InstanceService/mkInstanceCache.ts b/packages/pockethost/src/services/InstanceService/mkInstanceCache.ts
index 8b75d680..768e0a9a 100644
--- a/packages/pockethost/src/services/InstanceService/mkInstanceCache.ts
+++ b/packages/pockethost/src/services/InstanceService/mkInstanceCache.ts
@@ -1,5 +1,6 @@
-import { EDGE_APEX_DOMAIN } from '$constants'
+import { forEach } from '@s-libs/micro-dash'
 import {
+  EDGE_APEX_DOMAIN,
   INSTANCE_COLLECTION,
   InstanceFields_WithUser,
   InstanceId,
@@ -7,8 +8,7 @@ import {
   PocketBase,
   UserFields,
   UserId,
-} from '$public'
-import { forEach } from '@s-libs/micro-dash'
+} from '../../../core'
 
 export const mkInstanceCache = (client: PocketBase) => {
   const { dbg } = LoggerService().create(`InstanceCache`)
diff --git a/packages/pockethost/src/services/MothershipAdminClientService/InstanceMIxin.ts b/packages/pockethost/src/services/MothershipAdminClientService/InstanceMIxin.ts
index 80b4c797..ce63c357 100644
--- a/packages/pockethost/src/services/MothershipAdminClientService/InstanceMIxin.ts
+++ b/packages/pockethost/src/services/MothershipAdminClientService/InstanceMIxin.ts
@@ -1,3 +1,4 @@
+import { MixinContext } from '.'
 import {
   INSTANCE_COLLECTION,
   InstanceFields,
@@ -5,8 +6,7 @@ import {
   InstanceId,
   InstanceStatus,
   WithUser,
-} from '$public'
-import { MixinContext } from '.'
+} from '../../../core'
 
 export type InstanceApi = ReturnType<typeof createInstanceMixin>
 
diff --git a/packages/pockethost/src/services/MothershipAdminClientService/createAdminPbClient.ts b/packages/pockethost/src/services/MothershipAdminClientService/createAdminPbClient.ts
index e2e954df..adebc6f4 100644
--- a/packages/pockethost/src/services/MothershipAdminClientService/createAdminPbClient.ts
+++ b/packages/pockethost/src/services/MothershipAdminClientService/createAdminPbClient.ts
@@ -1,3 +1,4 @@
+import { MixinContext } from '.'
 import {
   GetUserTokenPayload,
   GetUserTokenPayloadSchema,
@@ -8,8 +9,7 @@ import {
   RestMethods,
   createRestHelper,
   stringify,
-} from '$public'
-import { MixinContext } from '.'
+} from '../../../core'
 import { createInstanceMixin } from './InstanceMIxin'
 
 export type PocketbaseClientApi = ReturnType<typeof createAdminPbClient>
diff --git a/packages/pockethost/src/services/MothershipAdminClientService/index.ts b/packages/pockethost/src/services/MothershipAdminClientService/index.ts
index e740af32..49db74f8 100644
--- a/packages/pockethost/src/services/MothershipAdminClientService/index.ts
+++ b/packages/pockethost/src/services/MothershipAdminClientService/index.ts
@@ -1,15 +1,13 @@
-import {
-  MOTHERSHIP_ADMIN_PASSWORD,
-  MOTHERSHIP_ADMIN_USERNAME,
-  MOTHERSHIP_URL,
-} from '$constants'
 import {
   Logger,
   LoggerService,
+  MOTHERSHIP_ADMIN_PASSWORD,
+  MOTHERSHIP_ADMIN_USERNAME,
+  MOTHERSHIP_URL,
   PocketBase,
   mergeConfig,
   mkSingleton,
-} from '$public'
+} from '../../../core'
 import { createAdminPbClient } from './createAdminPbClient'
 
 export type ClientServiceConfig = {
diff --git a/packages/pockethost/src/services/PocketBaseService/index.ts b/packages/pockethost/src/services/PocketBaseService/index.ts
index a3a43ea9..3d4decd5 100644
--- a/packages/pockethost/src/services/PocketBaseService/index.ts
+++ b/packages/pockethost/src/services/PocketBaseService/index.ts
@@ -1,21 +1,3 @@
-import {
-  APEX_DOMAIN,
-  DOCKER_CONTAINER_HOST,
-  SYSLOGD_PORT,
-  mkContainerHomePath,
-  mkInstanceDataPath,
-} from '$constants'
-import {
-  LoggerService,
-  SingletonBaseConfig,
-  SyslogLogger,
-  asyncExitHook,
-  createCleanupManager,
-  mkInternalUrl,
-  mkSingleton,
-  tryFetch,
-} from '$public'
-import { PortService } from '$services'
 import { map } from '@s-libs/micro-dash'
 import Docker, { Container, ContainerCreateOptions } from 'dockerode'
 import { existsSync } from 'fs'
@@ -24,6 +6,22 @@ import MemoryStream from 'memorystream'
 import { gte } from 'semver'
 import { EventEmitter } from 'stream'
 import { AsyncReturnType } from 'type-fest'
+import {
+  APEX_DOMAIN,
+  DOCKER_CONTAINER_HOST,
+  LoggerService,
+  SYSLOGD_PORT,
+  SingletonBaseConfig,
+  SyslogLogger,
+  asyncExitHook,
+  createCleanupManager,
+  mkContainerHomePath,
+  mkInstanceDataPath,
+  mkInternalUrl,
+  mkSingleton,
+  tryFetch,
+} from '../../../core'
+import { PortService } from '../PortService'
 
 export type Env = { [_: string]: string }
 export type SpawnConfig = {
diff --git a/packages/pockethost/src/services/PortService.ts b/packages/pockethost/src/services/PortService.ts
index 11ed7059..18646c98 100644
--- a/packages/pockethost/src/services/PortService.ts
+++ b/packages/pockethost/src/services/PortService.ts
@@ -1,6 +1,10 @@
-import { INITIAL_PORT_POOL_SIZE } from '$constants'
-import { PromiseAllocator, mergeConfig, mkSingleton } from '$public'
 import getPort from 'get-port'
+import {
+  INITIAL_PORT_POOL_SIZE,
+  PromiseAllocator,
+  mergeConfig,
+  mkSingleton,
+} from '../../core'
 
 export type Config = { maxPorts: number }
 export const PortService = mkSingleton((config: Partial<Config> = {}) => {
diff --git a/packages/pockethost/src/services/ProxyService.ts b/packages/pockethost/src/services/ProxyService.ts
index 6da53862..1fe96087 100644
--- a/packages/pockethost/src/services/ProxyService.ts
+++ b/packages/pockethost/src/services/ProxyService.ts
@@ -1,16 +1,16 @@
-import { DAEMON_PORT } from '$constants'
-import {
-  Logger,
-  LoggerService,
-  SingletonBaseConfig,
-  asyncExitHook,
-  mkSingleton,
-} from '$public'
 import cors from 'cors'
 import express, { Request, Response } from 'express'
 import 'express-async-errors'
 import { default as Server, default as httpProxy } from 'http-proxy'
 import { AsyncReturnType } from 'type-fest'
+import {
+  DAEMON_PORT,
+  Logger,
+  LoggerService,
+  SingletonBaseConfig,
+  asyncExitHook,
+  mkSingleton,
+} from '../../core'
 
 export type ProxyServiceApi = AsyncReturnType<typeof proxyService>
 
diff --git a/packages/pockethost/src/services/RealtimeLog.ts b/packages/pockethost/src/services/RealtimeLog.ts
index 47e4f2c4..c0cb7fa5 100644
--- a/packages/pockethost/src/services/RealtimeLog.ts
+++ b/packages/pockethost/src/services/RealtimeLog.ts
@@ -1,3 +1,5 @@
+import { text } from 'node:stream/consumers'
+import { JsonifiableObject } from 'type-fest/source/jsonifiable'
 import {
   InstanceFields,
   LoggerService,
@@ -5,9 +7,7 @@ import {
   PocketBase,
   SingletonBaseConfig,
   stringify,
-} from '$public'
-import { text } from 'node:stream/consumers'
-import { JsonifiableObject } from 'type-fest/source/jsonifiable'
+} from '../../core'
 import { InstanceLogger } from './InstanceLoggerService'
 import { proxyService } from './ProxyService'
 
diff --git a/packages/pockethost/tsconfig.json b/packages/pockethost/tsconfig.json
index 27f521a2..0f098a71 100644
--- a/packages/pockethost/tsconfig.json
+++ b/packages/pockethost/tsconfig.json
@@ -14,14 +14,7 @@
     "moduleResolution": "node",
     "noUncheckedIndexedAccess": true,
     "strictNullChecks": true,
-    "noEmit": true,
-    "baseUrl": ".",
-    "paths": {
-      "$public": ["./src/public-api"],
-      "$services": ["./src/services"],
-      "$constants": ["./src/constants"],
-      "$src/*": ["./src/*"]
-    }
+    "noEmit": true
   },
   "include": ["**/*.ts"],
   "exclude": ["./src/mothership-app/**/*", "./src/instance-app/**/*"]
diff --git a/packages/superadmin/src/components/helpers/theme.ts b/packages/superadmin/src/components/helpers/theme.ts
index ff7418d1..613cc4b3 100644
--- a/packages/superadmin/src/components/helpers/theme.ts
+++ b/packages/superadmin/src/components/helpers/theme.ts
@@ -1,4 +1,4 @@
-import { assertTruthy } from 'pockethost'
+import { assertTruthy } from 'pockethost/common'
 
 export const html = () => {
   const htmlElement = document.querySelector('html')
diff --git a/packages/superadmin/src/pocketbase-client/PocketbaseClient.ts b/packages/superadmin/src/pocketbase-client/PocketbaseClient.ts
index 9e4614b1..6041485b 100644
--- a/packages/superadmin/src/pocketbase-client/PocketbaseClient.ts
+++ b/packages/superadmin/src/pocketbase-client/PocketbaseClient.ts
@@ -5,7 +5,7 @@ import {
   ClientResponseError,
   PocketBase,
   type AuthModel,
-} from 'pockethost'
+} from 'pockethost/common'
 
 export type AuthToken = string
 export type AuthStoreProps = {
diff --git a/packages/superadmin/src/services.ts b/packages/superadmin/src/services.ts
index 4b6ee048..7c60bd4b 100644
--- a/packages/superadmin/src/services.ts
+++ b/packages/superadmin/src/services.ts
@@ -1,4 +1,4 @@
-import { LoggerService, LogLevelName } from 'pockethost'
+import { LoggerService, LogLevelName } from 'pockethost/common'
 import { PUBLIC_DEBUG } from './env'
 
 // Initiate the logging service
diff --git a/packages/superadmin/src/util/componentCleanup.ts b/packages/superadmin/src/util/componentCleanup.ts
index 21ae93ae..ae572cc6 100644
--- a/packages/superadmin/src/util/componentCleanup.ts
+++ b/packages/superadmin/src/util/componentCleanup.ts
@@ -1,4 +1,4 @@
-import { createCleanupManager } from 'pockethost'
+import { createCleanupManager } from 'pockethost/common'
 import { onDestroy } from 'svelte'
 
 // TODO: Document this more
diff --git a/packages/superadmin/src/util/stores.ts b/packages/superadmin/src/util/stores.ts
index e3012109..5f9f4248 100644
--- a/packages/superadmin/src/util/stores.ts
+++ b/packages/superadmin/src/util/stores.ts
@@ -1,6 +1,10 @@
 import { client } from '$src/pocketbase-client'
 import consoleLogger from '@pockethost/plugin-console-logger'
-import { loadPlugins, type InstanceFields, type InstanceId } from 'pockethost'
+import {
+  loadPlugins,
+  type InstanceFields,
+  type InstanceId,
+} from 'pockethost/common'
 import { writable } from 'svelte/store'
 
 // TODO: Removing this will cause the app to crash