diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json
index db76f25633..b46adfa48c 100644
--- a/packages/cli/tsconfig.build.json
+++ b/packages/cli/tsconfig.build.json
@@ -3,6 +3,6 @@
   "include": ["src"],
   "compilerOptions": {
     "outDir": "lib",
-    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "./types"]
+    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "../../types"]
   }
 }
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 603d35c446..f818237015 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "./types"]
+    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "../../types"]
   }
 }
diff --git a/packages/cli/types/libp2p-bootstrap/index.d.ts b/packages/cli/types/libp2p-bootstrap/index.d.ts
deleted file mode 100644
index 0e490ba6c2..0000000000
--- a/packages/cli/types/libp2p-bootstrap/index.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for libp2p-railing 0.9.1
-// Project: https://github.com/libp2p/js-libp2p-bootstrap
-// Definitions by: Jaco Greeff <https://github.com/jacogr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-type PeerInfo = {
-  id: import("peer-id");
-  multiaddrs: import("multiaddr").Multiaddr[];
-};
-
-declare namespace LibP2pBootstrap {
-  type Options = {
-    list: Array<string | import("multiaddr").Multiaddr>;
-    interval?: number;
-  };
-
-  type Events = "peer";
-}
-
-declare class LibP2pBootstrap {
-  constructor(options: LibP2pBootstrap.Options);
-
-  on(event: LibP2pBootstrap.Events, cb: (peerInfo: PeerInfo) => any): this;
-}
-
-declare module "libp2p-bootstrap" {
-  export default LibP2pBootstrap;
-}
diff --git a/packages/cli/types/libp2p-bootstrap/libp2p-bootstrap-tests.ts b/packages/cli/types/libp2p-bootstrap/libp2p-bootstrap-tests.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/cli/types/libp2p-bootstrap/tsconfig.json b/packages/cli/types/libp2p-bootstrap/tsconfig.json
deleted file mode 100644
index a926d91d96..0000000000
--- a/packages/cli/types/libp2p-bootstrap/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["es6"],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictFunctionTypes": true,
-    "strictNullChecks": true,
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "noEmit": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": ["index.d.ts", "libp2p-bootstrap-tests.ts"]
-}
diff --git a/packages/cli/types/libp2p-mdns/index.d.ts b/packages/cli/types/libp2p-mdns/index.d.ts
deleted file mode 100644
index c9e1653892..0000000000
--- a/packages/cli/types/libp2p-mdns/index.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for libp2p-mdns 0.12.0
-// Project: https://github.com/libp2p/js-libp2p-mdns
-// Definitions by: Jaco Greeff <https://github.com/jacogr>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="libp2p-bootstrap"/>
-
-declare namespace LibP2pMdns {
-  type Options = {
-    broadcast?: boolean;
-    interval?: number;
-    peerInfo: PeerInfo;
-    port?: number;
-    serviceTag?: string;
-  };
-
-  type Events = "peer";
-}
-
-declare class LibP2pMdns extends LibP2pBootstrap {
-  constructor(options: LibP2pMdns.Options);
-
-  on(event: LibP2pMdns.Events, cb: (peerInfo: PeerInfo) => any): this;
-}
-
-declare module "libp2p-mdns" {
-  export default LibP2pMdns;
-}
diff --git a/packages/cli/types/snappyjs/index.d.ts b/packages/cli/types/snappyjs/index.d.ts
deleted file mode 100644
index b0cee13980..0000000000
--- a/packages/cli/types/snappyjs/index.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module "snappyjs" {
-  export function compress<T extends ArrayBuffer | Buffer | Uint8Array>(input: T): T;
-  export function uncompress<T extends ArrayBuffer | Buffer | Uint8Array>(input: T): T;
-}
diff --git a/packages/lodestar/tsconfig.build.json b/packages/lodestar/tsconfig.build.json
index db76f25633..b46adfa48c 100644
--- a/packages/lodestar/tsconfig.build.json
+++ b/packages/lodestar/tsconfig.build.json
@@ -3,6 +3,6 @@
   "include": ["src"],
   "compilerOptions": {
     "outDir": "lib",
-    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "./types"]
+    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "../../types"]
   }
 }
diff --git a/packages/lodestar/tsconfig.json b/packages/lodestar/tsconfig.json
index 8a5afd2118..afb8d9659d 100644
--- a/packages/lodestar/tsconfig.json
+++ b/packages/lodestar/tsconfig.json
@@ -2,6 +2,6 @@
   "extends": "../../tsconfig.json",
   "exclude": ["../../node_modules/it-pipe"],
   "compilerOptions": {
-    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "./types"]
+    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "../../types"]
   }
 }
diff --git a/packages/lodestar/types/libp2p-mdns/libp2p-mdns-tests.ts b/packages/lodestar/types/libp2p-mdns/libp2p-mdns-tests.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/lodestar/types/libp2p-mplex/tslint.json b/packages/lodestar/types/libp2p-mplex/tslint.json
deleted file mode 100644
index 4e88071852..0000000000
--- a/packages/lodestar/types/libp2p-mplex/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{"extends": "dtslint/dt.json"}
diff --git a/packages/lodestar/types/libp2p-tcp/tsconfig.json b/packages/lodestar/types/libp2p-tcp/tsconfig.json
deleted file mode 100644
index 3b291d869d..0000000000
--- a/packages/lodestar/types/libp2p-tcp/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["es6"],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictFunctionTypes": true,
-    "strictNullChecks": true,
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "noEmit": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": ["index.d.ts", "bn.js-tests.ts"]
-}
diff --git a/packages/lodestar/types/libp2p-tcp/tslint.json b/packages/lodestar/types/libp2p-tcp/tslint.json
deleted file mode 100644
index 4e88071852..0000000000
--- a/packages/lodestar/types/libp2p-tcp/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{"extends": "dtslint/dt.json"}
diff --git a/packages/lodestar/types/time-cache/index.d.ts b/packages/lodestar/types/time-cache/index.d.ts
deleted file mode 100644
index cef6cb74ed..0000000000
--- a/packages/lodestar/types/time-cache/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-declare class TimeCache {
-  put(data: string): void;
-  has(data: string): boolean;
-}
-
-declare module "time-cache" {
-  export default TimeCache;
-}
diff --git a/packages/spec-test-util/tsconfig.build.json b/packages/spec-test-util/tsconfig.build.json
index 31641bfe6d..3c66d56196 100644
--- a/packages/spec-test-util/tsconfig.build.json
+++ b/packages/spec-test-util/tsconfig.build.json
@@ -3,6 +3,6 @@
   "include": ["src"],
   "compilerOptions": {
     "outDir": "./lib",
-    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "./types"]
+    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "../../types"]
   }
 }
diff --git a/packages/spec-test-util/tsconfig.json b/packages/spec-test-util/tsconfig.json
index 603d35c446..f818237015 100644
--- a/packages/spec-test-util/tsconfig.json
+++ b/packages/spec-test-util/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "./types"]
+    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "../../types"]
   }
 }
diff --git a/packages/spec-test-util/types/snappyjs/index.d.ts b/packages/spec-test-util/types/snappyjs/index.d.ts
deleted file mode 100644
index b0cee13980..0000000000
--- a/packages/spec-test-util/types/snappyjs/index.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module "snappyjs" {
-  export function compress<T extends ArrayBuffer | Buffer | Uint8Array>(input: T): T;
-  export function uncompress<T extends ArrayBuffer | Buffer | Uint8Array>(input: T): T;
-}
diff --git a/tsconfig.json b/tsconfig.json
index 4f0ef235d0..72ac1fd8ac 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "emitDeclarationOnly": false,
     "incremental": false,
-    "typeRoots": ["node_modules/@types", "./packages/lodestar/types"],
+    // Required to run benchmark command from root directory
+    "typeRoots": ["node_modules/@types", "./types"],
     "noEmit": true
   }
 }
diff --git a/packages/lodestar/types/it-pipe/index.d.ts b/types/it-pipe/index.d.ts
similarity index 100%
rename from packages/lodestar/types/it-pipe/index.d.ts
rename to types/it-pipe/index.d.ts
diff --git a/packages/lodestar/types/libp2p-mdns/index.d.ts b/types/libp2p-mdns/index.d.ts
similarity index 100%
rename from packages/lodestar/types/libp2p-mdns/index.d.ts
rename to types/libp2p-mdns/index.d.ts
diff --git a/packages/cli/types/libp2p-mdns/libp2p-mdns-tests.ts b/types/libp2p-mdns/libp2p-mdns-tests.ts
similarity index 100%
rename from packages/cli/types/libp2p-mdns/libp2p-mdns-tests.ts
rename to types/libp2p-mdns/libp2p-mdns-tests.ts
diff --git a/packages/cli/types/libp2p-mdns/tsconfig.json b/types/libp2p-mdns/tsconfig.json
similarity index 100%
rename from packages/cli/types/libp2p-mdns/tsconfig.json
rename to types/libp2p-mdns/tsconfig.json
diff --git a/packages/cli/types/libp2p-bootstrap/tslint.json b/types/libp2p-mdns/tslint.json
similarity index 100%
rename from packages/cli/types/libp2p-bootstrap/tslint.json
rename to types/libp2p-mdns/tslint.json
diff --git a/packages/lodestar/types/libp2p-mplex/index.d.ts b/types/libp2p-mplex/index.d.ts
similarity index 100%
rename from packages/lodestar/types/libp2p-mplex/index.d.ts
rename to types/libp2p-mplex/index.d.ts
diff --git a/packages/lodestar/types/libp2p-mplex/libp2p-mplex-tests.ts b/types/libp2p-mplex/libp2p-mplex-tests.ts
similarity index 100%
rename from packages/lodestar/types/libp2p-mplex/libp2p-mplex-tests.ts
rename to types/libp2p-mplex/libp2p-mplex-tests.ts
diff --git a/packages/lodestar/types/libp2p-mplex/tsconfig.json b/types/libp2p-mplex/tsconfig.json
similarity index 100%
rename from packages/lodestar/types/libp2p-mplex/tsconfig.json
rename to types/libp2p-mplex/tsconfig.json
diff --git a/packages/cli/types/libp2p-mdns/tslint.json b/types/libp2p-mplex/tslint.json
similarity index 100%
rename from packages/cli/types/libp2p-mdns/tslint.json
rename to types/libp2p-mplex/tslint.json
diff --git a/packages/lodestar/types/libp2p-tcp/index.d.ts b/types/libp2p-tcp/index.d.ts
similarity index 100%
rename from packages/lodestar/types/libp2p-tcp/index.d.ts
rename to types/libp2p-tcp/index.d.ts
diff --git a/packages/lodestar/types/libp2p-mdns/tsconfig.json b/types/libp2p-tcp/tsconfig.json
similarity index 100%
rename from packages/lodestar/types/libp2p-mdns/tsconfig.json
rename to types/libp2p-tcp/tsconfig.json
diff --git a/packages/lodestar/types/libp2p-mdns/tslint.json b/types/libp2p-tcp/tslint.json
similarity index 100%
rename from packages/lodestar/types/libp2p-mdns/tslint.json
rename to types/libp2p-tcp/tslint.json
diff --git a/packages/lodestar/types/snappy-stream/index.d.ts b/types/snappy-stream/index.d.ts
similarity index 100%
rename from packages/lodestar/types/snappy-stream/index.d.ts
rename to types/snappy-stream/index.d.ts
diff --git a/packages/lodestar/types/snappyjs/index.d.ts b/types/snappyjs/index.d.ts
similarity index 100%
rename from packages/lodestar/types/snappyjs/index.d.ts
rename to types/snappyjs/index.d.ts
diff --git a/packages/lodestar/types/stream-to-it/index.d.ts b/types/stream-to-it/index.d.ts
similarity index 100%
rename from packages/lodestar/types/stream-to-it/index.d.ts
rename to types/stream-to-it/index.d.ts
diff --git a/packages/cli/types/time-cache/index.d.ts b/types/time-cache/index.d.ts
similarity index 100%
rename from packages/cli/types/time-cache/index.d.ts
rename to types/time-cache/index.d.ts