diff --git a/packages/metamigo-common/config/app-meta.ts b/packages/metamigo-common/src/config/app-meta.ts
similarity index 100%
rename from packages/metamigo-common/config/app-meta.ts
rename to packages/metamigo-common/src/config/app-meta.ts
diff --git a/packages/metamigo-common/config/auth.ts b/packages/metamigo-common/src/config/auth.ts
similarity index 100%
rename from packages/metamigo-common/config/auth.ts
rename to packages/metamigo-common/src/config/auth.ts
diff --git a/packages/metamigo-common/config/cors.ts b/packages/metamigo-common/src/config/cors.ts
similarity index 100%
rename from packages/metamigo-common/config/cors.ts
rename to packages/metamigo-common/src/config/cors.ts
diff --git a/packages/metamigo-common/config/formats.ts b/packages/metamigo-common/src/config/formats.ts
similarity index 100%
rename from packages/metamigo-common/config/formats.ts
rename to packages/metamigo-common/src/config/formats.ts
diff --git a/packages/metamigo-common/config/generate.ts b/packages/metamigo-common/src/config/generate.ts
similarity index 100%
rename from packages/metamigo-common/config/generate.ts
rename to packages/metamigo-common/src/config/generate.ts
diff --git a/packages/metamigo-common/config/index.ts b/packages/metamigo-common/src/config/index.ts
similarity index 100%
rename from packages/metamigo-common/config/index.ts
rename to packages/metamigo-common/src/config/index.ts
diff --git a/packages/metamigo-common/config/logging.ts b/packages/metamigo-common/src/config/logging.ts
similarity index 100%
rename from packages/metamigo-common/config/logging.ts
rename to packages/metamigo-common/src/config/logging.ts
diff --git a/packages/metamigo-common/config/metrics-server.ts b/packages/metamigo-common/src/config/metrics-server.ts
similarity index 100%
rename from packages/metamigo-common/config/metrics-server.ts
rename to packages/metamigo-common/src/config/metrics-server.ts
diff --git a/packages/metamigo-common/config/print.ts b/packages/metamigo-common/src/config/print.ts
similarity index 100%
rename from packages/metamigo-common/config/print.ts
rename to packages/metamigo-common/src/config/print.ts
diff --git a/packages/metamigo-common/config/server.ts b/packages/metamigo-common/src/config/server.ts
similarity index 100%
rename from packages/metamigo-common/config/server.ts
rename to packages/metamigo-common/src/config/server.ts
diff --git a/packages/metamigo-common/config/types.ts b/packages/metamigo-common/src/config/types.ts
similarity index 100%
rename from packages/metamigo-common/config/types.ts
rename to packages/metamigo-common/src/config/types.ts
diff --git a/packages/metamigo-common/controllers/crud-controller.ts b/packages/metamigo-common/src/controllers/crud-controller.ts
similarity index 99%
rename from packages/metamigo-common/controllers/crud-controller.ts
rename to packages/metamigo-common/src/controllers/crud-controller.ts
index bb0e3f0..d8f2fb0 100644
--- a/packages/metamigo-common/controllers/crud-controller.ts
+++ b/packages/metamigo-common/src/controllers/crud-controller.ts
@@ -42,7 +42,6 @@ export abstract class AbstractCrudController<
   abstract recordType: PgRecordInfo<TUnsavedR, TSavedR, IdKeyT>;
 
   repo(request: Hapi.Request): CrudRepository<TUnsavedR, TSavedR, IdKeyT> {
-    // @ts-expect-error
     const db = request[this.dbDecoration];
     if (!db)
       throw Boom.badImplementation(
@@ -128,7 +127,6 @@ export abstract class AbstractCrudController<
   ): Promise<any> => {
     try {
       const id: IdKeyT = request.params[this.paramsIdField];
-      // @ts-expect-error
       const row: TSavedR = await this.repo(request).findById(id);
 
       if (!row) {
diff --git a/packages/metamigo-common/controllers/nextauth-adapter.ts b/packages/metamigo-common/src/controllers/nextauth-adapter.ts
similarity index 99%
rename from packages/metamigo-common/controllers/nextauth-adapter.ts
rename to packages/metamigo-common/src/controllers/nextauth-adapter.ts
index 55c3fb4..fe5cf8d 100644
--- a/packages/metamigo-common/controllers/nextauth-adapter.ts
+++ b/packages/metamigo-common/src/controllers/nextauth-adapter.ts
@@ -75,7 +75,6 @@ export class NextAuthAdapter<TRepositories extends IMetamigoRepositories>
     return this.repos.users.update(user);
   }
 
-  // @ts-expect-error
   async linkAccount(
     userId: string,
     providerId: string,
@@ -121,7 +120,6 @@ export class NextAuthAdapter<TRepositories extends IMetamigoRepositories>
     }
 
     const session: UnsavedSession = {
-      // @ts-expect-error
       expires,
       userId: user.id,
       sessionToken: randomToken(),
diff --git a/packages/metamigo-common/db/types.ts b/packages/metamigo-common/src/db/types.ts
similarity index 100%
rename from packages/metamigo-common/db/types.ts
rename to packages/metamigo-common/src/db/types.ts
diff --git a/packages/metamigo-common/hapi.ts b/packages/metamigo-common/src/hapi.ts
similarity index 100%
rename from packages/metamigo-common/hapi.ts
rename to packages/metamigo-common/src/hapi.ts
diff --git a/packages/metamigo-common/helpers/index.ts b/packages/metamigo-common/src/helpers/index.ts
similarity index 91%
rename from packages/metamigo-common/helpers/index.ts
rename to packages/metamigo-common/src/helpers/index.ts
index ba87721..b6a4e3a 100644
--- a/packages/metamigo-common/helpers/index.ts
+++ b/packages/metamigo-common/src/helpers/index.ts
@@ -28,14 +28,10 @@ export const deepFreeze = (o: unknown): any => {
       (oIsFunction
         ? prop !== "caller" && prop !== "callee" && prop !== "arguments"
         : true) &&
-      // @ts-expect-error
       o[prop] !== null &&
-      // @ts-expect-error
       (typeof o[prop] === "object" || typeof o[prop] === "function") &&
-      // @ts-expect-error
       !Object.isFrozen(o[prop])
     ) {
-      // @ts-expect-error
       deepFreeze(o[prop]);
     }
   });
diff --git a/packages/metamigo-common/helpers/response.ts b/packages/metamigo-common/src/helpers/response.ts
similarity index 100%
rename from packages/metamigo-common/helpers/response.ts
rename to packages/metamigo-common/src/helpers/response.ts
diff --git a/packages/metamigo-common/helpers/validation-error.ts b/packages/metamigo-common/src/helpers/validation-error.ts
similarity index 100%
rename from packages/metamigo-common/helpers/validation-error.ts
rename to packages/metamigo-common/src/helpers/validation-error.ts
diff --git a/packages/metamigo-common/index.ts b/packages/metamigo-common/src/index.ts
similarity index 100%
rename from packages/metamigo-common/index.ts
rename to packages/metamigo-common/src/index.ts
diff --git a/packages/metamigo-common/logger.ts b/packages/metamigo-common/src/logger.ts
similarity index 100%
rename from packages/metamigo-common/logger.ts
rename to packages/metamigo-common/src/logger.ts
diff --git a/packages/metamigo-common/plugins/config.ts b/packages/metamigo-common/src/plugins/config.ts
similarity index 100%
rename from packages/metamigo-common/plugins/config.ts
rename to packages/metamigo-common/src/plugins/config.ts
diff --git a/packages/metamigo-common/plugins/request-id.ts b/packages/metamigo-common/src/plugins/request-id.ts
similarity index 100%
rename from packages/metamigo-common/plugins/request-id.ts
rename to packages/metamigo-common/src/plugins/request-id.ts
diff --git a/packages/metamigo-common/plugins/status.ts b/packages/metamigo-common/src/plugins/status.ts
similarity index 100%
rename from packages/metamigo-common/plugins/status.ts
rename to packages/metamigo-common/src/plugins/status.ts
diff --git a/packages/metamigo-common/records/account.ts b/packages/metamigo-common/src/records/account.ts
similarity index 100%
rename from packages/metamigo-common/records/account.ts
rename to packages/metamigo-common/src/records/account.ts
diff --git a/packages/metamigo-common/records/base.ts b/packages/metamigo-common/src/records/base.ts
similarity index 100%
rename from packages/metamigo-common/records/base.ts
rename to packages/metamigo-common/src/records/base.ts
diff --git a/packages/metamigo-common/records/crud-repository.ts b/packages/metamigo-common/src/records/crud-repository.ts
similarity index 100%
rename from packages/metamigo-common/records/crud-repository.ts
rename to packages/metamigo-common/src/records/crud-repository.ts
diff --git a/packages/metamigo-common/records/index.ts b/packages/metamigo-common/src/records/index.ts
similarity index 100%
rename from packages/metamigo-common/records/index.ts
rename to packages/metamigo-common/src/records/index.ts
diff --git a/packages/metamigo-common/records/record-info.d.ts b/packages/metamigo-common/src/records/record-info.d.ts
similarity index 100%
rename from packages/metamigo-common/records/record-info.d.ts
rename to packages/metamigo-common/src/records/record-info.d.ts
diff --git a/packages/metamigo-common/records/record-info.ts b/packages/metamigo-common/src/records/record-info.ts
similarity index 100%
rename from packages/metamigo-common/records/record-info.ts
rename to packages/metamigo-common/src/records/record-info.ts
diff --git a/packages/metamigo-common/records/session.ts b/packages/metamigo-common/src/records/session.ts
similarity index 100%
rename from packages/metamigo-common/records/session.ts
rename to packages/metamigo-common/src/records/session.ts
diff --git a/packages/metamigo-common/records/user.ts b/packages/metamigo-common/src/records/user.ts
similarity index 100%
rename from packages/metamigo-common/records/user.ts
rename to packages/metamigo-common/src/records/user.ts
diff --git a/packages/metamigo-common/tsconfig.json b/packages/metamigo-common/tsconfig.json
index 91b0c40..77496bb 100644
--- a/packages/metamigo-common/tsconfig.json
+++ b/packages/metamigo-common/tsconfig.json
@@ -1,13 +1,12 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "tsconfig-link",
   "compilerOptions": {
     "incremental": true,
     "outDir": "build/main",
-    "paths": {
-      "@hapipal/schmervice": ["vendor/hapipal__schmervice"],
-      "*": ["node_modules/@types/*", "*"]
-    }
+    "rootDir": "src",
+    "baseUrl": "./",
+    "types": ["jest", "node"]
   },
-  "include": ["**/*.ts"],
+  "include": ["src/**/*.ts"],
   "exclude": ["node_modules/**"]
 }