diff --git a/__tests__/Collection.spec.ts b/packages/signaldb/__tests__/Collection.spec.ts
similarity index 99%
rename from __tests__/Collection.spec.ts
rename to packages/signaldb/__tests__/Collection.spec.ts
index 32bc9638..399c99b2 100644
--- a/__tests__/Collection.spec.ts
+++ b/packages/signaldb/__tests__/Collection.spec.ts
@@ -1,5 +1,5 @@
 import { vi, beforeEach, describe, it, expect } from 'vitest'
-import { Collection, createMemoryAdapter, createIndex } from 'signaldb'
+import { Collection, createMemoryAdapter, createIndex } from '../src'
 
 describe('Collection', () => {
   let collection: Collection<{ id: string, name: string }>
diff --git a/__tests__/Cursor.spec.ts b/packages/signaldb/__tests__/Cursor.spec.ts
similarity index 99%
rename from __tests__/Cursor.spec.ts
rename to packages/signaldb/__tests__/Cursor.spec.ts
index d7ed78c4..01bc16d8 100644
--- a/__tests__/Cursor.spec.ts
+++ b/packages/signaldb/__tests__/Cursor.spec.ts
@@ -1,6 +1,6 @@
 import { vi, describe, it, expect } from 'vitest'
-import type { ObserveCallbacks, Transform } from 'signaldb'
-import { Collection } from 'signaldb'
+import type { ObserveCallbacks, Transform } from '../src'
+import { Collection } from '../src'
 
 // Helper function to wait for async operations
 const wait = () => new Promise((resolve) => { setImmediate(resolve) })
diff --git a/__tests__/PersistentCollection.client.spec.ts b/packages/signaldb/__tests__/PersistentCollection.client.spec.ts
similarity index 93%
rename from __tests__/PersistentCollection.client.spec.ts
rename to packages/signaldb/__tests__/PersistentCollection.client.spec.ts
index 75cae3ee..09378f2f 100644
--- a/__tests__/PersistentCollection.client.spec.ts
+++ b/packages/signaldb/__tests__/PersistentCollection.client.spec.ts
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 import { describe, it, expect } from 'vitest'
-import { PersistentCollection } from 'signaldb'
+import { PersistentCollection } from '../src'
 import waitForEvent from './helpers/waitForEvent'
 
 describe('PersistentCollection', () => {
diff --git a/__tests__/PersistentCollection.spec.ts b/packages/signaldb/__tests__/PersistentCollection.spec.ts
similarity index 94%
rename from __tests__/PersistentCollection.spec.ts
rename to packages/signaldb/__tests__/PersistentCollection.spec.ts
index 363a5832..ef542c4d 100644
--- a/__tests__/PersistentCollection.spec.ts
+++ b/packages/signaldb/__tests__/PersistentCollection.spec.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import { describe, it, expect } from 'vitest'
-import { PersistentCollection } from 'signaldb'
+import { PersistentCollection } from '../src'
 import waitForEvent from './helpers/waitForEvent'
 
 describe('PersistentCollection', () => {
diff --git a/__tests__/Queries.spec.ts b/packages/signaldb/__tests__/Queries.spec.ts
similarity index 99%
rename from __tests__/Queries.spec.ts
rename to packages/signaldb/__tests__/Queries.spec.ts
index 62546871..87052491 100644
--- a/__tests__/Queries.spec.ts
+++ b/packages/signaldb/__tests__/Queries.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest'
-import { Collection } from 'signaldb'
+import { Collection } from '../src'
 
 describe('Queries', () => {
   // thanks to https://github.com/meteor/meteor/blob/devel/packages/minimongo/minimongo_tests_client.js
diff --git a/__tests__/helpers/waitForEvent.spec.ts b/packages/signaldb/__tests__/helpers/waitForEvent.spec.ts
similarity index 100%
rename from __tests__/helpers/waitForEvent.spec.ts
rename to packages/signaldb/__tests__/helpers/waitForEvent.spec.ts
diff --git a/__tests__/helpers/waitForEvent.ts b/packages/signaldb/__tests__/helpers/waitForEvent.ts
similarity index 100%
rename from __tests__/helpers/waitForEvent.ts
rename to packages/signaldb/__tests__/helpers/waitForEvent.ts
diff --git a/__tests__/persistence.client.spec.ts b/packages/signaldb/__tests__/persistence.client.spec.ts
similarity index 98%
rename from __tests__/persistence.client.spec.ts
rename to packages/signaldb/__tests__/persistence.client.spec.ts
index c0c4881f..c4b61018 100644
--- a/__tests__/persistence.client.spec.ts
+++ b/packages/signaldb/__tests__/persistence.client.spec.ts
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 import { describe, it, expect } from 'vitest'
-import { Collection, createLocalStorageAdapter } from 'signaldb'
+import { Collection, createLocalStorageAdapter } from '../src'
 import waitForEvent from './helpers/waitForEvent'
 
 const persistence = createLocalStorageAdapter('test')
diff --git a/__tests__/persistence.spec.ts b/packages/signaldb/__tests__/persistence.spec.ts
similarity index 99%
rename from __tests__/persistence.spec.ts
rename to packages/signaldb/__tests__/persistence.spec.ts
index f270de1c..b6ce73aa 100644
--- a/__tests__/persistence.spec.ts
+++ b/packages/signaldb/__tests__/persistence.spec.ts
@@ -1,7 +1,7 @@
 import fs from 'fs/promises'
 import { describe, it, expect, vi } from 'vitest'
-import type { PersistenceAdapter } from 'signaldb'
-import { Collection, createFilesystemAdapter } from 'signaldb'
+import type { PersistenceAdapter } from '../src'
+import { Collection, createFilesystemAdapter } from '../src'
 import waitForEvent from './helpers/waitForEvent'
 
 // eslint-disable-next-line max-len
diff --git a/__tests__/reactivity/maverick-js.spec.ts b/packages/signaldb/__tests__/reactivity/maverick-js.spec.ts
similarity index 94%
rename from __tests__/reactivity/maverick-js.spec.ts
rename to packages/signaldb/__tests__/reactivity/maverick-js.spec.ts
index 06836ef1..d0700c6c 100644
--- a/__tests__/reactivity/maverick-js.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/maverick-js.spec.ts
@@ -7,7 +7,7 @@ import {
   getScope,
   onDispose,
 } from '@maverick-js/signals'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('@maverick-js/signals', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/mobx.spec.ts b/packages/signaldb/__tests__/reactivity/mobx.spec.ts
similarity index 94%
rename from __tests__/reactivity/mobx.spec.ts
rename to packages/signaldb/__tests__/reactivity/mobx.spec.ts
index 032b5037..0643bee7 100644
--- a/__tests__/reactivity/mobx.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/mobx.spec.ts
@@ -5,7 +5,7 @@ import {
   runInAction,
   onBecomeUnobserved,
 } from 'mobx'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('MobX', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/oby.spec.ts b/packages/signaldb/__tests__/reactivity/oby.spec.ts
similarity index 94%
rename from __tests__/reactivity/oby.spec.ts
rename to packages/signaldb/__tests__/reactivity/oby.spec.ts
index 65e32b0e..ab87c416 100644
--- a/__tests__/reactivity/oby.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/oby.spec.ts
@@ -6,7 +6,7 @@ import $oby, {
   owner,
   tick,
 } from 'oby'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('oby', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/preact.spec.ts b/packages/signaldb/__tests__/reactivity/preact.spec.ts
similarity index 94%
rename from __tests__/reactivity/preact.spec.ts
rename to packages/signaldb/__tests__/reactivity/preact.spec.ts
index 7ac1ffe3..75fccdbb 100644
--- a/__tests__/reactivity/preact.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/preact.spec.ts
@@ -1,6 +1,6 @@
 import { vi, describe, it, expect } from 'vitest'
 import { signal, effect } from '@preact/signals-core'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('preact', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/reactively.spec.ts b/packages/signaldb/__tests__/reactivity/reactively.spec.ts
similarity index 94%
rename from __tests__/reactivity/reactively.spec.ts
rename to packages/signaldb/__tests__/reactivity/reactively.spec.ts
index 5887f58d..dfd23c00 100644
--- a/__tests__/reactivity/reactively.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/reactively.spec.ts
@@ -1,6 +1,6 @@
 import { vi, describe, it, expect } from 'vitest'
 import { reactive, onCleanup } from '@reactively/core'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('@reactively/core', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/s-js.spec.ts b/packages/signaldb/__tests__/reactivity/s-js.spec.ts
similarity index 93%
rename from __tests__/reactivity/s-js.spec.ts
rename to packages/signaldb/__tests__/reactivity/s-js.spec.ts
index e025577f..042b1362 100644
--- a/__tests__/reactivity/s-js.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/s-js.spec.ts
@@ -1,6 +1,6 @@
 import { vi, describe, it, expect } from 'vitest'
 import S from 's-js'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('S.js', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/sinuous.spec.ts b/packages/signaldb/__tests__/reactivity/sinuous.spec.ts
similarity index 93%
rename from __tests__/reactivity/sinuous.spec.ts
rename to packages/signaldb/__tests__/reactivity/sinuous.spec.ts
index 90ab74d9..0b192e3f 100644
--- a/__tests__/reactivity/sinuous.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/sinuous.spec.ts
@@ -3,7 +3,7 @@ import {
   observable,
   api,
 } from 'sinuous'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('sinuous', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/solid-js.spec.ts b/packages/signaldb/__tests__/reactivity/solid-js.spec.ts
similarity index 95%
rename from __tests__/reactivity/solid-js.spec.ts
rename to packages/signaldb/__tests__/reactivity/solid-js.spec.ts
index f50f3d78..e1c30155 100644
--- a/__tests__/reactivity/solid-js.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/solid-js.spec.ts
@@ -8,7 +8,7 @@ import {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
 } from 'solid-js/dist/solid'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('solid', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/tracker.spec.ts b/packages/signaldb/__tests__/reactivity/tracker.spec.ts
similarity index 96%
rename from __tests__/reactivity/tracker.spec.ts
rename to packages/signaldb/__tests__/reactivity/tracker.spec.ts
index a766e727..d013d22d 100644
--- a/__tests__/reactivity/tracker.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/tracker.spec.ts
@@ -1,6 +1,6 @@
 import { vi, describe, it, expect } from 'vitest'
 import { Tracker } from 'meteor-ts-tracker'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('Tracker', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/usignal.spec.ts b/packages/signaldb/__tests__/reactivity/usignal.spec.ts
similarity index 94%
rename from __tests__/reactivity/usignal.spec.ts
rename to packages/signaldb/__tests__/reactivity/usignal.spec.ts
index 702a7e3a..d6995d64 100644
--- a/__tests__/reactivity/usignal.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/usignal.spec.ts
@@ -3,7 +3,7 @@ import {
   signal,
   effect,
 } from 'usignal'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('usignal', () => {
   const reactivity = createReactivityAdapter({
diff --git a/__tests__/reactivity/vue.spec.ts b/packages/signaldb/__tests__/reactivity/vue.spec.ts
similarity index 95%
rename from __tests__/reactivity/vue.spec.ts
rename to packages/signaldb/__tests__/reactivity/vue.spec.ts
index f37943ef..42c256c1 100644
--- a/__tests__/reactivity/vue.spec.ts
+++ b/packages/signaldb/__tests__/reactivity/vue.spec.ts
@@ -8,7 +8,7 @@ import {
   nextTick as vueNextTick,
   effectScope as vueEffectScope,
 } from 'vue'
-import { Collection, createReactivityAdapter } from 'signaldb'
+import { Collection, createReactivityAdapter } from '../../src'
 
 describe('Vue.js', () => {
   const reactivity = createReactivityAdapter({