diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e548dde0..c5964fba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: wyvox/action-setup-pnpm@v3
       - run: pnpm build 
+        # TODO: verify dev deps don't exist in production build (debug, verify, stacktracey)
 
   test:
     name: "Tests"
diff --git a/packages/universal/core-utils/.eslintrc.json b/packages/-private/exploring/modifier/.eslintrc.json
similarity index 100%
rename from packages/universal/core-utils/.eslintrc.json
rename to packages/-private/exploring/modifier/.eslintrc.json
diff --git a/packages/universal/core-utils/.npmrc b/packages/-private/exploring/modifier/.npmrc
similarity index 100%
rename from packages/universal/core-utils/.npmrc
rename to packages/-private/exploring/modifier/.npmrc
diff --git a/packages/universal/modifier/index.ts b/packages/-private/exploring/modifier/index.ts
similarity index 100%
rename from packages/universal/modifier/index.ts
rename to packages/-private/exploring/modifier/index.ts
diff --git a/packages/universal/modifier/package.json b/packages/-private/exploring/modifier/package.json
similarity index 100%
rename from packages/universal/modifier/package.json
rename to packages/-private/exploring/modifier/package.json
diff --git a/packages/universal/core-utils/rollup.config.mjs b/packages/-private/exploring/modifier/rollup.config.mjs
similarity index 100%
rename from packages/universal/core-utils/rollup.config.mjs
rename to packages/-private/exploring/modifier/rollup.config.mjs
diff --git a/packages/universal/modifier/src/modifier.ts b/packages/-private/exploring/modifier/src/modifier.ts
similarity index 100%
rename from packages/universal/modifier/src/modifier.ts
rename to packages/-private/exploring/modifier/src/modifier.ts
diff --git a/packages/universal/core-utils/tsconfig.json b/packages/-private/exploring/modifier/tsconfig.json
similarity index 100%
rename from packages/universal/core-utils/tsconfig.json
rename to packages/-private/exploring/modifier/tsconfig.json
diff --git a/packages/universal/core-utils/tests/.eslintrc.json b/packages/-private/exploring/resource/.eslintrc.json
similarity index 100%
rename from packages/universal/core-utils/tests/.eslintrc.json
rename to packages/-private/exploring/resource/.eslintrc.json
diff --git a/packages/universal/core/.npmrc b/packages/-private/exploring/resource/.npmrc
similarity index 100%
rename from packages/universal/core/.npmrc
rename to packages/-private/exploring/resource/.npmrc
diff --git a/packages/universal/resource/README.md b/packages/-private/exploring/resource/README.md
similarity index 100%
rename from packages/universal/resource/README.md
rename to packages/-private/exploring/resource/README.md
diff --git a/packages/universal/resource/README2.md b/packages/-private/exploring/resource/README2.md
similarity index 100%
rename from packages/universal/resource/README2.md
rename to packages/-private/exploring/resource/README2.md
diff --git a/packages/universal/resource/index.ts b/packages/-private/exploring/resource/index.ts
similarity index 100%
rename from packages/universal/resource/index.ts
rename to packages/-private/exploring/resource/index.ts
diff --git a/packages/universal/resource/package.json b/packages/-private/exploring/resource/package.json
similarity index 100%
rename from packages/universal/resource/package.json
rename to packages/-private/exploring/resource/package.json
diff --git a/packages/universal/core/rollup.config.mjs b/packages/-private/exploring/resource/rollup.config.mjs
similarity index 100%
rename from packages/universal/core/rollup.config.mjs
rename to packages/-private/exploring/resource/rollup.config.mjs
diff --git a/packages/universal/resource/src/resource-list.ts b/packages/-private/exploring/resource/src/resource-list.ts
similarity index 100%
rename from packages/universal/resource/src/resource-list.ts
rename to packages/-private/exploring/resource/src/resource-list.ts
diff --git a/packages/universal/resource/src/resource.ts b/packages/-private/exploring/resource/src/resource.ts
similarity index 100%
rename from packages/universal/resource/src/resource.ts
rename to packages/-private/exploring/resource/src/resource.ts
diff --git a/packages/universal/resource/src/sync/high-level.ts b/packages/-private/exploring/resource/src/sync/high-level.ts
similarity index 100%
rename from packages/universal/resource/src/sync/high-level.ts
rename to packages/-private/exploring/resource/src/sync/high-level.ts
diff --git a/packages/universal/resource/src/sync/primitive.ts b/packages/-private/exploring/resource/src/sync/primitive.ts
similarity index 100%
rename from packages/universal/resource/src/sync/primitive.ts
rename to packages/-private/exploring/resource/src/sync/primitive.ts
diff --git a/packages/universal/core/.eslintrc.json b/packages/-private/exploring/resource/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/core/.eslintrc.json
rename to packages/-private/exploring/resource/tests/.eslintrc.json
diff --git a/packages/universal/debug/.npmrc b/packages/-private/exploring/resource/tests/.npmrc
similarity index 100%
rename from packages/universal/debug/.npmrc
rename to packages/-private/exploring/resource/tests/.npmrc
diff --git a/packages/universal/resource/tests/package.json b/packages/-private/exploring/resource/tests/package.json
similarity index 100%
rename from packages/universal/resource/tests/package.json
rename to packages/-private/exploring/resource/tests/package.json
diff --git a/packages/universal/resource/tests/resource-list/high-level.spec.ts b/packages/-private/exploring/resource/tests/resource-list/high-level.spec.ts
similarity index 100%
rename from packages/universal/resource/tests/resource-list/high-level.spec.ts
rename to packages/-private/exploring/resource/tests/resource-list/high-level.spec.ts
diff --git a/packages/universal/resource/tests/resource-list/syncing.spec.ts b/packages/-private/exploring/resource/tests/resource-list/syncing.spec.ts
similarity index 100%
rename from packages/universal/resource/tests/resource-list/syncing.spec.ts
rename to packages/-private/exploring/resource/tests/resource-list/syncing.spec.ts
diff --git a/packages/universal/resource/tests/resource.spec.ts b/packages/-private/exploring/resource/tests/resource.spec.ts
similarity index 100%
rename from packages/universal/resource/tests/resource.spec.ts
rename to packages/-private/exploring/resource/tests/resource.spec.ts
diff --git a/packages/universal/resource/tests/sync.spec.ts b/packages/-private/exploring/resource/tests/sync.spec.ts
similarity index 100%
rename from packages/universal/resource/tests/sync.spec.ts
rename to packages/-private/exploring/resource/tests/sync.spec.ts
diff --git a/packages/universal/core-utils/tests/tsconfig.json b/packages/-private/exploring/resource/tests/tsconfig.json
similarity index 100%
rename from packages/universal/core-utils/tests/tsconfig.json
rename to packages/-private/exploring/resource/tests/tsconfig.json
diff --git a/packages/universal/debug/tsconfig.json b/packages/-private/exploring/resource/tsconfig.json
similarity index 100%
rename from packages/universal/debug/tsconfig.json
rename to packages/-private/exploring/resource/tsconfig.json
diff --git a/packages/universal/debug/.eslintrc.json b/packages/-private/exploring/service/.eslintrc.json
similarity index 100%
rename from packages/universal/debug/.eslintrc.json
rename to packages/-private/exploring/service/.eslintrc.json
diff --git a/packages/universal/debug/tests/.npmrc b/packages/-private/exploring/service/.npmrc
similarity index 100%
rename from packages/universal/debug/tests/.npmrc
rename to packages/-private/exploring/service/.npmrc
diff --git a/packages/universal/service/README.md b/packages/-private/exploring/service/README.md
similarity index 100%
rename from packages/universal/service/README.md
rename to packages/-private/exploring/service/README.md
diff --git a/packages/universal/service/index.ts b/packages/-private/exploring/service/index.ts
similarity index 100%
rename from packages/universal/service/index.ts
rename to packages/-private/exploring/service/index.ts
diff --git a/packages/universal/service/package.json b/packages/-private/exploring/service/package.json
similarity index 100%
rename from packages/universal/service/package.json
rename to packages/-private/exploring/service/package.json
diff --git a/packages/universal/debug/rollup.config.mjs b/packages/-private/exploring/service/rollup.config.mjs
similarity index 100%
rename from packages/universal/debug/rollup.config.mjs
rename to packages/-private/exploring/service/rollup.config.mjs
diff --git a/packages/universal/service/src/service.ts b/packages/-private/exploring/service/src/service.ts
similarity index 100%
rename from packages/universal/service/src/service.ts
rename to packages/-private/exploring/service/src/service.ts
diff --git a/packages/universal/interfaces/.eslintrc.json b/packages/-private/exploring/service/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/interfaces/.eslintrc.json
rename to packages/-private/exploring/service/tests/.eslintrc.json
diff --git a/packages/universal/interfaces/.npmrc b/packages/-private/exploring/service/tests/.npmrc
similarity index 100%
rename from packages/universal/interfaces/.npmrc
rename to packages/-private/exploring/service/tests/.npmrc
diff --git a/packages/universal/service/tests/package.json b/packages/-private/exploring/service/tests/package.json
similarity index 100%
rename from packages/universal/service/tests/package.json
rename to packages/-private/exploring/service/tests/package.json
diff --git a/packages/universal/service/tests/service.spec.ts b/packages/-private/exploring/service/tests/service.spec.ts
similarity index 100%
rename from packages/universal/service/tests/service.spec.ts
rename to packages/-private/exploring/service/tests/service.spec.ts
diff --git a/packages/universal/resource/tests/tsconfig.json b/packages/-private/exploring/service/tests/tsconfig.json
similarity index 100%
rename from packages/universal/resource/tests/tsconfig.json
rename to packages/-private/exploring/service/tests/tsconfig.json
diff --git a/packages/universal/modifier/tsconfig.json b/packages/-private/exploring/service/tsconfig.json
similarity index 100%
rename from packages/universal/modifier/tsconfig.json
rename to packages/-private/exploring/service/tsconfig.json
diff --git a/packages/core/README.md b/packages/core/README.md
new file mode 100644
index 00000000..ac2ef60f
--- /dev/null
+++ b/packages/core/README.md
@@ -0,0 +1 @@
+may need to move stable parts of universal into core
diff --git a/packages/universal/modifier/.eslintrc.json b/packages/core/core-utils/.eslintrc.json
similarity index 100%
rename from packages/universal/modifier/.eslintrc.json
rename to packages/core/core-utils/.eslintrc.json
diff --git a/packages/universal/modifier/.npmrc b/packages/core/core-utils/.npmrc
similarity index 100%
rename from packages/universal/modifier/.npmrc
rename to packages/core/core-utils/.npmrc
diff --git a/packages/universal/core-utils/README.md b/packages/core/core-utils/README.md
similarity index 100%
rename from packages/universal/core-utils/README.md
rename to packages/core/core-utils/README.md
diff --git a/packages/universal/core-utils/index.ts b/packages/core/core-utils/index.ts
similarity index 100%
rename from packages/universal/core-utils/index.ts
rename to packages/core/core-utils/index.ts
diff --git a/packages/universal/core-utils/package.json b/packages/core/core-utils/package.json
similarity index 100%
rename from packages/universal/core-utils/package.json
rename to packages/core/core-utils/package.json
diff --git a/packages/universal/modifier/rollup.config.mjs b/packages/core/core-utils/rollup.config.mjs
similarity index 100%
rename from packages/universal/modifier/rollup.config.mjs
rename to packages/core/core-utils/rollup.config.mjs
diff --git a/packages/universal/core-utils/src/array.ts b/packages/core/core-utils/src/array.ts
similarity index 100%
rename from packages/universal/core-utils/src/array.ts
rename to packages/core/core-utils/src/array.ts
diff --git a/packages/universal/core-utils/src/array.tst.ts b/packages/core/core-utils/src/array.tst.ts
similarity index 100%
rename from packages/universal/core-utils/src/array.tst.ts
rename to packages/core/core-utils/src/array.tst.ts
diff --git a/packages/universal/core-utils/src/function.ts b/packages/core/core-utils/src/function.ts
similarity index 100%
rename from packages/universal/core-utils/src/function.ts
rename to packages/core/core-utils/src/function.ts
diff --git a/packages/universal/core-utils/src/iterable.ts b/packages/core/core-utils/src/iterable.ts
similarity index 100%
rename from packages/universal/core-utils/src/iterable.ts
rename to packages/core/core-utils/src/iterable.ts
diff --git a/packages/universal/core-utils/src/iterable.tst.ts b/packages/core/core-utils/src/iterable.tst.ts
similarity index 100%
rename from packages/universal/core-utils/src/iterable.tst.ts
rename to packages/core/core-utils/src/iterable.tst.ts
diff --git a/packages/universal/core-utils/src/json.ts b/packages/core/core-utils/src/json.ts
similarity index 100%
rename from packages/universal/core-utils/src/json.ts
rename to packages/core/core-utils/src/json.ts
diff --git a/packages/universal/core-utils/src/object.ts b/packages/core/core-utils/src/object.ts
similarity index 100%
rename from packages/universal/core-utils/src/object.ts
rename to packages/core/core-utils/src/object.ts
diff --git a/packages/universal/core-utils/src/overload.ts b/packages/core/core-utils/src/overload.ts
similarity index 100%
rename from packages/universal/core-utils/src/overload.ts
rename to packages/core/core-utils/src/overload.ts
diff --git a/packages/universal/core-utils/src/value.ts b/packages/core/core-utils/src/value.ts
similarity index 100%
rename from packages/universal/core-utils/src/value.ts
rename to packages/core/core-utils/src/value.ts
diff --git a/packages/universal/core-utils/src/value.tst.ts b/packages/core/core-utils/src/value.tst.ts
similarity index 100%
rename from packages/universal/core-utils/src/value.tst.ts
rename to packages/core/core-utils/src/value.tst.ts
diff --git a/packages/universal/reactive/.eslintrc.json b/packages/core/core-utils/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/reactive/.eslintrc.json
rename to packages/core/core-utils/tests/.eslintrc.json
diff --git a/packages/universal/core-utils/tests/object.spec.ts b/packages/core/core-utils/tests/object.spec.ts
similarity index 100%
rename from packages/universal/core-utils/tests/object.spec.ts
rename to packages/core/core-utils/tests/object.spec.ts
diff --git a/packages/universal/core-utils/tests/package.json b/packages/core/core-utils/tests/package.json
similarity index 100%
rename from packages/universal/core-utils/tests/package.json
rename to packages/core/core-utils/tests/package.json
diff --git a/packages/universal/service/tests/tsconfig.json b/packages/core/core-utils/tests/tsconfig.json
similarity index 100%
rename from packages/universal/service/tests/tsconfig.json
rename to packages/core/core-utils/tests/tsconfig.json
diff --git a/packages/universal/reactive/tsconfig.json b/packages/core/core-utils/tsconfig.json
similarity index 100%
rename from packages/universal/reactive/tsconfig.json
rename to packages/core/core-utils/tsconfig.json
diff --git a/packages/universal/reactive/tests/.eslintrc.json b/packages/core/reactive/.eslintrc.json
similarity index 100%
rename from packages/universal/reactive/tests/.eslintrc.json
rename to packages/core/reactive/.eslintrc.json
diff --git a/packages/universal/reactive/.npmrc b/packages/core/reactive/.npmrc
similarity index 100%
rename from packages/universal/reactive/.npmrc
rename to packages/core/reactive/.npmrc
diff --git a/packages/universal/reactive/README.md b/packages/core/reactive/README.md
similarity index 100%
rename from packages/universal/reactive/README.md
rename to packages/core/reactive/README.md
diff --git a/packages/universal/reactive/index.ts b/packages/core/reactive/index.ts
similarity index 100%
rename from packages/universal/reactive/index.ts
rename to packages/core/reactive/index.ts
diff --git a/packages/universal/reactive/package.json b/packages/core/reactive/package.json
similarity index 100%
rename from packages/universal/reactive/package.json
rename to packages/core/reactive/package.json
diff --git a/packages/universal/reactive/rollup.config.mjs b/packages/core/reactive/rollup.config.mjs
similarity index 100%
rename from packages/universal/reactive/rollup.config.mjs
rename to packages/core/reactive/rollup.config.mjs
diff --git a/packages/universal/reactive/src/primitives/cached.ts b/packages/core/reactive/src/primitives/cached.ts
similarity index 100%
rename from packages/universal/reactive/src/primitives/cached.ts
rename to packages/core/reactive/src/primitives/cached.ts
diff --git a/packages/universal/reactive/src/primitives/cell.ts b/packages/core/reactive/src/primitives/cell.ts
similarity index 100%
rename from packages/universal/reactive/src/primitives/cell.ts
rename to packages/core/reactive/src/primitives/cell.ts
diff --git a/packages/universal/reactive/src/primitives/formula-lifecycle.ts b/packages/core/reactive/src/primitives/formula-lifecycle.ts
similarity index 100%
rename from packages/universal/reactive/src/primitives/formula-lifecycle.ts
rename to packages/core/reactive/src/primitives/formula-lifecycle.ts
diff --git a/packages/universal/reactive/src/primitives/formula.ts b/packages/core/reactive/src/primitives/formula.ts
similarity index 100%
rename from packages/universal/reactive/src/primitives/formula.ts
rename to packages/core/reactive/src/primitives/formula.ts
diff --git a/packages/universal/reactive/src/primitives/frame.ts b/packages/core/reactive/src/primitives/frame.ts
similarity index 100%
rename from packages/universal/reactive/src/primitives/frame.ts
rename to packages/core/reactive/src/primitives/frame.ts
diff --git a/packages/universal/reactive/src/primitives/marker.ts b/packages/core/reactive/src/primitives/marker.ts
similarity index 100%
rename from packages/universal/reactive/src/primitives/marker.ts
rename to packages/core/reactive/src/primitives/marker.ts
diff --git a/packages/universal/reactive/src/primitives/utils.ts b/packages/core/reactive/src/primitives/utils.ts
similarity index 100%
rename from packages/universal/reactive/src/primitives/utils.ts
rename to packages/core/reactive/src/primitives/utils.ts
diff --git a/packages/universal/reactive/src/runtime.ts b/packages/core/reactive/src/runtime.ts
similarity index 100%
rename from packages/universal/reactive/src/runtime.ts
rename to packages/core/reactive/src/runtime.ts
diff --git a/packages/universal/reactive/src/utils.ts b/packages/core/reactive/src/utils.ts
similarity index 100%
rename from packages/universal/reactive/src/utils.ts
rename to packages/core/reactive/src/utils.ts
diff --git a/packages/universal/renderer/.eslintrc.json b/packages/core/reactive/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/renderer/.eslintrc.json
rename to packages/core/reactive/tests/.eslintrc.json
diff --git a/packages/universal/reactive/tests/.npmrc b/packages/core/reactive/tests/.npmrc
similarity index 100%
rename from packages/universal/reactive/tests/.npmrc
rename to packages/core/reactive/tests/.npmrc
diff --git a/packages/universal/reactive/tests/cell.spec.ts b/packages/core/reactive/tests/cell.spec.ts
similarity index 100%
rename from packages/universal/reactive/tests/cell.spec.ts
rename to packages/core/reactive/tests/cell.spec.ts
diff --git a/packages/universal/reactive/tests/package.json b/packages/core/reactive/tests/package.json
similarity index 100%
rename from packages/universal/reactive/tests/package.json
rename to packages/core/reactive/tests/package.json
diff --git a/packages/universal/debug/tests/tsconfig.json b/packages/core/reactive/tests/tsconfig.json
similarity index 100%
rename from packages/universal/debug/tests/tsconfig.json
rename to packages/core/reactive/tests/tsconfig.json
diff --git a/packages/universal/renderer/tsconfig.json b/packages/core/reactive/tsconfig.json
similarity index 100%
rename from packages/universal/renderer/tsconfig.json
rename to packages/core/reactive/tsconfig.json
diff --git a/packages/universal/renderer/tests/.eslintrc.json b/packages/core/runtime/.eslintrc.json
similarity index 100%
rename from packages/universal/renderer/tests/.eslintrc.json
rename to packages/core/runtime/.eslintrc.json
diff --git a/packages/universal/renderer/.npmrc b/packages/core/runtime/.npmrc
similarity index 100%
rename from packages/universal/renderer/.npmrc
rename to packages/core/runtime/.npmrc
diff --git a/packages/universal/runtime/README.md b/packages/core/runtime/README.md
similarity index 100%
rename from packages/universal/runtime/README.md
rename to packages/core/runtime/README.md
diff --git a/packages/universal/runtime/index.ts b/packages/core/runtime/index.ts
similarity index 100%
rename from packages/universal/runtime/index.ts
rename to packages/core/runtime/index.ts
diff --git a/packages/universal/runtime/package.json b/packages/core/runtime/package.json
similarity index 100%
rename from packages/universal/runtime/package.json
rename to packages/core/runtime/package.json
diff --git a/packages/universal/renderer/rollup.config.mjs b/packages/core/runtime/rollup.config.mjs
similarity index 100%
rename from packages/universal/renderer/rollup.config.mjs
rename to packages/core/runtime/rollup.config.mjs
diff --git a/packages/universal/runtime/src/context/context.ts b/packages/core/runtime/src/context/context.ts
similarity index 100%
rename from packages/universal/runtime/src/context/context.ts
rename to packages/core/runtime/src/context/context.ts
diff --git a/packages/universal/runtime/src/define.ts b/packages/core/runtime/src/define.ts
similarity index 100%
rename from packages/universal/runtime/src/define.ts
rename to packages/core/runtime/src/define.ts
diff --git a/packages/universal/runtime/src/lifetime/api.ts b/packages/core/runtime/src/lifetime/api.ts
similarity index 100%
rename from packages/universal/runtime/src/lifetime/api.ts
rename to packages/core/runtime/src/lifetime/api.ts
diff --git a/packages/universal/runtime/src/lifetime/object-lifetime.ts b/packages/core/runtime/src/lifetime/object-lifetime.ts
similarity index 100%
rename from packages/universal/runtime/src/lifetime/object-lifetime.ts
rename to packages/core/runtime/src/lifetime/object-lifetime.ts
diff --git a/packages/universal/runtime/src/timeline/render.ts b/packages/core/runtime/src/timeline/render.ts
similarity index 100%
rename from packages/universal/runtime/src/timeline/render.ts
rename to packages/core/runtime/src/timeline/render.ts
diff --git a/packages/universal/runtime/src/timeline/spec.md b/packages/core/runtime/src/timeline/spec.md
similarity index 100%
rename from packages/universal/runtime/src/timeline/spec.md
rename to packages/core/runtime/src/timeline/spec.md
diff --git a/packages/universal/runtime/src/timeline/subscriptions.md b/packages/core/runtime/src/timeline/subscriptions.md
similarity index 100%
rename from packages/universal/runtime/src/timeline/subscriptions.md
rename to packages/core/runtime/src/timeline/subscriptions.md
diff --git a/packages/universal/runtime/src/timeline/subscriptions.ts b/packages/core/runtime/src/timeline/subscriptions.ts
similarity index 100%
rename from packages/universal/runtime/src/timeline/subscriptions.ts
rename to packages/core/runtime/src/timeline/subscriptions.ts
diff --git a/packages/universal/runtime/src/timeline/utils.ts b/packages/core/runtime/src/timeline/utils.ts
similarity index 100%
rename from packages/universal/runtime/src/timeline/utils.ts
rename to packages/core/runtime/src/timeline/utils.ts
diff --git a/packages/universal/resource/.eslintrc.json b/packages/core/runtime/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/resource/.eslintrc.json
rename to packages/core/runtime/tests/.eslintrc.json
diff --git a/packages/universal/renderer/tests/.npmrc b/packages/core/runtime/tests/.npmrc
similarity index 100%
rename from packages/universal/renderer/tests/.npmrc
rename to packages/core/runtime/tests/.npmrc
diff --git a/packages/universal/runtime/tests/consume.spec.ts b/packages/core/runtime/tests/consume.spec.ts
similarity index 100%
rename from packages/universal/runtime/tests/consume.spec.ts
rename to packages/core/runtime/tests/consume.spec.ts
diff --git a/packages/universal/runtime/tests/lifetime.spec.ts b/packages/core/runtime/tests/lifetime.spec.ts
similarity index 100%
rename from packages/universal/runtime/tests/lifetime.spec.ts
rename to packages/core/runtime/tests/lifetime.spec.ts
diff --git a/packages/universal/runtime/tests/package.json b/packages/core/runtime/tests/package.json
similarity index 100%
rename from packages/universal/runtime/tests/package.json
rename to packages/core/runtime/tests/package.json
diff --git a/packages/universal/runtime/tests/protocol.spec.ts b/packages/core/runtime/tests/protocol.spec.ts
similarity index 100%
rename from packages/universal/runtime/tests/protocol.spec.ts
rename to packages/core/runtime/tests/protocol.spec.ts
diff --git a/packages/universal/runtime/tests/subscribing.spec.ts b/packages/core/runtime/tests/subscribing.spec.ts
similarity index 100%
rename from packages/universal/runtime/tests/subscribing.spec.ts
rename to packages/core/runtime/tests/subscribing.spec.ts
diff --git a/packages/universal/runtime/tests/subscription.spec.ts b/packages/core/runtime/tests/subscription.spec.ts
similarity index 100%
rename from packages/universal/runtime/tests/subscription.spec.ts
rename to packages/core/runtime/tests/subscription.spec.ts
diff --git a/packages/universal/runtime/tests/support/testing.ts b/packages/core/runtime/tests/support/testing.ts
similarity index 100%
rename from packages/universal/runtime/tests/support/testing.ts
rename to packages/core/runtime/tests/support/testing.ts
diff --git a/packages/universal/runtime/tests/tsconfig.json b/packages/core/runtime/tests/tsconfig.json
similarity index 100%
rename from packages/universal/runtime/tests/tsconfig.json
rename to packages/core/runtime/tests/tsconfig.json
diff --git a/packages/universal/resource/tsconfig.json b/packages/core/runtime/tsconfig.json
similarity index 100%
rename from packages/universal/resource/tsconfig.json
rename to packages/core/runtime/tsconfig.json
diff --git a/packages/universal/tags/.eslintignore b/packages/core/tags/.eslintignore
similarity index 100%
rename from packages/universal/tags/.eslintignore
rename to packages/core/tags/.eslintignore
diff --git a/packages/universal/resource/tests/.eslintrc.json b/packages/core/tags/.eslintrc.json
similarity index 100%
rename from packages/universal/resource/tests/.eslintrc.json
rename to packages/core/tags/.eslintrc.json
diff --git a/packages/universal/tags/.gitignore b/packages/core/tags/.gitignore
similarity index 100%
rename from packages/universal/tags/.gitignore
rename to packages/core/tags/.gitignore
diff --git a/packages/universal/resource/.npmrc b/packages/core/tags/.npmrc
similarity index 100%
rename from packages/universal/resource/.npmrc
rename to packages/core/tags/.npmrc
diff --git a/packages/universal/tags/README.md b/packages/core/tags/README.md
similarity index 100%
rename from packages/universal/tags/README.md
rename to packages/core/tags/README.md
diff --git a/packages/universal/tags/index.ts b/packages/core/tags/index.ts
similarity index 100%
rename from packages/universal/tags/index.ts
rename to packages/core/tags/index.ts
diff --git a/packages/universal/tags/package.json b/packages/core/tags/package.json
similarity index 100%
rename from packages/universal/tags/package.json
rename to packages/core/tags/package.json
diff --git a/packages/universal/resource/rollup.config.mjs b/packages/core/tags/rollup.config.mjs
similarity index 100%
rename from packages/universal/resource/rollup.config.mjs
rename to packages/core/tags/rollup.config.mjs
diff --git a/packages/universal/tags/src/tag.ts b/packages/core/tags/src/tag.ts
similarity index 100%
rename from packages/universal/tags/src/tag.ts
rename to packages/core/tags/src/tag.ts
diff --git a/packages/universal/tags/src/tagged.ts b/packages/core/tags/src/tagged.ts
similarity index 100%
rename from packages/universal/tags/src/tagged.ts
rename to packages/core/tags/src/tagged.ts
diff --git a/packages/universal/tags/src/timestamp.ts b/packages/core/tags/src/timestamp.ts
similarity index 100%
rename from packages/universal/tags/src/timestamp.ts
rename to packages/core/tags/src/timestamp.ts
diff --git a/packages/universal/runtime/tsconfig.json b/packages/core/tags/tsconfig.json
similarity index 100%
rename from packages/universal/runtime/tsconfig.json
rename to packages/core/tags/tsconfig.json
diff --git a/packages/debug/README.md b/packages/debug/README.md
new file mode 100644
index 00000000..c77c9d80
--- /dev/null
+++ b/packages/debug/README.md
@@ -0,0 +1,2 @@
+this should be completely gone in production
+- could zod have solved this for us? (in place of verify?)
diff --git a/packages/universal/runtime/.eslintrc.json b/packages/debug/debug/.eslintrc.json
similarity index 100%
rename from packages/universal/runtime/.eslintrc.json
rename to packages/debug/debug/.eslintrc.json
diff --git a/packages/universal/debug/.npmcheckrc.json b/packages/debug/debug/.npmcheckrc.json
similarity index 100%
rename from packages/universal/debug/.npmcheckrc.json
rename to packages/debug/debug/.npmcheckrc.json
diff --git a/packages/universal/resource/tests/.npmrc b/packages/debug/debug/.npmrc
similarity index 100%
rename from packages/universal/resource/tests/.npmrc
rename to packages/debug/debug/.npmrc
diff --git a/packages/universal/debug/index.ts b/packages/debug/debug/index.ts
similarity index 100%
rename from packages/universal/debug/index.ts
rename to packages/debug/debug/index.ts
diff --git a/packages/universal/debug/package.json b/packages/debug/debug/package.json
similarity index 100%
rename from packages/universal/debug/package.json
rename to packages/debug/debug/package.json
diff --git a/packages/universal/runtime/rollup.config.mjs b/packages/debug/debug/rollup.config.mjs
similarity index 100%
rename from packages/universal/runtime/rollup.config.mjs
rename to packages/debug/debug/rollup.config.mjs
diff --git a/packages/universal/debug/src/call-stack/debug/index.ts b/packages/debug/debug/src/call-stack/debug/index.ts
similarity index 100%
rename from packages/universal/debug/src/call-stack/debug/index.ts
rename to packages/debug/debug/src/call-stack/debug/index.ts
diff --git a/packages/universal/debug/src/call-stack/debug/module.ts b/packages/debug/debug/src/call-stack/debug/module.ts
similarity index 100%
rename from packages/universal/debug/src/call-stack/debug/module.ts
rename to packages/debug/debug/src/call-stack/debug/module.ts
diff --git a/packages/universal/debug/src/call-stack/debug/stack.ts b/packages/debug/debug/src/call-stack/debug/stack.ts
similarity index 100%
rename from packages/universal/debug/src/call-stack/debug/stack.ts
rename to packages/debug/debug/src/call-stack/debug/stack.ts
diff --git a/packages/universal/debug/src/call-stack/entry.ts b/packages/debug/debug/src/call-stack/entry.ts
similarity index 100%
rename from packages/universal/debug/src/call-stack/entry.ts
rename to packages/debug/debug/src/call-stack/entry.ts
diff --git a/packages/universal/debug/src/call-stack/prod.ts b/packages/debug/debug/src/call-stack/prod.ts
similarity index 100%
rename from packages/universal/debug/src/call-stack/prod.ts
rename to packages/debug/debug/src/call-stack/prod.ts
diff --git a/packages/universal/debug/src/debug.ts b/packages/debug/debug/src/debug.ts
similarity index 100%
rename from packages/universal/debug/src/debug.ts
rename to packages/debug/debug/src/debug.ts
diff --git a/packages/universal/debug/src/description/README.md b/packages/debug/debug/src/description/README.md
similarity index 100%
rename from packages/universal/debug/src/description/README.md
rename to packages/debug/debug/src/description/README.md
diff --git a/packages/universal/debug/src/description/debug/describe.ts b/packages/debug/debug/src/description/debug/describe.ts
similarity index 100%
rename from packages/universal/debug/src/description/debug/describe.ts
rename to packages/debug/debug/src/description/debug/describe.ts
diff --git a/packages/universal/debug/src/description/debug/description.ts b/packages/debug/debug/src/description/debug/description.ts
similarity index 100%
rename from packages/universal/debug/src/description/debug/description.ts
rename to packages/debug/debug/src/description/debug/description.ts
diff --git a/packages/universal/debug/src/description/debug/index.ts b/packages/debug/debug/src/description/debug/index.ts
similarity index 100%
rename from packages/universal/debug/src/description/debug/index.ts
rename to packages/debug/debug/src/description/debug/index.ts
diff --git a/packages/universal/debug/src/description/prod.ts b/packages/debug/debug/src/description/prod.ts
similarity index 100%
rename from packages/universal/debug/src/description/prod.ts
rename to packages/debug/debug/src/description/prod.ts
diff --git a/packages/universal/debug/src/logger.ts b/packages/debug/debug/src/logger.ts
similarity index 100%
rename from packages/universal/debug/src/logger.ts
rename to packages/debug/debug/src/logger.ts
diff --git a/packages/universal/debug/src/setup.ts b/packages/debug/debug/src/setup.ts
similarity index 100%
rename from packages/universal/debug/src/setup.ts
rename to packages/debug/debug/src/setup.ts
diff --git a/packages/universal/debug/src/tag.ts b/packages/debug/debug/src/tag.ts
similarity index 100%
rename from packages/universal/debug/src/tag.ts
rename to packages/debug/debug/src/tag.ts
diff --git a/packages/universal/debug/src/tree.ts b/packages/debug/debug/src/tree.ts
similarity index 100%
rename from packages/universal/debug/src/tree.ts
rename to packages/debug/debug/src/tree.ts
diff --git a/packages/universal/debug/stacktracey.tgz b/packages/debug/debug/stacktracey.tgz
similarity index 100%
rename from packages/universal/debug/stacktracey.tgz
rename to packages/debug/debug/stacktracey.tgz
diff --git a/packages/universal/debug/tests/.eslintrc.json b/packages/debug/debug/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/debug/tests/.eslintrc.json
rename to packages/debug/debug/tests/.eslintrc.json
diff --git a/packages/universal/runtime/.npmrc b/packages/debug/debug/tests/.npmrc
similarity index 100%
rename from packages/universal/runtime/.npmrc
rename to packages/debug/debug/tests/.npmrc
diff --git a/packages/universal/debug/tests/description.spec.ts b/packages/debug/debug/tests/description.spec.ts
similarity index 100%
rename from packages/universal/debug/tests/description.spec.ts
rename to packages/debug/debug/tests/description.spec.ts
diff --git a/packages/universal/debug/tests/node-inspect.spec.ts b/packages/debug/debug/tests/node-inspect.spec.ts
similarity index 100%
rename from packages/universal/debug/tests/node-inspect.spec.ts
rename to packages/debug/debug/tests/node-inspect.spec.ts
diff --git a/packages/universal/debug/tests/package.json b/packages/debug/debug/tests/package.json
similarity index 100%
rename from packages/universal/debug/tests/package.json
rename to packages/debug/debug/tests/package.json
diff --git a/packages/universal/debug/tests/stack.spec.ts b/packages/debug/debug/tests/stack.spec.ts
similarity index 100%
rename from packages/universal/debug/tests/stack.spec.ts
rename to packages/debug/debug/tests/stack.spec.ts
diff --git a/packages/universal/debug/tests/tree.spec.ts b/packages/debug/debug/tests/tree.spec.ts
similarity index 100%
rename from packages/universal/debug/tests/tree.spec.ts
rename to packages/debug/debug/tests/tree.spec.ts
diff --git a/packages/universal/reactive/tests/tsconfig.json b/packages/debug/debug/tests/tsconfig.json
similarity index 100%
rename from packages/universal/reactive/tests/tsconfig.json
rename to packages/debug/debug/tests/tsconfig.json
diff --git a/packages/universal/service/tsconfig.json b/packages/debug/debug/tsconfig.json
similarity index 100%
rename from packages/universal/service/tsconfig.json
rename to packages/debug/debug/tsconfig.json
diff --git a/packages/universal/runtime/tests/.eslintrc.json b/packages/debug/verify/.eslintrc.json
similarity index 100%
rename from packages/universal/runtime/tests/.eslintrc.json
rename to packages/debug/verify/.eslintrc.json
diff --git a/packages/universal/runtime/tests/.npmrc b/packages/debug/verify/.npmrc
similarity index 100%
rename from packages/universal/runtime/tests/.npmrc
rename to packages/debug/verify/.npmrc
diff --git a/packages/universal/verify/index.ts b/packages/debug/verify/index.ts
similarity index 100%
rename from packages/universal/verify/index.ts
rename to packages/debug/verify/index.ts
diff --git a/packages/universal/verify/package.json b/packages/debug/verify/package.json
similarity index 100%
rename from packages/universal/verify/package.json
rename to packages/debug/verify/package.json
diff --git a/packages/universal/service/rollup.config.mjs b/packages/debug/verify/rollup.config.mjs
similarity index 100%
rename from packages/universal/service/rollup.config.mjs
rename to packages/debug/verify/rollup.config.mjs
diff --git a/packages/universal/verify/src/assertions/basic.ts b/packages/debug/verify/src/assertions/basic.ts
similarity index 100%
rename from packages/universal/verify/src/assertions/basic.ts
rename to packages/debug/verify/src/assertions/basic.ts
diff --git a/packages/universal/verify/src/assertions/describe.ts b/packages/debug/verify/src/assertions/describe.ts
similarity index 100%
rename from packages/universal/verify/src/assertions/describe.ts
rename to packages/debug/verify/src/assertions/describe.ts
diff --git a/packages/universal/verify/src/assertions/multi.ts b/packages/debug/verify/src/assertions/multi.ts
similarity index 100%
rename from packages/universal/verify/src/assertions/multi.ts
rename to packages/debug/verify/src/assertions/multi.ts
diff --git a/packages/universal/verify/src/assertions/type-utils.ts b/packages/debug/verify/src/assertions/type-utils.ts
similarity index 100%
rename from packages/universal/verify/src/assertions/type-utils.ts
rename to packages/debug/verify/src/assertions/type-utils.ts
diff --git a/packages/universal/verify/src/assertions/types.ts b/packages/debug/verify/src/assertions/types.ts
similarity index 100%
rename from packages/universal/verify/src/assertions/types.ts
rename to packages/debug/verify/src/assertions/types.ts
diff --git a/packages/universal/verify/src/define.ts b/packages/debug/verify/src/define.ts
similarity index 100%
rename from packages/universal/verify/src/define.ts
rename to packages/debug/verify/src/define.ts
diff --git a/packages/universal/verify/src/verify.ts b/packages/debug/verify/src/verify.ts
similarity index 100%
rename from packages/universal/verify/src/verify.ts
rename to packages/debug/verify/src/verify.ts
diff --git a/packages/universal/service/.eslintrc.json b/packages/debug/verify/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/service/.eslintrc.json
rename to packages/debug/verify/tests/.eslintrc.json
diff --git a/packages/universal/service/.npmrc b/packages/debug/verify/tests/.npmrc
similarity index 100%
rename from packages/universal/service/.npmrc
rename to packages/debug/verify/tests/.npmrc
diff --git a/packages/universal/verify/tests/basic.spec.ts b/packages/debug/verify/tests/basic.spec.ts
similarity index 100%
rename from packages/universal/verify/tests/basic.spec.ts
rename to packages/debug/verify/tests/basic.spec.ts
diff --git a/packages/universal/verify/tests/messages.spec.ts b/packages/debug/verify/tests/messages.spec.ts
similarity index 100%
rename from packages/universal/verify/tests/messages.spec.ts
rename to packages/debug/verify/tests/messages.spec.ts
diff --git a/packages/universal/verify/tests/package.json b/packages/debug/verify/tests/package.json
similarity index 100%
rename from packages/universal/verify/tests/package.json
rename to packages/debug/verify/tests/package.json
diff --git a/packages/universal/verify/tests/support.ts b/packages/debug/verify/tests/support.ts
similarity index 100%
rename from packages/universal/verify/tests/support.ts
rename to packages/debug/verify/tests/support.ts
diff --git a/packages/universal/renderer/tests/tsconfig.json b/packages/debug/verify/tests/tsconfig.json
similarity index 100%
rename from packages/universal/renderer/tests/tsconfig.json
rename to packages/debug/verify/tests/tsconfig.json
diff --git a/packages/universal/verify/tests/verify.spec.ts b/packages/debug/verify/tests/verify.spec.ts
similarity index 100%
rename from packages/universal/verify/tests/verify.spec.ts
rename to packages/debug/verify/tests/verify.spec.ts
diff --git a/packages/universal/tags/tsconfig.json b/packages/debug/verify/tsconfig.json
similarity index 100%
rename from packages/universal/tags/tsconfig.json
rename to packages/debug/verify/tsconfig.json
diff --git a/packages/universal/service/tests/.eslintrc.json b/packages/universal-old/interfaces/.eslintrc.json
similarity index 100%
rename from packages/universal/service/tests/.eslintrc.json
rename to packages/universal-old/interfaces/.eslintrc.json
diff --git a/packages/universal/interfaces/.gitkeep b/packages/universal-old/interfaces/.gitkeep
similarity index 100%
rename from packages/universal/interfaces/.gitkeep
rename to packages/universal-old/interfaces/.gitkeep
diff --git a/packages/universal/service/tests/.npmrc b/packages/universal-old/interfaces/.npmrc
similarity index 100%
rename from packages/universal/service/tests/.npmrc
rename to packages/universal-old/interfaces/.npmrc
diff --git a/packages/universal/interfaces/index.ts b/packages/universal-old/interfaces/index.ts
similarity index 100%
rename from packages/universal/interfaces/index.ts
rename to packages/universal-old/interfaces/index.ts
diff --git a/packages/universal/interfaces/package.json b/packages/universal-old/interfaces/package.json
similarity index 100%
rename from packages/universal/interfaces/package.json
rename to packages/universal-old/interfaces/package.json
diff --git a/packages/universal/interfaces/src/debug/call-stack.ts b/packages/universal-old/interfaces/src/debug/call-stack.ts
similarity index 100%
rename from packages/universal/interfaces/src/debug/call-stack.ts
rename to packages/universal-old/interfaces/src/debug/call-stack.ts
diff --git a/packages/universal/interfaces/src/debug/debug-runtime.ts b/packages/universal-old/interfaces/src/debug/debug-runtime.ts
similarity index 100%
rename from packages/universal/interfaces/src/debug/debug-runtime.ts
rename to packages/universal-old/interfaces/src/debug/debug-runtime.ts
diff --git a/packages/universal/interfaces/src/debug/description.ts b/packages/universal-old/interfaces/src/debug/description.ts
similarity index 100%
rename from packages/universal/interfaces/src/debug/description.ts
rename to packages/universal-old/interfaces/src/debug/description.ts
diff --git a/packages/universal/interfaces/src/protocol.ts b/packages/universal-old/interfaces/src/protocol.ts
similarity index 100%
rename from packages/universal/interfaces/src/protocol.ts
rename to packages/universal-old/interfaces/src/protocol.ts
diff --git a/packages/universal/interfaces/src/runtime.ts b/packages/universal-old/interfaces/src/runtime.ts
similarity index 100%
rename from packages/universal/interfaces/src/runtime.ts
rename to packages/universal-old/interfaces/src/runtime.ts
diff --git a/packages/universal/interfaces/src/tag.ts b/packages/universal-old/interfaces/src/tag.ts
similarity index 100%
rename from packages/universal/interfaces/src/tag.ts
rename to packages/universal-old/interfaces/src/tag.ts
diff --git a/packages/universal/interfaces/src/tagged.ts b/packages/universal-old/interfaces/src/tagged.ts
similarity index 100%
rename from packages/universal/interfaces/src/tagged.ts
rename to packages/universal-old/interfaces/src/tagged.ts
diff --git a/packages/universal/interfaces/src/timestamp.ts b/packages/universal-old/interfaces/src/timestamp.ts
similarity index 100%
rename from packages/universal/interfaces/src/timestamp.ts
rename to packages/universal-old/interfaces/src/timestamp.ts
diff --git a/packages/universal/interfaces/src/utils.ts b/packages/universal-old/interfaces/src/utils.ts
similarity index 100%
rename from packages/universal/interfaces/src/utils.ts
rename to packages/universal-old/interfaces/src/utils.ts
diff --git a/packages/universal/interfaces/tsconfig.json b/packages/universal-old/interfaces/tsconfig.json
similarity index 100%
rename from packages/universal/interfaces/tsconfig.json
rename to packages/universal-old/interfaces/tsconfig.json
diff --git a/packages/universal/shared/.eslintrc.json b/packages/universal-old/shared/.eslintrc.json
similarity index 100%
rename from packages/universal/shared/.eslintrc.json
rename to packages/universal-old/shared/.eslintrc.json
diff --git a/packages/universal/shared/.npmrc b/packages/universal-old/shared/.npmrc
similarity index 100%
rename from packages/universal/shared/.npmrc
rename to packages/universal-old/shared/.npmrc
diff --git a/packages/universal/shared/README.md b/packages/universal-old/shared/README.md
similarity index 100%
rename from packages/universal/shared/README.md
rename to packages/universal-old/shared/README.md
diff --git a/packages/universal/shared/index.ts b/packages/universal-old/shared/index.ts
similarity index 100%
rename from packages/universal/shared/index.ts
rename to packages/universal-old/shared/index.ts
diff --git a/packages/universal/shared/package.json b/packages/universal-old/shared/package.json
similarity index 100%
rename from packages/universal/shared/package.json
rename to packages/universal-old/shared/package.json
diff --git a/packages/universal/shared/rollup.config.mjs b/packages/universal-old/shared/rollup.config.mjs
similarity index 100%
rename from packages/universal/shared/rollup.config.mjs
rename to packages/universal-old/shared/rollup.config.mjs
diff --git a/packages/universal/shared/src/constants.ts b/packages/universal-old/shared/src/constants.ts
similarity index 100%
rename from packages/universal/shared/src/constants.ts
rename to packages/universal-old/shared/src/constants.ts
diff --git a/packages/universal/shared/src/env.ts b/packages/universal-old/shared/src/env.ts
similarity index 100%
rename from packages/universal/shared/src/env.ts
rename to packages/universal-old/shared/src/env.ts
diff --git a/packages/universal/shared/src/id.ts b/packages/universal-old/shared/src/id.ts
similarity index 100%
rename from packages/universal/shared/src/id.ts
rename to packages/universal-old/shared/src/id.ts
diff --git a/packages/universal/shared/src/lifetimes.ts b/packages/universal-old/shared/src/lifetimes.ts
similarity index 100%
rename from packages/universal/shared/src/lifetimes.ts
rename to packages/universal-old/shared/src/lifetimes.ts
diff --git a/packages/universal/shared/src/now.ts b/packages/universal-old/shared/src/now.ts
similarity index 100%
rename from packages/universal/shared/src/now.ts
rename to packages/universal-old/shared/src/now.ts
diff --git a/packages/universal/shared/src/stack.ts b/packages/universal-old/shared/src/stack.ts
similarity index 100%
rename from packages/universal/shared/src/stack.ts
rename to packages/universal-old/shared/src/stack.ts
diff --git a/packages/universal/shared/src/testing.ts b/packages/universal-old/shared/src/testing.ts
similarity index 100%
rename from packages/universal/shared/src/testing.ts
rename to packages/universal-old/shared/src/testing.ts
diff --git a/packages/universal/shared/src/types.ts b/packages/universal-old/shared/src/types.ts
similarity index 100%
rename from packages/universal/shared/src/types.ts
rename to packages/universal-old/shared/src/types.ts
diff --git a/packages/universal/shared/tests/.eslintrc.json b/packages/universal-old/shared/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/shared/tests/.eslintrc.json
rename to packages/universal-old/shared/tests/.eslintrc.json
diff --git a/packages/universal/shared/tests/.npmrc b/packages/universal-old/shared/tests/.npmrc
similarity index 100%
rename from packages/universal/shared/tests/.npmrc
rename to packages/universal-old/shared/tests/.npmrc
diff --git a/packages/universal/shared/tests/constants.spec.ts b/packages/universal-old/shared/tests/constants.spec.ts
similarity index 100%
rename from packages/universal/shared/tests/constants.spec.ts
rename to packages/universal-old/shared/tests/constants.spec.ts
diff --git a/packages/universal/shared/tests/lifetime.spec.ts b/packages/universal-old/shared/tests/lifetime.spec.ts
similarity index 100%
rename from packages/universal/shared/tests/lifetime.spec.ts
rename to packages/universal-old/shared/tests/lifetime.spec.ts
diff --git a/packages/universal/shared/tests/now.spec.ts b/packages/universal-old/shared/tests/now.spec.ts
similarity index 100%
rename from packages/universal/shared/tests/now.spec.ts
rename to packages/universal-old/shared/tests/now.spec.ts
diff --git a/packages/universal/shared/tests/package.json b/packages/universal-old/shared/tests/package.json
similarity index 100%
rename from packages/universal/shared/tests/package.json
rename to packages/universal-old/shared/tests/package.json
diff --git a/packages/universal/shared/tests/stack.spec.ts b/packages/universal-old/shared/tests/stack.spec.ts
similarity index 100%
rename from packages/universal/shared/tests/stack.spec.ts
rename to packages/universal-old/shared/tests/stack.spec.ts
diff --git a/packages/universal/shared/tests/support/actions.ts b/packages/universal-old/shared/tests/support/actions.ts
similarity index 100%
rename from packages/universal/shared/tests/support/actions.ts
rename to packages/universal-old/shared/tests/support/actions.ts
diff --git a/packages/universal/shared/tests/support/gc.ts b/packages/universal-old/shared/tests/support/gc.ts
similarity index 100%
rename from packages/universal/shared/tests/support/gc.ts
rename to packages/universal-old/shared/tests/support/gc.ts
diff --git a/packages/universal/shared/tests/tsconfig.json b/packages/universal-old/shared/tests/tsconfig.json
similarity index 100%
rename from packages/universal/shared/tests/tsconfig.json
rename to packages/universal-old/shared/tests/tsconfig.json
diff --git a/packages/universal/shared/tsconfig.json b/packages/universal-old/shared/tsconfig.json
similarity index 100%
rename from packages/universal/shared/tsconfig.json
rename to packages/universal-old/shared/tsconfig.json
diff --git a/packages/universal/.gitignore b/packages/universal/.gitignore
deleted file mode 100644
index a8d01aea..00000000
--- a/packages/universal/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.js
-*.js.map
-*.jsx
-*.jsx.map
-*.d.ts
-*.d.ts.map
-!env.d.ts
-!interfaces/**/*.d.ts
diff --git a/packages/universal/core/index.ts b/packages/universal/core/index.ts
deleted file mode 100644
index 4385c715..00000000
--- a/packages/universal/core/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// eslint-disable-next-line no-console
-console.warn(
-  "WARNING: @starbeam/core has been renamed to @starbeam/universal. Please update your imports to refer to @starbeam/universal.",
-);
-export * from "@starbeam/universal";
diff --git a/packages/universal/core/package.json b/packages/universal/core/package.json
deleted file mode 100644
index 5c8fd482..00000000
--- a/packages/universal/core/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "name": "@starbeam/core",
-  "type": "module",
-  "version": "0.8.9",
-  "main": "index.ts",
-  "types": "index.ts",
-  "exports": {
-    "default": "./index.ts"
-  },
-  "publishConfig": {
-    "exports": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.cjs"
-    },
-    "main": "dist/index.cjs",
-    "types": "dist/index.d.ts"
-  },
-  "starbeam": {
-    "type": "library:public"
-  },
-  "scripts": {
-    "build": "rollup -c",
-    "prepack": "pnpm build",
-    "test:lint": "eslint . --max-warnings 0",
-    "test:types": "tsc -b"
-  },
-  "dependencies": {
-    "@starbeam/universal": "workspace:^"
-  },
-  "devDependencies": {
-    "@starbeam-dev/compile": "^1.1.0",
-    "@starbeam-dev/eslint-plugin": "^1.0.4",
-    "rollup": "^4.0.2"
-  },
-  "files": [
-    "dist",
-    "README.md",
-    "CHANGELOG.md",
-    "LICENSE.md"
-  ]
-}
diff --git a/packages/universal/core/tsconfig.json b/packages/universal/core/tsconfig.json
deleted file mode 100644
index 5a2e750c..00000000
--- a/packages/universal/core/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "../../../.config/tsconfig/tsconfig.shared.json",
-  "compilerOptions": {
-    "composite": true,
-    "types": ["node", "../../env.d.ts", "vite"],
-    "declaration": true,
-    "declarationDir": "../../../dist/types",
-    "declarationMap": true,
-    "emitDeclarationOnly": true
-  },
-  "exclude": ["dist/**/*"]
-}
diff --git a/packages/universal/debug/tests/CHANGELOG.md b/packages/universal/debug/tests/CHANGELOG.md
deleted file mode 100644
index 4d9dce14..00000000
--- a/packages/universal/debug/tests/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# @starbeam-tests/debug
-
-### Patch Changes
-
-- Updated dependencies [2a957e5]
-- Updated dependencies [e03c2a0]
-  - @starbeam/debug@0.5.1
diff --git a/packages/universal/interfaces/CHANGELOG.md b/packages/universal/interfaces/CHANGELOG.md
deleted file mode 100644
index 17ae4144..00000000
--- a/packages/universal/interfaces/CHANGELOG.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# @starbeam/interfaces
-
-## 0.8.9
-
-### Patch Changes
-
-- e459bf2: Fix CJS builds
-- Updated dependencies [e459bf2]
-  - @starbeam/shared@1.3.7
-
-## 0.8.8
-
-### Patch Changes
-
-- 2a1f728: Improve @starbeam/react
-- Updated dependencies [2a1f728]
-  - @starbeam/shared@1.3.6
-
-## 0.8.7
-
-### Patch Changes
-
-- 14f961b: Fixes #75
-- Updated dependencies [14f961b]
-  - @starbeam/shared@1.3.5
-
-## 0.8.7
-
-### Patch Changes
-
-- ded6421: Add /setup to preact
-- Updated dependencies [ded6421]
-  - @starbeam/shared@1.3.4
-
-## 0.8.6
-
-### Patch Changes
-
-- 6502cc7: Remove errant import
-- Updated dependencies [6502cc7]
-  - @starbeam/shared@1.3.3
-
-## 0.8.5
-
-### Patch Changes
-
-- de755c6: Improve type inference
-- Updated dependencies [de755c6]
-  - @starbeam/shared@1.3.2
-
-## 0.8.4
-
-### Patch Changes
-
-- 3bf1221: Prepare for Starbeam 0.8.4
-- Updated dependencies [3bf1221]
-  - @starbeam/shared@1.3.1
-  - @domtree/any@0.9.3
-
-## 0.9.0
-
-### Minor Changes
-
-- e65fd4f: Fix interfaces
-
-## 0.8.0
-
-### Minor Changes
-
-- 1a553c5: Prepare for 0.8
-
-### Patch Changes
-
-- Updated dependencies [1a553c5]
-  - @starbeam/shared@1.3.0
-  - @domtree/any@0.9.2
-
-## 0.7.3
-
-### Patch Changes
-
-- 40844fd: Try to fix the build
-- Updated dependencies [40844fd]
-  - @domtree/any@0.9.1
-  - @starbeam/shared@1.2.2
-
-## 0.7.2
-
-### Patch Changes
-
-- 50f7a8f: Publish @domtree
-- Updated dependencies [50f7a8f]
-  - @domtree/any@0.9.1
-  - @starbeam/shared@1.2.1
-
-## 0.7.1
-
-### Patch Changes
-
-- 4501b1f: Publish the @domtree packages
-- Updated dependencies [4501b1f]
-  - @domtree/any@0.9.1
-
-## 0.7.0
-
-### Minor Changes
-
-- 58f7974: Starbeam 0.7.0
-
-  - Significant improvements to debugging infrastructure
-
-### Patch Changes
-
-- Updated dependencies [58f7974]
-  - @starbeam/shared@1.2.0
diff --git a/packages/universal/renderer/tests/CHANGELOG.md b/packages/universal/renderer/tests/CHANGELOG.md
deleted file mode 100644
index 8ff5d6d3..00000000
--- a/packages/universal/renderer/tests/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# @starbeam-tests/core-utils
-
-### Patch Changes
-
-- Updated dependencies [2a957e5]
-- Updated dependencies [e03c2a0]
-  - @starbeam/core-utils@0.5.1
diff --git a/packages/universal/runtime/tests/CHANGELOG.md b/packages/universal/runtime/tests/CHANGELOG.md
deleted file mode 100644
index 6d76de34..00000000
--- a/packages/universal/runtime/tests/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# @starbeam-tests/timeline
-
-### Patch Changes
-
-- Updated dependencies [2a957e5]
-- Updated dependencies [e03c2a0]
-  - @starbeam/timeline@0.5.1
diff --git a/packages/universal/shared/tests/CHANGELOG.md b/packages/universal/shared/tests/CHANGELOG.md
deleted file mode 100644
index 78c96bee..00000000
--- a/packages/universal/shared/tests/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# @starbeam-tests/peer
-
-### Patch Changes
-
-- Updated dependencies [2a957e5]
-- Updated dependencies [e03c2a0]
-  - @starbeam/shared@1.0.1
diff --git a/packages/universal/verify/rollup.config.mjs b/packages/universal/verify/rollup.config.mjs
deleted file mode 100644
index d61f91e9..00000000
--- a/packages/universal/verify/rollup.config.mjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import { compile } from "@starbeam-dev/compile";
-
-export default compile(import.meta);
diff --git a/packages/universal/verify/tests/.eslintrc.json b/packages/universal/verify/tests/.eslintrc.json
deleted file mode 100644
index cfc984ce..00000000
--- a/packages/universal/verify/tests/.eslintrc.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "root": true,
-  "extends": ["plugin:@starbeam-dev/library:recommended"]
-}
diff --git a/packages/universal/verify/tests/.npmrc b/packages/universal/verify/tests/.npmrc
deleted file mode 100644
index aed5b2b6..00000000
--- a/packages/universal/verify/tests/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-auto-install-peers=true
-strict-peer-dependencies=true
diff --git a/packages/universal/verify/tests/CHANGELOG.md b/packages/universal/verify/tests/CHANGELOG.md
deleted file mode 100644
index 372f974d..00000000
--- a/packages/universal/verify/tests/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# @starbeam-tests/verify
-
-### Patch Changes
-
-- Updated dependencies [2a957e5]
-- Updated dependencies [e03c2a0]
-  - @starbeam/verify@0.5.1
diff --git a/packages/universal/tags/.eslintrc.json b/packages/x/renderer/.eslintrc.json
similarity index 100%
rename from packages/universal/tags/.eslintrc.json
rename to packages/x/renderer/.eslintrc.json
diff --git a/packages/universal/tags/.npmrc b/packages/x/renderer/.npmrc
similarity index 100%
rename from packages/universal/tags/.npmrc
rename to packages/x/renderer/.npmrc
diff --git a/packages/universal/renderer/README.md b/packages/x/renderer/README.md
similarity index 100%
rename from packages/universal/renderer/README.md
rename to packages/x/renderer/README.md
diff --git a/packages/universal/renderer/index.ts b/packages/x/renderer/index.ts
similarity index 100%
rename from packages/universal/renderer/index.ts
rename to packages/x/renderer/index.ts
diff --git a/packages/universal/renderer/package.json b/packages/x/renderer/package.json
similarity index 100%
rename from packages/universal/renderer/package.json
rename to packages/x/renderer/package.json
diff --git a/packages/universal/tags/rollup.config.mjs b/packages/x/renderer/rollup.config.mjs
similarity index 100%
rename from packages/universal/tags/rollup.config.mjs
rename to packages/x/renderer/rollup.config.mjs
diff --git a/packages/universal/renderer/src/renderer.ts b/packages/x/renderer/src/renderer.ts
similarity index 100%
rename from packages/universal/renderer/src/renderer.ts
rename to packages/x/renderer/src/renderer.ts
diff --git a/packages/universal/renderer/src/resource.ts b/packages/x/renderer/src/resource.ts
similarity index 100%
rename from packages/universal/renderer/src/resource.ts
rename to packages/x/renderer/src/resource.ts
diff --git a/packages/universal/verify/.eslintrc.json b/packages/x/renderer/tests/.eslintrc.json
similarity index 100%
rename from packages/universal/verify/.eslintrc.json
rename to packages/x/renderer/tests/.eslintrc.json
diff --git a/packages/universal/verify/.npmrc b/packages/x/renderer/tests/.npmrc
similarity index 100%
rename from packages/universal/verify/.npmrc
rename to packages/x/renderer/tests/.npmrc
diff --git a/packages/universal/renderer/tests/package.json b/packages/x/renderer/tests/package.json
similarity index 100%
rename from packages/universal/renderer/tests/package.json
rename to packages/x/renderer/tests/package.json
diff --git a/packages/universal/renderer/tests/smoke.spec.ts b/packages/x/renderer/tests/smoke.spec.ts
similarity index 100%
rename from packages/universal/renderer/tests/smoke.spec.ts
rename to packages/x/renderer/tests/smoke.spec.ts
diff --git a/packages/universal/verify/tests/tsconfig.json b/packages/x/renderer/tests/tsconfig.json
similarity index 100%
rename from packages/universal/verify/tests/tsconfig.json
rename to packages/x/renderer/tests/tsconfig.json
diff --git a/packages/universal/verify/tsconfig.json b/packages/x/renderer/tsconfig.json
similarity index 100%
rename from packages/universal/verify/tsconfig.json
rename to packages/x/renderer/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 86326667..802276a0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -745,24 +745,9 @@ importers:
 
   packages/universal/debug:
     dependencies:
-      '@starbeam/core-utils':
-        specifier: workspace:^
-        version: link:../core-utils
-      '@starbeam/interfaces':
-        specifier: workspace:^
-        version: link:../interfaces
-      '@starbeam/reactive':
-        specifier: workspace:^
-        version: link:../reactive
       '@starbeam/shared':
         specifier: workspace:^
         version: link:../shared
-      '@starbeam/tags':
-        specifier: workspace:^
-        version: link:../tags
-      '@starbeam/verify':
-        specifier: workspace:^
-        version: link:../verify
       buffer:
         specifier: ^6.0.3
         version: 6.0.3