diff --git a/dht-node/src/dht_node/@types/@hyperswarm__dht/index.d.ts b/@types/@hyperswarm__dht/index.d.ts
similarity index 100%
rename from dht-node/src/dht_node/@types/@hyperswarm__dht/index.d.ts
rename to @types/@hyperswarm__dht/index.d.ts
diff --git a/backend/@types/klicktipp-api/index.d.ts b/@types/klicktipp-api/index.d.ts
similarity index 100%
rename from backend/@types/klicktipp-api/index.d.ts
rename to @types/klicktipp-api/index.d.ts
diff --git a/backend/@types/random-bigint/index.d.ts b/@types/random-bigint/index.d.ts
similarity index 100%
rename from backend/@types/random-bigint/index.d.ts
rename to @types/random-bigint/index.d.ts
diff --git a/backend/@types/sodium-native/index.d.ts b/@types/sodium-native/index.d.ts
similarity index 100%
rename from backend/@types/sodium-native/index.d.ts
rename to @types/sodium-native/index.d.ts
diff --git a/backend/tsconfig.json b/backend/tsconfig.json
index 454d4853c..4cd3fc557 100644
--- a/backend/tsconfig.json
+++ b/backend/tsconfig.json
@@ -61,7 +61,7 @@
     },
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     "typeRoots": [                                  /* List of folders to include type definitions from. */
-      "@types",
+      "../@types",
       "node_modules/@types",
       "../node_modules/@types",
     ],
diff --git a/core/tsconfig.json b/core/tsconfig.json
index 155a31a7b..711c21cc9 100644
--- a/core/tsconfig.json
+++ b/core/tsconfig.json
@@ -49,8 +49,12 @@
     // "paths": { },                                   /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [".", "../database"],            /* List of root folders whose combined content represents the structure of the project at runtime. */
     /* List of folders to include type definitions from. */
-    "typeRoots": ["./node_modules/@types", "../node_modules/@types"],    
-    // "types": ["bun-types"],                                 /* Type declaration files to be included in compilation. */
+    "typeRoots": [
+      "./node_modules/@types", 
+      "../node_modules/@types", 
+      "../@types"
+    ],    
+    // "types": ["bun-types", "../@types"],                                 /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
     // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
diff --git a/database/@types/random-bigint/index.d.ts b/database/@types/random-bigint/index.d.ts
deleted file mode 100644
index 9692fcbf7..000000000
--- a/database/@types/random-bigint/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-
-declare module 'random-bigint' {
-  function random(bits: number, cb?: (err: Error, num: BigInt) => void): BigInt
-  export = random
-}
diff --git a/database/tsconfig.json b/database/tsconfig.json
index 862e9bf94..bf09027c5 100644
--- a/database/tsconfig.json
+++ b/database/tsconfig.json
@@ -50,7 +50,11 @@
       //"@/*": ["src/*"],                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     //},
     // "rootDirs": [".", "../database"],            /* List of root folders whose combined content represents the structure of the project at runtime. */
-    "typeRoots": ["node_modules/@types"],                             /* List of folders to include type definitions from. */
+    "typeRoots": [
+      "./node_modules/@types", 
+      "../node_modules/@types", 
+      "../@types"
+    ],    
     // "types": ["node"],                              /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
diff --git a/dht-node/tsconfig.json b/dht-node/tsconfig.json
index 9628b7c41..8d979c82b 100644
--- a/dht-node/tsconfig.json
+++ b/dht-node/tsconfig.json
@@ -52,9 +52,9 @@
     },
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     "typeRoots": [                                  /* List of folders to include type definitions from. */
-      "src/dht_node/@types",
       "node_modules/@types",
-      "../node_modules/@types"
+      "../node_modules/@types",
+      "../@types"
     ],
     // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
diff --git a/federation/tsconfig.json b/federation/tsconfig.json
index 4082df448..a687b17a5 100644
--- a/federation/tsconfig.json
+++ b/federation/tsconfig.json
@@ -64,6 +64,7 @@
     "typeRoots": [                                  /* List of folders to include type definitions from. */
       "node_modules/@types",
       "../node_modules/@types",
+      "../@types"
     ],
     // "types": [],                                 /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */