diff --git a/packages/app/zeichen.config.ts b/packages/app/zeichen.config.ts
index 8fbd779..bbe8211 100644
--- a/packages/app/zeichen.config.ts
+++ b/packages/app/zeichen.config.ts
@@ -1,5 +1,5 @@
-import LocalStorage from '../plugin-local-storage'
-import RemoteStorage from '../plugin-remote-storage'
+import LocalStorage from '../plugin-local-storage/src'
+import RemoteStorage from '../plugin-remote-storage/src'
 
 export default {
   plugins: [
diff --git a/packages/core/plugin.ts b/packages/core/src/plugin.ts
similarity index 100%
rename from packages/core/plugin.ts
rename to packages/core/src/plugin.ts
diff --git a/packages/core/storage.ts b/packages/core/src/storage.ts
similarity index 100%
rename from packages/core/storage.ts
rename to packages/core/src/storage.ts
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index 8db471b..2c4714d 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -12,7 +12,6 @@
     "forceConsistentCasingInFileNames": true,
     "module": "esnext",
     "moduleResolution": "node",
-    "isolatedModules": true,
     "declaration": true,
     "declarationDir": "./dist",
     "emitDeclarationOnly": true,
diff --git a/packages/plugin-local-storage/Engine.ts b/packages/plugin-local-storage/src/Engine.ts
similarity index 100%
rename from packages/plugin-local-storage/Engine.ts
rename to packages/plugin-local-storage/src/Engine.ts
diff --git a/packages/plugin-local-storage/Storage.ts b/packages/plugin-local-storage/src/Storage.ts
similarity index 95%
rename from packages/plugin-local-storage/Storage.ts
rename to packages/plugin-local-storage/src/Storage.ts
index ae254a5..62bd7df 100644
--- a/packages/plugin-local-storage/Storage.ts
+++ b/packages/plugin-local-storage/src/Storage.ts
@@ -1,4 +1,4 @@
-import Storage, { Collection, OutOfSyncError } from '../core/storage'
+import Storage, { Collection, OutOfSyncError } from '../../core/src/storage'
 import Engine from './Engine'
 
 export default class LocalStorage<T> implements Storage<T> {
diff --git a/packages/plugin-local-storage/index.ts b/packages/plugin-local-storage/src/index.ts
similarity index 84%
rename from packages/plugin-local-storage/index.ts
rename to packages/plugin-local-storage/src/index.ts
index dabc2b5..e25e74d 100644
--- a/packages/plugin-local-storage/index.ts
+++ b/packages/plugin-local-storage/src/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '../core/plugin'
+import { Plugin } from '../../core/src/plugin'
 import Storage from './Storage'
 
 type PluginConfig = {}
diff --git a/packages/plugin-local-storage/tsconfig.json b/packages/plugin-local-storage/tsconfig.json
index 8db471b..18c72e3 100644
--- a/packages/plugin-local-storage/tsconfig.json
+++ b/packages/plugin-local-storage/tsconfig.json
@@ -12,10 +12,8 @@
     "forceConsistentCasingInFileNames": true,
     "module": "esnext",
     "moduleResolution": "node",
-    "isolatedModules": true,
     "declaration": true,
     "declarationDir": "./dist",
-    "emitDeclarationOnly": true,
     "sourceMap": true,
     "strict": false
   },
diff --git a/packages/plugin-remote-storage/Engine.ts b/packages/plugin-remote-storage/src/Engine.ts
similarity index 97%
rename from packages/plugin-remote-storage/Engine.ts
rename to packages/plugin-remote-storage/src/Engine.ts
index 13124b6..c094f9e 100644
--- a/packages/plugin-remote-storage/Engine.ts
+++ b/packages/plugin-remote-storage/src/Engine.ts
@@ -1,4 +1,4 @@
-import { Deserializer, Serializer } from '../core/storage'
+import { Deserializer, Serializer } from '../../core/src/storage'
 
 const CREATED = 201
 const NO_CONTENT = 204
diff --git a/packages/plugin-remote-storage/Storage.ts b/packages/plugin-remote-storage/src/Storage.ts
similarity index 91%
rename from packages/plugin-remote-storage/Storage.ts
rename to packages/plugin-remote-storage/src/Storage.ts
index c02f0cf..a9a37f1 100644
--- a/packages/plugin-remote-storage/Storage.ts
+++ b/packages/plugin-remote-storage/src/Storage.ts
@@ -1,4 +1,4 @@
-import Storage, { Collection } from '../core/storage'
+import Storage, { Collection } from '../../core/src/storage'
 import Engine from './Engine'
 
 export default class RemoteStorage<T> implements Storage<T> {
diff --git a/packages/plugin-remote-storage/index.ts b/packages/plugin-remote-storage/src/index.ts
similarity index 86%
rename from packages/plugin-remote-storage/index.ts
rename to packages/plugin-remote-storage/src/index.ts
index d2d3dcf..873b4d5 100644
--- a/packages/plugin-remote-storage/index.ts
+++ b/packages/plugin-remote-storage/src/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '../core/plugin'
+import { Plugin } from '../../core/src/plugin'
 import Storage from './Storage'
 
 type PluginConfig = {
diff --git a/packages/plugin-remote-storage/tsconfig.json b/packages/plugin-remote-storage/tsconfig.json
index 8db471b..18c72e3 100644
--- a/packages/plugin-remote-storage/tsconfig.json
+++ b/packages/plugin-remote-storage/tsconfig.json
@@ -12,10 +12,8 @@
     "forceConsistentCasingInFileNames": true,
     "module": "esnext",
     "moduleResolution": "node",
-    "isolatedModules": true,
     "declaration": true,
     "declarationDir": "./dist",
-    "emitDeclarationOnly": true,
     "sourceMap": true,
     "strict": false
   },