diff --git a/types/node/ts3.1/async_hooks.d.ts b/types/node/async_hooks.d.ts
similarity index 100%
rename from types/node/ts3.1/async_hooks.d.ts
rename to types/node/async_hooks.d.ts
diff --git a/types/node/ts3.1/buffer.d.ts b/types/node/buffer.d.ts
similarity index 100%
rename from types/node/ts3.1/buffer.d.ts
rename to types/node/buffer.d.ts
diff --git a/types/node/ts3.1/child_process.d.ts b/types/node/child_process.d.ts
similarity index 100%
rename from types/node/ts3.1/child_process.d.ts
rename to types/node/child_process.d.ts
diff --git a/types/node/ts3.1/cluster.d.ts b/types/node/cluster.d.ts
similarity index 100%
rename from types/node/ts3.1/cluster.d.ts
rename to types/node/cluster.d.ts
diff --git a/types/node/ts3.1/console.d.ts b/types/node/console.d.ts
similarity index 100%
rename from types/node/ts3.1/console.d.ts
rename to types/node/console.d.ts
diff --git a/types/node/ts3.1/constants.d.ts b/types/node/constants.d.ts
similarity index 100%
rename from types/node/ts3.1/constants.d.ts
rename to types/node/constants.d.ts
diff --git a/types/node/ts3.1/crypto.d.ts b/types/node/crypto.d.ts
similarity index 100%
rename from types/node/ts3.1/crypto.d.ts
rename to types/node/crypto.d.ts
diff --git a/types/node/ts3.1/dgram.d.ts b/types/node/dgram.d.ts
similarity index 100%
rename from types/node/ts3.1/dgram.d.ts
rename to types/node/dgram.d.ts
diff --git a/types/node/ts3.1/dns.d.ts b/types/node/dns.d.ts
similarity index 100%
rename from types/node/ts3.1/dns.d.ts
rename to types/node/dns.d.ts
diff --git a/types/node/ts3.1/domain.d.ts b/types/node/domain.d.ts
similarity index 100%
rename from types/node/ts3.1/domain.d.ts
rename to types/node/domain.d.ts
diff --git a/types/node/ts3.1/events.d.ts b/types/node/events.d.ts
similarity index 100%
rename from types/node/ts3.1/events.d.ts
rename to types/node/events.d.ts
diff --git a/types/node/v12/ts3.3/fs.d.ts b/types/node/fs.d.ts
similarity index 96%
rename from types/node/v12/ts3.3/fs.d.ts
rename to types/node/fs.d.ts
index 323193ecfd..f0ae01b17c 100644
--- a/types/node/v12/ts3.3/fs.d.ts
+++ b/types/node/fs.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/fs.d.ts" />
+/// <reference path="ts3.1/fs.d.ts" />
 
 declare module 'fs' {
     interface BigIntStats extends StatsBase<bigint> {
diff --git a/types/node/ts3.1/fs/promises.d.ts b/types/node/fs/promises.d.ts
similarity index 100%
rename from types/node/ts3.1/fs/promises.d.ts
rename to types/node/fs/promises.d.ts
diff --git a/types/node/ts3.4/globals.d.ts b/types/node/globals.d.ts
similarity index 91%
rename from types/node/ts3.4/globals.d.ts
rename to types/node/globals.d.ts
index fbc97b08c2..a8c3e2a94f 100644
--- a/types/node/ts3.4/globals.d.ts
+++ b/types/node/globals.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/globals.d.ts" />
+/// <reference path="ts3.1/globals.d.ts" />
 
 interface Buffer extends Uint8Array {
     readBigUInt64BE(offset?: number): bigint;
diff --git a/types/node/ts3.6/globals.global.d.ts b/types/node/globals.global.d.ts
similarity index 100%
rename from types/node/ts3.6/globals.global.d.ts
rename to types/node/globals.global.d.ts
diff --git a/types/node/ts3.1/http.d.ts b/types/node/http.d.ts
similarity index 100%
rename from types/node/ts3.1/http.d.ts
rename to types/node/http.d.ts
diff --git a/types/node/ts3.1/http2.d.ts b/types/node/http2.d.ts
similarity index 100%
rename from types/node/ts3.1/http2.d.ts
rename to types/node/http2.d.ts
diff --git a/types/node/ts3.1/https.d.ts b/types/node/https.d.ts
similarity index 100%
rename from types/node/ts3.1/https.d.ts
rename to types/node/https.d.ts
diff --git a/types/node/ts3.1/inspector.d.ts b/types/node/inspector.d.ts
similarity index 100%
rename from types/node/ts3.1/inspector.d.ts
rename to types/node/inspector.d.ts
diff --git a/types/node/ts3.1/module.d.ts b/types/node/module.d.ts
similarity index 100%
rename from types/node/ts3.1/module.d.ts
rename to types/node/module.d.ts
diff --git a/types/node/ts3.1/net.d.ts b/types/node/net.d.ts
similarity index 100%
rename from types/node/ts3.1/net.d.ts
rename to types/node/net.d.ts
diff --git a/types/node/ts3.1/os.d.ts b/types/node/os.d.ts
similarity index 100%
rename from types/node/ts3.1/os.d.ts
rename to types/node/os.d.ts
diff --git a/types/node/ts3.1/path.d.ts b/types/node/path.d.ts
similarity index 100%
rename from types/node/ts3.1/path.d.ts
rename to types/node/path.d.ts
diff --git a/types/node/ts3.1/perf_hooks.d.ts b/types/node/perf_hooks.d.ts
similarity index 100%
rename from types/node/ts3.1/perf_hooks.d.ts
rename to types/node/perf_hooks.d.ts
diff --git a/types/node/ts3.4/process.d.ts b/types/node/process.d.ts
similarity index 81%
rename from types/node/ts3.4/process.d.ts
rename to types/node/process.d.ts
index 917ad8a0d3..352a196401 100644
--- a/types/node/ts3.4/process.d.ts
+++ b/types/node/process.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/process.d.ts" />
+/// <reference path="ts3.1/process.d.ts" />
 
 declare module 'process' {
     global {
diff --git a/types/node/ts3.1/punycode.d.ts b/types/node/punycode.d.ts
similarity index 100%
rename from types/node/ts3.1/punycode.d.ts
rename to types/node/punycode.d.ts
diff --git a/types/node/ts3.1/querystring.d.ts b/types/node/querystring.d.ts
similarity index 100%
rename from types/node/ts3.1/querystring.d.ts
rename to types/node/querystring.d.ts
diff --git a/types/node/ts3.1/readline.d.ts b/types/node/readline.d.ts
similarity index 100%
rename from types/node/ts3.1/readline.d.ts
rename to types/node/readline.d.ts
diff --git a/types/node/ts3.1/repl.d.ts b/types/node/repl.d.ts
similarity index 100%
rename from types/node/ts3.1/repl.d.ts
rename to types/node/repl.d.ts
diff --git a/types/node/ts3.1/stream.d.ts b/types/node/stream.d.ts
similarity index 100%
rename from types/node/ts3.1/stream.d.ts
rename to types/node/stream.d.ts
diff --git a/types/node/ts3.1/string_decoder.d.ts b/types/node/string_decoder.d.ts
similarity index 100%
rename from types/node/ts3.1/string_decoder.d.ts
rename to types/node/string_decoder.d.ts
diff --git a/types/node/ts3.6/test/globals.ts b/types/node/test/globals.ts
similarity index 100%
rename from types/node/ts3.6/test/globals.ts
rename to types/node/test/globals.ts
diff --git a/types/node/ts3.1/timers.d.ts b/types/node/timers.d.ts
similarity index 100%
rename from types/node/ts3.1/timers.d.ts
rename to types/node/timers.d.ts
diff --git a/types/node/ts3.1/tls.d.ts b/types/node/tls.d.ts
similarity index 100%
rename from types/node/ts3.1/tls.d.ts
rename to types/node/tls.d.ts
diff --git a/types/node/ts3.1/trace_events.d.ts b/types/node/trace_events.d.ts
similarity index 100%
rename from types/node/ts3.1/trace_events.d.ts
rename to types/node/trace_events.d.ts
diff --git a/types/node/ts3.1/base.d.ts b/types/node/ts3.1/base.d.ts
index d7ca6cf0bc..f0c6ff0ad2 100644
--- a/types/node/ts3.1/base.d.ts
+++ b/types/node/ts3.1/base.d.ts
@@ -1,42 +1,42 @@
 // base definitions for all NodeJS modules that are not specific to any version of TypeScript
 
 /// <reference path="globals.d.ts" />
-/// <reference path="async_hooks.d.ts" />
-/// <reference path="buffer.d.ts" />
-/// <reference path="child_process.d.ts" />
-/// <reference path="cluster.d.ts" />
-/// <reference path="console.d.ts" />
-/// <reference path="constants.d.ts" />
-/// <reference path="crypto.d.ts" />
-/// <reference path="dgram.d.ts" />
-/// <reference path="dns.d.ts" />
-/// <reference path="domain.d.ts" />
-/// <reference path="events.d.ts" />
+/// <reference path="../async_hooks.d.ts" />
+/// <reference path="../buffer.d.ts" />
+/// <reference path="../child_process.d.ts" />
+/// <reference path="../cluster.d.ts" />
+/// <reference path="../console.d.ts" />
+/// <reference path="../constants.d.ts" />
+/// <reference path="../crypto.d.ts" />
+/// <reference path="../dgram.d.ts" />
+/// <reference path="../dns.d.ts" />
+/// <reference path="../domain.d.ts" />
+/// <reference path="../events.d.ts" />
 /// <reference path="fs.d.ts" />
-/// <reference path="fs/promises.d.ts" />
-/// <reference path="http.d.ts" />
-/// <reference path="http2.d.ts" />
-/// <reference path="https.d.ts" />
-/// <reference path="inspector.d.ts" />
-/// <reference path="module.d.ts" />
-/// <reference path="net.d.ts" />
-/// <reference path="os.d.ts" />
-/// <reference path="path.d.ts" />
-/// <reference path="perf_hooks.d.ts" />
+/// <reference path="../fs/promises.d.ts" />
+/// <reference path="../http.d.ts" />
+/// <reference path="../http2.d.ts" />
+/// <reference path="../https.d.ts" />
+/// <reference path="../inspector.d.ts" />
+/// <reference path="../module.d.ts" />
+/// <reference path="../net.d.ts" />
+/// <reference path="../os.d.ts" />
+/// <reference path="../path.d.ts" />
+/// <reference path="../perf_hooks.d.ts" />
 /// <reference path="process.d.ts" />
-/// <reference path="punycode.d.ts" />
-/// <reference path="querystring.d.ts" />
-/// <reference path="readline.d.ts" />
-/// <reference path="repl.d.ts" />
-/// <reference path="stream.d.ts" />
-/// <reference path="string_decoder.d.ts" />
-/// <reference path="timers.d.ts" />
-/// <reference path="tls.d.ts" />
-/// <reference path="trace_events.d.ts" />
-/// <reference path="tty.d.ts" />
-/// <reference path="url.d.ts" />
+/// <reference path="../punycode.d.ts" />
+/// <reference path="../querystring.d.ts" />
+/// <reference path="../readline.d.ts" />
+/// <reference path="../repl.d.ts" />
+/// <reference path="../stream.d.ts" />
+/// <reference path="../string_decoder.d.ts" />
+/// <reference path="../timers.d.ts" />
+/// <reference path="../tls.d.ts" />
+/// <reference path="../trace_events.d.ts" />
+/// <reference path="../tty.d.ts" />
+/// <reference path="../url.d.ts" />
 /// <reference path="util.d.ts" />
-/// <reference path="v8.d.ts" />
-/// <reference path="vm.d.ts" />
-/// <reference path="worker_threads.d.ts" />
-/// <reference path="zlib.d.ts" />
+/// <reference path="../v8.d.ts" />
+/// <reference path="../vm.d.ts" />
+/// <reference path="../worker_threads.d.ts" />
+/// <reference path="../zlib.d.ts" />
diff --git a/types/node/ts3.1/tslint.json b/types/node/ts3.1/tslint.json
index 464f610b93..65e8b18d2a 100644
--- a/types/node/ts3.1/tslint.json
+++ b/types/node/ts3.1/tslint.json
@@ -2,9 +2,9 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "ban-types": false,
+        "no-bad-reference": false,
         "no-empty-interface": false,
         "no-single-declare-module": false,
-        "no-unnecessary-class": false,
         "unified-signatures": false
     }
 }
diff --git a/types/node/ts3.4/base.d.ts b/types/node/ts3.4/base.d.ts
index b452ea7990..4b315049d1 100644
--- a/types/node/ts3.4/base.d.ts
+++ b/types/node/ts3.4/base.d.ts
@@ -17,7 +17,7 @@
 /// <reference path="../ts3.1/base.d.ts" />
 
 // TypeScript 3.2-specific augmentations:
-/// <reference path="fs.d.ts" />
-/// <reference path="process.d.ts" />
-/// <reference path="util.d.ts" />
-/// <reference path="globals.d.ts" />
+/// <reference path="../fs.d.ts" />
+/// <reference path="../process.d.ts" />
+/// <reference path="../util.d.ts" />
+/// <reference path="../globals.d.ts" />
diff --git a/types/node/ts3.4/tslint.json b/types/node/ts3.4/tslint.json
index 1a8ddd9863..9061fbd0e3 100644
--- a/types/node/ts3.4/tslint.json
+++ b/types/node/ts3.4/tslint.json
@@ -1,10 +1,6 @@
 {
   "extends": "dtslint/dt.json",
   "rules": {
-    "ban-types": false,
-    "unified-signatures": false,
-    "no-empty-interface": false,
-    "no-single-declare-module": false,
-    "strict-export-declare-modifiers": false // http2 needs this
+    "no-bad-reference": false
   }
 }
diff --git a/types/node/ts3.6/base.d.ts b/types/node/ts3.6/base.d.ts
index 44173cb3c8..081a535fac 100644
--- a/types/node/ts3.6/base.d.ts
+++ b/types/node/ts3.6/base.d.ts
@@ -17,7 +17,7 @@
 /// <reference path="../ts3.4/base.d.ts" />
 
 // TypeScript 3.5-specific augmentations:
-/// <reference path="globals.global.d.ts" />
+/// <reference path="../globals.global.d.ts" />
 
 // TypeScript 3.5-specific augmentations:
-/// <reference path="wasi.d.ts" />
+/// <reference path="../wasi.d.ts" />
diff --git a/types/node/ts3.6/tsconfig.json b/types/node/ts3.6/tsconfig.json
index 22c3273e9d..cc6def6c6d 100644
--- a/types/node/ts3.6/tsconfig.json
+++ b/types/node/ts3.6/tsconfig.json
@@ -1,8 +1,7 @@
 {
     "files": [
         "index.d.ts",
-        "node-tests.ts",
-        "test/globals.ts"
+        "node-tests.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/node/ts3.6/tslint.json b/types/node/ts3.6/tslint.json
index 075fa88707..56086bb86a 100644
--- a/types/node/ts3.6/tslint.json
+++ b/types/node/ts3.6/tslint.json
@@ -1,6 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-single-declare-module": false
+        "no-bad-reference": false
     }
 }
diff --git a/types/node/tsconfig.json b/types/node/tsconfig.json
index 138102c082..135673d2a3 100644
--- a/types/node/tsconfig.json
+++ b/types/node/tsconfig.json
@@ -6,14 +6,15 @@
         "test/async_hooks.ts",
         "test/buffer.ts",
         "test/child_process.ts",
-        "test/constants.ts",
         "test/cluster.ts",
+        "test/constants.ts",
         "test/crypto.ts",
         "test/dgram.ts",
         "test/dns.ts",
         "test/events.ts",
         "test/fs.ts",
         "test/global.ts",
+        "test/globals.ts",
         "test/http.ts",
         "test/http2.ts",
         "test/module.ts",
@@ -29,12 +30,12 @@
         "test/string_decoder.ts",
         "test/tls.ts",
         "test/tty.ts",
+        "test/url.ts",
         "test/util.ts",
         "test/v8.ts",
         "test/vm.ts",
         "test/worker_threads.ts",
-        "test/zlib.ts",
-        "test/url.ts"
+        "test/zlib.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/node/tslint.json b/types/node/tslint.json
index 1a8ddd9863..af2e3c26fa 100644
--- a/types/node/tslint.json
+++ b/types/node/tslint.json
@@ -2,9 +2,10 @@
   "extends": "dtslint/dt.json",
   "rules": {
     "ban-types": false,
-    "unified-signatures": false,
     "no-empty-interface": false,
     "no-single-declare-module": false,
-    "strict-export-declare-modifiers": false // http2 needs this
+    "no-unnecessary-class": false,
+    "strict-export-declare-modifiers": false,
+    "unified-signatures": false
   }
 }
diff --git a/types/node/ts3.1/tty.d.ts b/types/node/tty.d.ts
similarity index 100%
rename from types/node/ts3.1/tty.d.ts
rename to types/node/tty.d.ts
diff --git a/types/node/ts3.1/url.d.ts b/types/node/url.d.ts
similarity index 100%
rename from types/node/ts3.1/url.d.ts
rename to types/node/url.d.ts
diff --git a/types/node/v13/ts3.4/util.d.ts b/types/node/util.d.ts
similarity index 84%
rename from types/node/v13/ts3.4/util.d.ts
rename to types/node/util.d.ts
index cd68bce0cd..84d7ae2c0b 100644
--- a/types/node/v13/ts3.4/util.d.ts
+++ b/types/node/util.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/util.d.ts" />
+/// <reference path="ts3.1/util.d.ts" />
 
 declare module "util" {
     namespace types {
diff --git a/types/node/v10/ts3.1/async_hooks.d.ts b/types/node/v10/async_hooks.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/async_hooks.d.ts
rename to types/node/v10/async_hooks.d.ts
diff --git a/types/node/v10/base.d.ts b/types/node/v10/base.d.ts
index f5741f0e2a..dcbc7baa74 100644
--- a/types/node/v10/base.d.ts
+++ b/types/node/v10/base.d.ts
@@ -14,7 +14,7 @@
 
 // Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="ts3.1/base.d.ts" />
+/// <reference path="ts3.6/base.d.ts" />
 
 // TypeScript 3.7-specific augmentations:
 /// <reference path="assert.d.ts" />
diff --git a/types/node/v10/ts3.1/buffer.d.ts b/types/node/v10/buffer.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/buffer.d.ts
rename to types/node/v10/buffer.d.ts
diff --git a/types/node/v10/ts3.1/child_process.d.ts b/types/node/v10/child_process.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/child_process.d.ts
rename to types/node/v10/child_process.d.ts
diff --git a/types/node/v10/ts3.1/cluster.d.ts b/types/node/v10/cluster.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/cluster.d.ts
rename to types/node/v10/cluster.d.ts
diff --git a/types/node/v10/ts3.1/console.d.ts b/types/node/v10/console.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/console.d.ts
rename to types/node/v10/console.d.ts
diff --git a/types/node/v10/ts3.1/constants.d.ts b/types/node/v10/constants.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/constants.d.ts
rename to types/node/v10/constants.d.ts
diff --git a/types/node/v10/ts3.1/crypto.d.ts b/types/node/v10/crypto.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/crypto.d.ts
rename to types/node/v10/crypto.d.ts
diff --git a/types/node/v10/ts3.1/dgram.d.ts b/types/node/v10/dgram.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/dgram.d.ts
rename to types/node/v10/dgram.d.ts
diff --git a/types/node/v10/ts3.1/dns.d.ts b/types/node/v10/dns.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/dns.d.ts
rename to types/node/v10/dns.d.ts
diff --git a/types/node/v10/ts3.1/domain.d.ts b/types/node/v10/domain.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/domain.d.ts
rename to types/node/v10/domain.d.ts
diff --git a/types/node/v10/ts3.1/events.d.ts b/types/node/v10/events.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/events.d.ts
rename to types/node/v10/events.d.ts
diff --git a/types/node/v10/ts3.1/fs.d.ts b/types/node/v10/fs.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/fs.d.ts
rename to types/node/v10/fs.d.ts
diff --git a/types/node/v11/ts3.6/globals.d.ts b/types/node/v10/globals.d.ts
similarity index 73%
rename from types/node/v11/ts3.6/globals.d.ts
rename to types/node/v10/globals.d.ts
index a3f1b407d5..81078e31d1 100644
--- a/types/node/v11/ts3.6/globals.d.ts
+++ b/types/node/v10/globals.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/globals.d.ts" />
+/// <reference path="ts3.1/globals.d.ts" />
 
 declare namespace NodeJS {
     interface HRTime {
diff --git a/types/node/v10/ts3.1/http.d.ts b/types/node/v10/http.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/http.d.ts
rename to types/node/v10/http.d.ts
diff --git a/types/node/v10/ts3.1/http2.d.ts b/types/node/v10/http2.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/http2.d.ts
rename to types/node/v10/http2.d.ts
diff --git a/types/node/v10/ts3.1/https.d.ts b/types/node/v10/https.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/https.d.ts
rename to types/node/v10/https.d.ts
diff --git a/types/node/v10/ts3.1/inspector.d.ts b/types/node/v10/inspector.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/inspector.d.ts
rename to types/node/v10/inspector.d.ts
diff --git a/types/node/v10/ts3.1/module.d.ts b/types/node/v10/module.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/module.d.ts
rename to types/node/v10/module.d.ts
diff --git a/types/node/v10/ts3.1/net.d.ts b/types/node/v10/net.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/net.d.ts
rename to types/node/v10/net.d.ts
diff --git a/types/node/v10/ts3.1/os.d.ts b/types/node/v10/os.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/os.d.ts
rename to types/node/v10/os.d.ts
diff --git a/types/node/v10/ts3.1/path.d.ts b/types/node/v10/path.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/path.d.ts
rename to types/node/v10/path.d.ts
diff --git a/types/node/v10/ts3.1/perf_hooks.d.ts b/types/node/v10/perf_hooks.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/perf_hooks.d.ts
rename to types/node/v10/perf_hooks.d.ts
diff --git a/types/node/v10/ts3.1/process.d.ts b/types/node/v10/process.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/process.d.ts
rename to types/node/v10/process.d.ts
diff --git a/types/node/v10/ts3.1/punycode.d.ts b/types/node/v10/punycode.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/punycode.d.ts
rename to types/node/v10/punycode.d.ts
diff --git a/types/node/v10/ts3.1/querystring.d.ts b/types/node/v10/querystring.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/querystring.d.ts
rename to types/node/v10/querystring.d.ts
diff --git a/types/node/v10/ts3.1/readline.d.ts b/types/node/v10/readline.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/readline.d.ts
rename to types/node/v10/readline.d.ts
diff --git a/types/node/v10/ts3.1/repl.d.ts b/types/node/v10/repl.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/repl.d.ts
rename to types/node/v10/repl.d.ts
diff --git a/types/node/v10/ts3.1/stream.d.ts b/types/node/v10/stream.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/stream.d.ts
rename to types/node/v10/stream.d.ts
diff --git a/types/node/v10/ts3.1/string_decoder.d.ts b/types/node/v10/string_decoder.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/string_decoder.d.ts
rename to types/node/v10/string_decoder.d.ts
diff --git a/types/node/v10/ts3.1/timers.d.ts b/types/node/v10/timers.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/timers.d.ts
rename to types/node/v10/timers.d.ts
diff --git a/types/node/v10/ts3.1/tls.d.ts b/types/node/v10/tls.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/tls.d.ts
rename to types/node/v10/tls.d.ts
diff --git a/types/node/v10/ts3.1/trace_events.d.ts b/types/node/v10/trace_events.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/trace_events.d.ts
rename to types/node/v10/trace_events.d.ts
diff --git a/types/node/v10/ts3.1/base.d.ts b/types/node/v10/ts3.1/base.d.ts
index f9bc0b3d91..cf77532198 100644
--- a/types/node/v10/ts3.1/base.d.ts
+++ b/types/node/v10/ts3.1/base.d.ts
@@ -1,40 +1,40 @@
 // base definitions for all NodeJS modules that are not specific to any version of TypeScript
 /// <reference path="globals.d.ts" />
-/// <reference path="async_hooks.d.ts" />
-/// <reference path="buffer.d.ts" />
-/// <reference path="child_process.d.ts" />
-/// <reference path="cluster.d.ts" />
-/// <reference path="console.d.ts" />
-/// <reference path="constants.d.ts" />
-/// <reference path="crypto.d.ts" />
-/// <reference path="dgram.d.ts" />
-/// <reference path="dns.d.ts" />
-/// <reference path="domain.d.ts" />
-/// <reference path="events.d.ts" />
-/// <reference path="fs.d.ts" />
-/// <reference path="http.d.ts" />
-/// <reference path="http2.d.ts" />
-/// <reference path="https.d.ts" />
-/// <reference path="inspector.d.ts" />
-/// <reference path="module.d.ts" />
-/// <reference path="net.d.ts" />
-/// <reference path="os.d.ts" />
-/// <reference path="path.d.ts" />
-/// <reference path="perf_hooks.d.ts" />
-/// <reference path="process.d.ts" />
-/// <reference path="punycode.d.ts" />
-/// <reference path="querystring.d.ts" />
-/// <reference path="readline.d.ts" />
-/// <reference path="repl.d.ts" />
-/// <reference path="stream.d.ts" />
-/// <reference path="string_decoder.d.ts" />
-/// <reference path="timers.d.ts" />
-/// <reference path="tls.d.ts" />
-/// <reference path="trace_events.d.ts" />
-/// <reference path="tty.d.ts" />
-/// <reference path="url.d.ts" />
+/// <reference path="../async_hooks.d.ts" />
+/// <reference path="../buffer.d.ts" />
+/// <reference path="../child_process.d.ts" />
+/// <reference path="../cluster.d.ts" />
+/// <reference path="../console.d.ts" />
+/// <reference path="../constants.d.ts" />
+/// <reference path="../crypto.d.ts" />
+/// <reference path="../dgram.d.ts" />
+/// <reference path="../dns.d.ts" />
+/// <reference path="../domain.d.ts" />
+/// <reference path="../events.d.ts" />
+/// <reference path="../fs.d.ts" />
+/// <reference path="../http.d.ts" />
+/// <reference path="../http2.d.ts" />
+/// <reference path="../https.d.ts" />
+/// <reference path="../inspector.d.ts" />
+/// <reference path="../module.d.ts" />
+/// <reference path="../net.d.ts" />
+/// <reference path="../os.d.ts" />
+/// <reference path="../path.d.ts" />
+/// <reference path="../perf_hooks.d.ts" />
+/// <reference path="../process.d.ts" />
+/// <reference path="../punycode.d.ts" />
+/// <reference path="../querystring.d.ts" />
+/// <reference path="../readline.d.ts" />
+/// <reference path="../repl.d.ts" />
+/// <reference path="../stream.d.ts" />
+/// <reference path="../string_decoder.d.ts" />
+/// <reference path="../timers.d.ts" />
+/// <reference path="../tls.d.ts" />
+/// <reference path="../trace_events.d.ts" />
+/// <reference path="../tty.d.ts" />
+/// <reference path="../url.d.ts" />
 /// <reference path="util.d.ts" />
-/// <reference path="v8.d.ts" />
-/// <reference path="vm.d.ts" />
-/// <reference path="worker_threads.d.ts" />
-/// <reference path="zlib.d.ts" />
+/// <reference path="../v8.d.ts" />
+/// <reference path="../vm.d.ts" />
+/// <reference path="../worker_threads.d.ts" />
+/// <reference path="../zlib.d.ts" />
diff --git a/types/node/v10/ts3.1/tslint.json b/types/node/v10/ts3.1/tslint.json
index 4d72445ea0..65e8b18d2a 100644
--- a/types/node/v10/ts3.1/tslint.json
+++ b/types/node/v10/ts3.1/tslint.json
@@ -2,9 +2,9 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "ban-types": false,
+        "no-bad-reference": false,
         "no-empty-interface": false,
         "no-single-declare-module": false,
-        "strict-export-declare-modifiers": false,
         "unified-signatures": false
     }
 }
diff --git a/types/node/v10/ts3.6/base.d.ts b/types/node/v10/ts3.6/base.d.ts
index 9142ff2a8a..184fab0df6 100644
--- a/types/node/v10/ts3.6/base.d.ts
+++ b/types/node/v10/ts3.6/base.d.ts
@@ -17,5 +17,5 @@
 /// <reference path="../ts3.1/base.d.ts" />
 
 // TypeScript 3.2-specific augmentations:
-/// <reference path="util.d.ts" />
-/// <reference path="globals.d.ts" />
+/// <reference path="../util.d.ts" />
+/// <reference path="../globals.d.ts" />
diff --git a/types/node/v10/ts3.6/tslint.json b/types/node/v10/ts3.6/tslint.json
index 075fa88707..56086bb86a 100644
--- a/types/node/v10/ts3.6/tslint.json
+++ b/types/node/v10/ts3.6/tslint.json
@@ -1,6 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-single-declare-module": false
+        "no-bad-reference": false
     }
 }
diff --git a/types/node/v10/tslint.json b/types/node/v10/tslint.json
index 1a8ddd9863..e2d74b0567 100644
--- a/types/node/v10/tslint.json
+++ b/types/node/v10/tslint.json
@@ -2,9 +2,9 @@
   "extends": "dtslint/dt.json",
   "rules": {
     "ban-types": false,
-    "unified-signatures": false,
     "no-empty-interface": false,
     "no-single-declare-module": false,
-    "strict-export-declare-modifiers": false // http2 needs this
+    "strict-export-declare-modifiers": false,
+    "unified-signatures": false
   }
 }
diff --git a/types/node/v10/ts3.1/tty.d.ts b/types/node/v10/tty.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/tty.d.ts
rename to types/node/v10/tty.d.ts
diff --git a/types/node/v10/ts3.1/url.d.ts b/types/node/v10/url.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/url.d.ts
rename to types/node/v10/url.d.ts
diff --git a/types/node/v11/ts3.6/util.d.ts b/types/node/v10/util.d.ts
similarity index 89%
rename from types/node/v11/ts3.6/util.d.ts
rename to types/node/v10/util.d.ts
index df2ad3f8da..56a879e854 100644
--- a/types/node/v11/ts3.6/util.d.ts
+++ b/types/node/v10/util.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/util.d.ts" />
+/// <reference path="ts3.1/util.d.ts" />
 
 declare module "util" {
     namespace inspect {
diff --git a/types/node/v10/ts3.1/v8.d.ts b/types/node/v10/v8.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/v8.d.ts
rename to types/node/v10/v8.d.ts
diff --git a/types/node/v10/ts3.1/vm.d.ts b/types/node/v10/vm.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/vm.d.ts
rename to types/node/v10/vm.d.ts
diff --git a/types/node/v10/ts3.1/worker_threads.d.ts b/types/node/v10/worker_threads.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/worker_threads.d.ts
rename to types/node/v10/worker_threads.d.ts
diff --git a/types/node/v10/ts3.1/zlib.d.ts b/types/node/v10/zlib.d.ts
similarity index 100%
rename from types/node/v10/ts3.1/zlib.d.ts
rename to types/node/v10/zlib.d.ts
diff --git a/types/node/v11/ts3.1/async_hooks.d.ts b/types/node/v11/async_hooks.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/async_hooks.d.ts
rename to types/node/v11/async_hooks.d.ts
diff --git a/types/node/v11/ts3.1/buffer.d.ts b/types/node/v11/buffer.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/buffer.d.ts
rename to types/node/v11/buffer.d.ts
diff --git a/types/node/v11/ts3.1/child_process.d.ts b/types/node/v11/child_process.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/child_process.d.ts
rename to types/node/v11/child_process.d.ts
diff --git a/types/node/v11/ts3.1/cluster.d.ts b/types/node/v11/cluster.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/cluster.d.ts
rename to types/node/v11/cluster.d.ts
diff --git a/types/node/v11/ts3.1/console.d.ts b/types/node/v11/console.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/console.d.ts
rename to types/node/v11/console.d.ts
diff --git a/types/node/v11/ts3.1/constants.d.ts b/types/node/v11/constants.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/constants.d.ts
rename to types/node/v11/constants.d.ts
diff --git a/types/node/v11/ts3.1/crypto.d.ts b/types/node/v11/crypto.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/crypto.d.ts
rename to types/node/v11/crypto.d.ts
diff --git a/types/node/v11/ts3.1/dgram.d.ts b/types/node/v11/dgram.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/dgram.d.ts
rename to types/node/v11/dgram.d.ts
diff --git a/types/node/v11/ts3.1/dns.d.ts b/types/node/v11/dns.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/dns.d.ts
rename to types/node/v11/dns.d.ts
diff --git a/types/node/v11/ts3.1/domain.d.ts b/types/node/v11/domain.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/domain.d.ts
rename to types/node/v11/domain.d.ts
diff --git a/types/node/v11/ts3.1/events.d.ts b/types/node/v11/events.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/events.d.ts
rename to types/node/v11/events.d.ts
diff --git a/types/node/v11/ts3.1/fs.d.ts b/types/node/v11/fs.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/fs.d.ts
rename to types/node/v11/fs.d.ts
diff --git a/types/node/v10/ts3.6/globals.d.ts b/types/node/v11/globals.d.ts
similarity index 73%
rename from types/node/v10/ts3.6/globals.d.ts
rename to types/node/v11/globals.d.ts
index a3f1b407d5..81078e31d1 100644
--- a/types/node/v10/ts3.6/globals.d.ts
+++ b/types/node/v11/globals.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/globals.d.ts" />
+/// <reference path="ts3.1/globals.d.ts" />
 
 declare namespace NodeJS {
     interface HRTime {
diff --git a/types/node/v11/ts3.1/http.d.ts b/types/node/v11/http.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/http.d.ts
rename to types/node/v11/http.d.ts
diff --git a/types/node/v11/ts3.1/http2.d.ts b/types/node/v11/http2.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/http2.d.ts
rename to types/node/v11/http2.d.ts
diff --git a/types/node/v11/ts3.1/https.d.ts b/types/node/v11/https.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/https.d.ts
rename to types/node/v11/https.d.ts
diff --git a/types/node/v11/ts3.1/inspector.d.ts b/types/node/v11/inspector.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/inspector.d.ts
rename to types/node/v11/inspector.d.ts
diff --git a/types/node/v11/ts3.1/module.d.ts b/types/node/v11/module.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/module.d.ts
rename to types/node/v11/module.d.ts
diff --git a/types/node/v11/ts3.1/net.d.ts b/types/node/v11/net.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/net.d.ts
rename to types/node/v11/net.d.ts
diff --git a/types/node/v11/ts3.1/os.d.ts b/types/node/v11/os.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/os.d.ts
rename to types/node/v11/os.d.ts
diff --git a/types/node/v11/ts3.1/path.d.ts b/types/node/v11/path.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/path.d.ts
rename to types/node/v11/path.d.ts
diff --git a/types/node/v11/ts3.1/perf_hooks.d.ts b/types/node/v11/perf_hooks.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/perf_hooks.d.ts
rename to types/node/v11/perf_hooks.d.ts
diff --git a/types/node/v11/ts3.1/process.d.ts b/types/node/v11/process.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/process.d.ts
rename to types/node/v11/process.d.ts
diff --git a/types/node/v11/ts3.1/punycode.d.ts b/types/node/v11/punycode.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/punycode.d.ts
rename to types/node/v11/punycode.d.ts
diff --git a/types/node/v11/ts3.1/querystring.d.ts b/types/node/v11/querystring.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/querystring.d.ts
rename to types/node/v11/querystring.d.ts
diff --git a/types/node/v11/ts3.1/readline.d.ts b/types/node/v11/readline.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/readline.d.ts
rename to types/node/v11/readline.d.ts
diff --git a/types/node/v11/ts3.1/repl.d.ts b/types/node/v11/repl.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/repl.d.ts
rename to types/node/v11/repl.d.ts
diff --git a/types/node/v11/ts3.1/stream.d.ts b/types/node/v11/stream.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/stream.d.ts
rename to types/node/v11/stream.d.ts
diff --git a/types/node/v11/ts3.1/string_decoder.d.ts b/types/node/v11/string_decoder.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/string_decoder.d.ts
rename to types/node/v11/string_decoder.d.ts
diff --git a/types/node/v11/ts3.1/timers.d.ts b/types/node/v11/timers.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/timers.d.ts
rename to types/node/v11/timers.d.ts
diff --git a/types/node/v11/ts3.1/tls.d.ts b/types/node/v11/tls.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/tls.d.ts
rename to types/node/v11/tls.d.ts
diff --git a/types/node/v11/ts3.1/trace_events.d.ts b/types/node/v11/trace_events.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/trace_events.d.ts
rename to types/node/v11/trace_events.d.ts
diff --git a/types/node/v11/ts3.1/base.d.ts b/types/node/v11/ts3.1/base.d.ts
index f9bc0b3d91..cf77532198 100644
--- a/types/node/v11/ts3.1/base.d.ts
+++ b/types/node/v11/ts3.1/base.d.ts
@@ -1,40 +1,40 @@
 // base definitions for all NodeJS modules that are not specific to any version of TypeScript
 /// <reference path="globals.d.ts" />
-/// <reference path="async_hooks.d.ts" />
-/// <reference path="buffer.d.ts" />
-/// <reference path="child_process.d.ts" />
-/// <reference path="cluster.d.ts" />
-/// <reference path="console.d.ts" />
-/// <reference path="constants.d.ts" />
-/// <reference path="crypto.d.ts" />
-/// <reference path="dgram.d.ts" />
-/// <reference path="dns.d.ts" />
-/// <reference path="domain.d.ts" />
-/// <reference path="events.d.ts" />
-/// <reference path="fs.d.ts" />
-/// <reference path="http.d.ts" />
-/// <reference path="http2.d.ts" />
-/// <reference path="https.d.ts" />
-/// <reference path="inspector.d.ts" />
-/// <reference path="module.d.ts" />
-/// <reference path="net.d.ts" />
-/// <reference path="os.d.ts" />
-/// <reference path="path.d.ts" />
-/// <reference path="perf_hooks.d.ts" />
-/// <reference path="process.d.ts" />
-/// <reference path="punycode.d.ts" />
-/// <reference path="querystring.d.ts" />
-/// <reference path="readline.d.ts" />
-/// <reference path="repl.d.ts" />
-/// <reference path="stream.d.ts" />
-/// <reference path="string_decoder.d.ts" />
-/// <reference path="timers.d.ts" />
-/// <reference path="tls.d.ts" />
-/// <reference path="trace_events.d.ts" />
-/// <reference path="tty.d.ts" />
-/// <reference path="url.d.ts" />
+/// <reference path="../async_hooks.d.ts" />
+/// <reference path="../buffer.d.ts" />
+/// <reference path="../child_process.d.ts" />
+/// <reference path="../cluster.d.ts" />
+/// <reference path="../console.d.ts" />
+/// <reference path="../constants.d.ts" />
+/// <reference path="../crypto.d.ts" />
+/// <reference path="../dgram.d.ts" />
+/// <reference path="../dns.d.ts" />
+/// <reference path="../domain.d.ts" />
+/// <reference path="../events.d.ts" />
+/// <reference path="../fs.d.ts" />
+/// <reference path="../http.d.ts" />
+/// <reference path="../http2.d.ts" />
+/// <reference path="../https.d.ts" />
+/// <reference path="../inspector.d.ts" />
+/// <reference path="../module.d.ts" />
+/// <reference path="../net.d.ts" />
+/// <reference path="../os.d.ts" />
+/// <reference path="../path.d.ts" />
+/// <reference path="../perf_hooks.d.ts" />
+/// <reference path="../process.d.ts" />
+/// <reference path="../punycode.d.ts" />
+/// <reference path="../querystring.d.ts" />
+/// <reference path="../readline.d.ts" />
+/// <reference path="../repl.d.ts" />
+/// <reference path="../stream.d.ts" />
+/// <reference path="../string_decoder.d.ts" />
+/// <reference path="../timers.d.ts" />
+/// <reference path="../tls.d.ts" />
+/// <reference path="../trace_events.d.ts" />
+/// <reference path="../tty.d.ts" />
+/// <reference path="../url.d.ts" />
 /// <reference path="util.d.ts" />
-/// <reference path="v8.d.ts" />
-/// <reference path="vm.d.ts" />
-/// <reference path="worker_threads.d.ts" />
-/// <reference path="zlib.d.ts" />
+/// <reference path="../v8.d.ts" />
+/// <reference path="../vm.d.ts" />
+/// <reference path="../worker_threads.d.ts" />
+/// <reference path="../zlib.d.ts" />
diff --git a/types/node/v11/ts3.1/tslint.json b/types/node/v11/ts3.1/tslint.json
index 4d72445ea0..65e8b18d2a 100644
--- a/types/node/v11/ts3.1/tslint.json
+++ b/types/node/v11/ts3.1/tslint.json
@@ -2,9 +2,9 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "ban-types": false,
+        "no-bad-reference": false,
         "no-empty-interface": false,
         "no-single-declare-module": false,
-        "strict-export-declare-modifiers": false,
         "unified-signatures": false
     }
 }
diff --git a/types/node/v11/ts3.6/base.d.ts b/types/node/v11/ts3.6/base.d.ts
index 9142ff2a8a..184fab0df6 100644
--- a/types/node/v11/ts3.6/base.d.ts
+++ b/types/node/v11/ts3.6/base.d.ts
@@ -17,5 +17,5 @@
 /// <reference path="../ts3.1/base.d.ts" />
 
 // TypeScript 3.2-specific augmentations:
-/// <reference path="util.d.ts" />
-/// <reference path="globals.d.ts" />
+/// <reference path="../util.d.ts" />
+/// <reference path="../globals.d.ts" />
diff --git a/types/node/v11/ts3.6/tslint.json b/types/node/v11/ts3.6/tslint.json
index 075fa88707..56086bb86a 100644
--- a/types/node/v11/ts3.6/tslint.json
+++ b/types/node/v11/ts3.6/tslint.json
@@ -1,6 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-single-declare-module": false
+        "no-bad-reference": false
     }
 }
diff --git a/types/node/v11/tslint.json b/types/node/v11/tslint.json
index 1a8ddd9863..e2d74b0567 100644
--- a/types/node/v11/tslint.json
+++ b/types/node/v11/tslint.json
@@ -2,9 +2,9 @@
   "extends": "dtslint/dt.json",
   "rules": {
     "ban-types": false,
-    "unified-signatures": false,
     "no-empty-interface": false,
     "no-single-declare-module": false,
-    "strict-export-declare-modifiers": false // http2 needs this
+    "strict-export-declare-modifiers": false,
+    "unified-signatures": false
   }
 }
diff --git a/types/node/v11/ts3.1/tty.d.ts b/types/node/v11/tty.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/tty.d.ts
rename to types/node/v11/tty.d.ts
diff --git a/types/node/v11/ts3.1/url.d.ts b/types/node/v11/url.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/url.d.ts
rename to types/node/v11/url.d.ts
diff --git a/types/node/v12/ts3.3/util.d.ts b/types/node/v11/util.d.ts
similarity index 89%
rename from types/node/v12/ts3.3/util.d.ts
rename to types/node/v11/util.d.ts
index df2ad3f8da..56a879e854 100644
--- a/types/node/v12/ts3.3/util.d.ts
+++ b/types/node/v11/util.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/util.d.ts" />
+/// <reference path="ts3.1/util.d.ts" />
 
 declare module "util" {
     namespace inspect {
diff --git a/types/node/v11/ts3.1/v8.d.ts b/types/node/v11/v8.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/v8.d.ts
rename to types/node/v11/v8.d.ts
diff --git a/types/node/v11/ts3.1/vm.d.ts b/types/node/v11/vm.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/vm.d.ts
rename to types/node/v11/vm.d.ts
diff --git a/types/node/v11/ts3.1/worker_threads.d.ts b/types/node/v11/worker_threads.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/worker_threads.d.ts
rename to types/node/v11/worker_threads.d.ts
diff --git a/types/node/v11/ts3.1/zlib.d.ts b/types/node/v11/zlib.d.ts
similarity index 100%
rename from types/node/v11/ts3.1/zlib.d.ts
rename to types/node/v11/zlib.d.ts
diff --git a/types/node/v12/ts3.1/async_hooks.d.ts b/types/node/v12/async_hooks.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/async_hooks.d.ts
rename to types/node/v12/async_hooks.d.ts
diff --git a/types/node/v12/ts3.1/buffer.d.ts b/types/node/v12/buffer.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/buffer.d.ts
rename to types/node/v12/buffer.d.ts
diff --git a/types/node/v12/ts3.1/child_process.d.ts b/types/node/v12/child_process.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/child_process.d.ts
rename to types/node/v12/child_process.d.ts
diff --git a/types/node/v12/ts3.1/cluster.d.ts b/types/node/v12/cluster.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/cluster.d.ts
rename to types/node/v12/cluster.d.ts
diff --git a/types/node/v12/ts3.1/console.d.ts b/types/node/v12/console.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/console.d.ts
rename to types/node/v12/console.d.ts
diff --git a/types/node/v12/ts3.1/constants.d.ts b/types/node/v12/constants.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/constants.d.ts
rename to types/node/v12/constants.d.ts
diff --git a/types/node/v12/ts3.1/crypto.d.ts b/types/node/v12/crypto.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/crypto.d.ts
rename to types/node/v12/crypto.d.ts
diff --git a/types/node/v12/ts3.1/dgram.d.ts b/types/node/v12/dgram.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/dgram.d.ts
rename to types/node/v12/dgram.d.ts
diff --git a/types/node/v12/ts3.1/dns.d.ts b/types/node/v12/dns.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/dns.d.ts
rename to types/node/v12/dns.d.ts
diff --git a/types/node/v12/ts3.1/domain.d.ts b/types/node/v12/domain.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/domain.d.ts
rename to types/node/v12/domain.d.ts
diff --git a/types/node/v12/ts3.1/events.d.ts b/types/node/v12/events.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/events.d.ts
rename to types/node/v12/events.d.ts
diff --git a/types/node/v13/ts3.4/fs.d.ts b/types/node/v12/fs.d.ts
similarity index 96%
rename from types/node/v13/ts3.4/fs.d.ts
rename to types/node/v12/fs.d.ts
index 323193ecfd..f0ae01b17c 100644
--- a/types/node/v13/ts3.4/fs.d.ts
+++ b/types/node/v12/fs.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/fs.d.ts" />
+/// <reference path="ts3.1/fs.d.ts" />
 
 declare module 'fs' {
     interface BigIntStats extends StatsBase<bigint> {
diff --git a/types/node/v12/ts3.3/globals.d.ts b/types/node/v12/globals.d.ts
similarity index 92%
rename from types/node/v12/ts3.3/globals.d.ts
rename to types/node/v12/globals.d.ts
index 6b4f36482c..56ad634485 100644
--- a/types/node/v12/ts3.3/globals.d.ts
+++ b/types/node/v12/globals.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/globals.d.ts" />
+/// <reference path="ts3.1/globals.d.ts" />
 
 declare namespace NodeJS {
     interface HRTime {
diff --git a/types/node/v12/ts3.6/globals.global.d.ts b/types/node/v12/globals.global.d.ts
similarity index 100%
rename from types/node/v12/ts3.6/globals.global.d.ts
rename to types/node/v12/globals.global.d.ts
diff --git a/types/node/v12/ts3.1/http.d.ts b/types/node/v12/http.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/http.d.ts
rename to types/node/v12/http.d.ts
diff --git a/types/node/v12/ts3.1/http2.d.ts b/types/node/v12/http2.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/http2.d.ts
rename to types/node/v12/http2.d.ts
diff --git a/types/node/v12/ts3.1/https.d.ts b/types/node/v12/https.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/https.d.ts
rename to types/node/v12/https.d.ts
diff --git a/types/node/v12/ts3.1/inspector.d.ts b/types/node/v12/inspector.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/inspector.d.ts
rename to types/node/v12/inspector.d.ts
diff --git a/types/node/v12/ts3.1/module.d.ts b/types/node/v12/module.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/module.d.ts
rename to types/node/v12/module.d.ts
diff --git a/types/node/v12/ts3.1/net.d.ts b/types/node/v12/net.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/net.d.ts
rename to types/node/v12/net.d.ts
diff --git a/types/node/v12/ts3.1/os.d.ts b/types/node/v12/os.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/os.d.ts
rename to types/node/v12/os.d.ts
diff --git a/types/node/v12/ts3.1/path.d.ts b/types/node/v12/path.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/path.d.ts
rename to types/node/v12/path.d.ts
diff --git a/types/node/v12/ts3.1/perf_hooks.d.ts b/types/node/v12/perf_hooks.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/perf_hooks.d.ts
rename to types/node/v12/perf_hooks.d.ts
diff --git a/types/node/v12/ts3.1/process.d.ts b/types/node/v12/process.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/process.d.ts
rename to types/node/v12/process.d.ts
diff --git a/types/node/v12/ts3.1/punycode.d.ts b/types/node/v12/punycode.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/punycode.d.ts
rename to types/node/v12/punycode.d.ts
diff --git a/types/node/v12/ts3.1/querystring.d.ts b/types/node/v12/querystring.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/querystring.d.ts
rename to types/node/v12/querystring.d.ts
diff --git a/types/node/v12/ts3.1/readline.d.ts b/types/node/v12/readline.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/readline.d.ts
rename to types/node/v12/readline.d.ts
diff --git a/types/node/v12/ts3.1/repl.d.ts b/types/node/v12/repl.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/repl.d.ts
rename to types/node/v12/repl.d.ts
diff --git a/types/node/v12/ts3.1/stream.d.ts b/types/node/v12/stream.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/stream.d.ts
rename to types/node/v12/stream.d.ts
diff --git a/types/node/v12/ts3.1/string_decoder.d.ts b/types/node/v12/string_decoder.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/string_decoder.d.ts
rename to types/node/v12/string_decoder.d.ts
diff --git a/types/node/v12/ts3.6/test/globals.ts b/types/node/v12/test/globals.ts
similarity index 100%
rename from types/node/v12/ts3.6/test/globals.ts
rename to types/node/v12/test/globals.ts
diff --git a/types/node/v12/ts3.1/timers.d.ts b/types/node/v12/timers.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/timers.d.ts
rename to types/node/v12/timers.d.ts
diff --git a/types/node/v12/ts3.1/tls.d.ts b/types/node/v12/tls.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/tls.d.ts
rename to types/node/v12/tls.d.ts
diff --git a/types/node/v12/ts3.1/trace_events.d.ts b/types/node/v12/trace_events.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/trace_events.d.ts
rename to types/node/v12/trace_events.d.ts
diff --git a/types/node/v12/ts3.1/base.d.ts b/types/node/v12/ts3.1/base.d.ts
index f9bc0b3d91..1be74c9f1b 100644
--- a/types/node/v12/ts3.1/base.d.ts
+++ b/types/node/v12/ts3.1/base.d.ts
@@ -1,40 +1,40 @@
 // base definitions for all NodeJS modules that are not specific to any version of TypeScript
 /// <reference path="globals.d.ts" />
-/// <reference path="async_hooks.d.ts" />
-/// <reference path="buffer.d.ts" />
-/// <reference path="child_process.d.ts" />
-/// <reference path="cluster.d.ts" />
-/// <reference path="console.d.ts" />
-/// <reference path="constants.d.ts" />
-/// <reference path="crypto.d.ts" />
-/// <reference path="dgram.d.ts" />
-/// <reference path="dns.d.ts" />
-/// <reference path="domain.d.ts" />
-/// <reference path="events.d.ts" />
+/// <reference path="../async_hooks.d.ts" />
+/// <reference path="../buffer.d.ts" />
+/// <reference path="../child_process.d.ts" />
+/// <reference path="../cluster.d.ts" />
+/// <reference path="../console.d.ts" />
+/// <reference path="../constants.d.ts" />
+/// <reference path="../crypto.d.ts" />
+/// <reference path="../dgram.d.ts" />
+/// <reference path="../dns.d.ts" />
+/// <reference path="../domain.d.ts" />
+/// <reference path="../events.d.ts" />
 /// <reference path="fs.d.ts" />
-/// <reference path="http.d.ts" />
-/// <reference path="http2.d.ts" />
-/// <reference path="https.d.ts" />
-/// <reference path="inspector.d.ts" />
-/// <reference path="module.d.ts" />
-/// <reference path="net.d.ts" />
-/// <reference path="os.d.ts" />
-/// <reference path="path.d.ts" />
-/// <reference path="perf_hooks.d.ts" />
-/// <reference path="process.d.ts" />
-/// <reference path="punycode.d.ts" />
-/// <reference path="querystring.d.ts" />
-/// <reference path="readline.d.ts" />
-/// <reference path="repl.d.ts" />
-/// <reference path="stream.d.ts" />
-/// <reference path="string_decoder.d.ts" />
-/// <reference path="timers.d.ts" />
-/// <reference path="tls.d.ts" />
-/// <reference path="trace_events.d.ts" />
-/// <reference path="tty.d.ts" />
-/// <reference path="url.d.ts" />
+/// <reference path="../http.d.ts" />
+/// <reference path="../http2.d.ts" />
+/// <reference path="../https.d.ts" />
+/// <reference path="../inspector.d.ts" />
+/// <reference path="../module.d.ts" />
+/// <reference path="../net.d.ts" />
+/// <reference path="../os.d.ts" />
+/// <reference path="../path.d.ts" />
+/// <reference path="../perf_hooks.d.ts" />
+/// <reference path="../process.d.ts" />
+/// <reference path="../punycode.d.ts" />
+/// <reference path="../querystring.d.ts" />
+/// <reference path="../readline.d.ts" />
+/// <reference path="../repl.d.ts" />
+/// <reference path="../stream.d.ts" />
+/// <reference path="../string_decoder.d.ts" />
+/// <reference path="../timers.d.ts" />
+/// <reference path="../tls.d.ts" />
+/// <reference path="../trace_events.d.ts" />
+/// <reference path="../tty.d.ts" />
+/// <reference path="../url.d.ts" />
 /// <reference path="util.d.ts" />
-/// <reference path="v8.d.ts" />
-/// <reference path="vm.d.ts" />
-/// <reference path="worker_threads.d.ts" />
-/// <reference path="zlib.d.ts" />
+/// <reference path="../v8.d.ts" />
+/// <reference path="../vm.d.ts" />
+/// <reference path="../worker_threads.d.ts" />
+/// <reference path="../zlib.d.ts" />
diff --git a/types/node/v12/ts3.1/tslint.json b/types/node/v12/ts3.1/tslint.json
index f1ded3562e..65e8b18d2a 100644
--- a/types/node/v12/ts3.1/tslint.json
+++ b/types/node/v12/ts3.1/tslint.json
@@ -2,6 +2,7 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "ban-types": false,
+        "no-bad-reference": false,
         "no-empty-interface": false,
         "no-single-declare-module": false,
         "unified-signatures": false
diff --git a/types/node/v12/ts3.3/base.d.ts b/types/node/v12/ts3.3/base.d.ts
index 2df19a6b03..ae43027b06 100644
--- a/types/node/v12/ts3.3/base.d.ts
+++ b/types/node/v12/ts3.3/base.d.ts
@@ -17,6 +17,6 @@
 /// <reference path="../ts3.1/base.d.ts" />
 
 // TypeScript 3.2-specific augmentations:
-/// <reference path="fs.d.ts" />
-/// <reference path="util.d.ts" />
-/// <reference path="globals.d.ts" />
+/// <reference path="../fs.d.ts" />
+/// <reference path="../util.d.ts" />
+/// <reference path="../globals.d.ts" />
diff --git a/types/node/v12/ts3.3/tslint.json b/types/node/v12/ts3.3/tslint.json
index 075fa88707..56086bb86a 100644
--- a/types/node/v12/ts3.3/tslint.json
+++ b/types/node/v12/ts3.3/tslint.json
@@ -1,6 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-single-declare-module": false
+        "no-bad-reference": false
     }
 }
diff --git a/types/node/v12/ts3.6/base.d.ts b/types/node/v12/ts3.6/base.d.ts
index 2f33e9dfa5..895067e9b6 100644
--- a/types/node/v12/ts3.6/base.d.ts
+++ b/types/node/v12/ts3.6/base.d.ts
@@ -17,4 +17,4 @@
 /// <reference path="../ts3.3/base.d.ts" />
 
 // TypeScript 3.5-specific augmentations:
-/// <reference path="globals.global.d.ts" />
+/// <reference path="../globals.global.d.ts" />
diff --git a/types/node/v12/ts3.6/tsconfig.json b/types/node/v12/ts3.6/tsconfig.json
index 3821dc56ce..0f6b81b812 100644
--- a/types/node/v12/ts3.6/tsconfig.json
+++ b/types/node/v12/ts3.6/tsconfig.json
@@ -1,8 +1,7 @@
 {
     "files": [
         "index.d.ts",
-        "node-tests.ts",
-        "test/globals.ts"
+        "node-tests.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/node/v12/ts3.6/tslint.json b/types/node/v12/ts3.6/tslint.json
index 3db14f85ea..9061fbd0e3 100644
--- a/types/node/v12/ts3.6/tslint.json
+++ b/types/node/v12/ts3.6/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "no-bad-reference": false
+  }
+}
diff --git a/types/node/v12/tsconfig.json b/types/node/v12/tsconfig.json
index 3624f1c893..6d52216170 100644
--- a/types/node/v12/tsconfig.json
+++ b/types/node/v12/tsconfig.json
@@ -12,6 +12,7 @@
         "test/events.ts",
         "test/fs.ts",
         "test/global.ts",
+        "test/globals.ts",
         "test/http.ts",
         "test/http2.ts",
         "test/net.ts",
diff --git a/types/node/v12/tslint.json b/types/node/v12/tslint.json
index 1a8ddd9863..db70de0c4a 100644
--- a/types/node/v12/tslint.json
+++ b/types/node/v12/tslint.json
@@ -2,9 +2,8 @@
   "extends": "dtslint/dt.json",
   "rules": {
     "ban-types": false,
-    "unified-signatures": false,
     "no-empty-interface": false,
     "no-single-declare-module": false,
-    "strict-export-declare-modifiers": false // http2 needs this
+    "unified-signatures": false
   }
 }
diff --git a/types/node/v12/ts3.1/tty.d.ts b/types/node/v12/tty.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/tty.d.ts
rename to types/node/v12/tty.d.ts
diff --git a/types/node/v12/ts3.1/url.d.ts b/types/node/v12/url.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/url.d.ts
rename to types/node/v12/url.d.ts
diff --git a/types/node/v10/ts3.6/util.d.ts b/types/node/v12/util.d.ts
similarity index 89%
rename from types/node/v10/ts3.6/util.d.ts
rename to types/node/v12/util.d.ts
index df2ad3f8da..56a879e854 100644
--- a/types/node/v10/ts3.6/util.d.ts
+++ b/types/node/v12/util.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/util.d.ts" />
+/// <reference path="ts3.1/util.d.ts" />
 
 declare module "util" {
     namespace inspect {
diff --git a/types/node/v12/ts3.1/v8.d.ts b/types/node/v12/v8.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/v8.d.ts
rename to types/node/v12/v8.d.ts
diff --git a/types/node/v12/ts3.1/vm.d.ts b/types/node/v12/vm.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/vm.d.ts
rename to types/node/v12/vm.d.ts
diff --git a/types/node/v12/ts3.1/worker_threads.d.ts b/types/node/v12/worker_threads.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/worker_threads.d.ts
rename to types/node/v12/worker_threads.d.ts
diff --git a/types/node/ts3.1/zlib.d.ts b/types/node/v12/zlib.d.ts
similarity index 100%
rename from types/node/ts3.1/zlib.d.ts
rename to types/node/v12/zlib.d.ts
diff --git a/types/node/v13/ts3.1/async_hooks.d.ts b/types/node/v13/async_hooks.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/async_hooks.d.ts
rename to types/node/v13/async_hooks.d.ts
diff --git a/types/node/v13/ts3.1/buffer.d.ts b/types/node/v13/buffer.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/buffer.d.ts
rename to types/node/v13/buffer.d.ts
diff --git a/types/node/v13/ts3.1/child_process.d.ts b/types/node/v13/child_process.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/child_process.d.ts
rename to types/node/v13/child_process.d.ts
diff --git a/types/node/v13/ts3.1/cluster.d.ts b/types/node/v13/cluster.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/cluster.d.ts
rename to types/node/v13/cluster.d.ts
diff --git a/types/node/v13/ts3.1/console.d.ts b/types/node/v13/console.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/console.d.ts
rename to types/node/v13/console.d.ts
diff --git a/types/node/v13/ts3.1/constants.d.ts b/types/node/v13/constants.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/constants.d.ts
rename to types/node/v13/constants.d.ts
diff --git a/types/node/v13/ts3.1/crypto.d.ts b/types/node/v13/crypto.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/crypto.d.ts
rename to types/node/v13/crypto.d.ts
diff --git a/types/node/v13/ts3.1/dgram.d.ts b/types/node/v13/dgram.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/dgram.d.ts
rename to types/node/v13/dgram.d.ts
diff --git a/types/node/v13/ts3.1/dns.d.ts b/types/node/v13/dns.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/dns.d.ts
rename to types/node/v13/dns.d.ts
diff --git a/types/node/v13/ts3.1/domain.d.ts b/types/node/v13/domain.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/domain.d.ts
rename to types/node/v13/domain.d.ts
diff --git a/types/node/v13/ts3.1/events.d.ts b/types/node/v13/events.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/events.d.ts
rename to types/node/v13/events.d.ts
diff --git a/types/node/ts3.4/fs.d.ts b/types/node/v13/fs.d.ts
similarity index 96%
rename from types/node/ts3.4/fs.d.ts
rename to types/node/v13/fs.d.ts
index 323193ecfd..f0ae01b17c 100644
--- a/types/node/ts3.4/fs.d.ts
+++ b/types/node/v13/fs.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/fs.d.ts" />
+/// <reference path="ts3.1/fs.d.ts" />
 
 declare module 'fs' {
     interface BigIntStats extends StatsBase<bigint> {
diff --git a/types/node/v13/ts3.4/globals.d.ts b/types/node/v13/globals.d.ts
similarity index 92%
rename from types/node/v13/ts3.4/globals.d.ts
rename to types/node/v13/globals.d.ts
index 6b4f36482c..56ad634485 100644
--- a/types/node/v13/ts3.4/globals.d.ts
+++ b/types/node/v13/globals.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/globals.d.ts" />
+/// <reference path="ts3.1/globals.d.ts" />
 
 declare namespace NodeJS {
     interface HRTime {
diff --git a/types/node/v13/ts3.6/globals.global.d.ts b/types/node/v13/globals.global.d.ts
similarity index 100%
rename from types/node/v13/ts3.6/globals.global.d.ts
rename to types/node/v13/globals.global.d.ts
diff --git a/types/node/v13/ts3.1/http.d.ts b/types/node/v13/http.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/http.d.ts
rename to types/node/v13/http.d.ts
diff --git a/types/node/v13/ts3.1/http2.d.ts b/types/node/v13/http2.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/http2.d.ts
rename to types/node/v13/http2.d.ts
diff --git a/types/node/v13/ts3.1/https.d.ts b/types/node/v13/https.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/https.d.ts
rename to types/node/v13/https.d.ts
diff --git a/types/node/v13/ts3.1/inspector.d.ts b/types/node/v13/inspector.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/inspector.d.ts
rename to types/node/v13/inspector.d.ts
diff --git a/types/node/v13/ts3.1/module.d.ts b/types/node/v13/module.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/module.d.ts
rename to types/node/v13/module.d.ts
diff --git a/types/node/v13/ts3.1/net.d.ts b/types/node/v13/net.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/net.d.ts
rename to types/node/v13/net.d.ts
diff --git a/types/node/v13/ts3.1/os.d.ts b/types/node/v13/os.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/os.d.ts
rename to types/node/v13/os.d.ts
diff --git a/types/node/v13/ts3.1/path.d.ts b/types/node/v13/path.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/path.d.ts
rename to types/node/v13/path.d.ts
diff --git a/types/node/v13/ts3.1/perf_hooks.d.ts b/types/node/v13/perf_hooks.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/perf_hooks.d.ts
rename to types/node/v13/perf_hooks.d.ts
diff --git a/types/node/v13/ts3.1/process.d.ts b/types/node/v13/process.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/process.d.ts
rename to types/node/v13/process.d.ts
diff --git a/types/node/v13/ts3.1/punycode.d.ts b/types/node/v13/punycode.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/punycode.d.ts
rename to types/node/v13/punycode.d.ts
diff --git a/types/node/v13/ts3.1/querystring.d.ts b/types/node/v13/querystring.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/querystring.d.ts
rename to types/node/v13/querystring.d.ts
diff --git a/types/node/v13/ts3.1/readline.d.ts b/types/node/v13/readline.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/readline.d.ts
rename to types/node/v13/readline.d.ts
diff --git a/types/node/v13/ts3.1/repl.d.ts b/types/node/v13/repl.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/repl.d.ts
rename to types/node/v13/repl.d.ts
diff --git a/types/node/v13/ts3.1/stream.d.ts b/types/node/v13/stream.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/stream.d.ts
rename to types/node/v13/stream.d.ts
diff --git a/types/node/v13/ts3.1/string_decoder.d.ts b/types/node/v13/string_decoder.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/string_decoder.d.ts
rename to types/node/v13/string_decoder.d.ts
diff --git a/types/node/v13/ts3.1/test/assert.ts b/types/node/v13/test/assert.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/assert.ts
rename to types/node/v13/test/assert.ts
diff --git a/types/node/v13/ts3.1/test/async_hooks.ts b/types/node/v13/test/async_hooks.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/async_hooks.ts
rename to types/node/v13/test/async_hooks.ts
diff --git a/types/node/v13/ts3.1/test/buffer.ts b/types/node/v13/test/buffer.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/buffer.ts
rename to types/node/v13/test/buffer.ts
diff --git a/types/node/v13/ts3.1/test/child_process.ts b/types/node/v13/test/child_process.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/child_process.ts
rename to types/node/v13/test/child_process.ts
diff --git a/types/node/v13/ts3.1/test/cluster.ts b/types/node/v13/test/cluster.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/cluster.ts
rename to types/node/v13/test/cluster.ts
diff --git a/types/node/v13/ts3.1/test/constants.ts b/types/node/v13/test/constants.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/constants.ts
rename to types/node/v13/test/constants.ts
diff --git a/types/node/v13/ts3.1/test/crypto.ts b/types/node/v13/test/crypto.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/crypto.ts
rename to types/node/v13/test/crypto.ts
diff --git a/types/node/v13/ts3.1/test/dgram.ts b/types/node/v13/test/dgram.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/dgram.ts
rename to types/node/v13/test/dgram.ts
diff --git a/types/node/v13/ts3.1/test/dns.ts b/types/node/v13/test/dns.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/dns.ts
rename to types/node/v13/test/dns.ts
diff --git a/types/node/v13/ts3.1/test/events.ts b/types/node/v13/test/events.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/events.ts
rename to types/node/v13/test/events.ts
diff --git a/types/node/v13/ts3.1/test/fs.ts b/types/node/v13/test/fs.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/fs.ts
rename to types/node/v13/test/fs.ts
diff --git a/types/node/v13/ts3.1/test/global.ts b/types/node/v13/test/global.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/global.ts
rename to types/node/v13/test/global.ts
diff --git a/types/node/v13/ts3.6/test/globals.ts b/types/node/v13/test/globals.ts
similarity index 100%
rename from types/node/v13/ts3.6/test/globals.ts
rename to types/node/v13/test/globals.ts
diff --git a/types/node/v13/ts3.1/test/http.ts b/types/node/v13/test/http.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/http.ts
rename to types/node/v13/test/http.ts
diff --git a/types/node/v13/ts3.1/test/http2.ts b/types/node/v13/test/http2.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/http2.ts
rename to types/node/v13/test/http2.ts
diff --git a/types/node/v13/ts3.1/test/module.ts b/types/node/v13/test/module.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/module.ts
rename to types/node/v13/test/module.ts
diff --git a/types/node/v13/ts3.1/test/net.ts b/types/node/v13/test/net.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/net.ts
rename to types/node/v13/test/net.ts
diff --git a/types/node/v13/ts3.1/test/os.ts b/types/node/v13/test/os.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/os.ts
rename to types/node/v13/test/os.ts
diff --git a/types/node/v13/ts3.1/test/path.ts b/types/node/v13/test/path.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/path.ts
rename to types/node/v13/test/path.ts
diff --git a/types/node/v13/ts3.1/test/perf_hooks.ts b/types/node/v13/test/perf_hooks.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/perf_hooks.ts
rename to types/node/v13/test/perf_hooks.ts
diff --git a/types/node/v13/ts3.1/test/process.ts b/types/node/v13/test/process.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/process.ts
rename to types/node/v13/test/process.ts
diff --git a/types/node/v13/ts3.1/test/querystring.ts b/types/node/v13/test/querystring.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/querystring.ts
rename to types/node/v13/test/querystring.ts
diff --git a/types/node/v13/ts3.1/test/readline.ts b/types/node/v13/test/readline.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/readline.ts
rename to types/node/v13/test/readline.ts
diff --git a/types/node/v13/ts3.1/test/repl.ts b/types/node/v13/test/repl.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/repl.ts
rename to types/node/v13/test/repl.ts
diff --git a/types/node/v13/ts3.1/test/stream.ts b/types/node/v13/test/stream.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/stream.ts
rename to types/node/v13/test/stream.ts
diff --git a/types/node/v13/ts3.1/test/string_decoder.ts b/types/node/v13/test/string_decoder.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/string_decoder.ts
rename to types/node/v13/test/string_decoder.ts
diff --git a/types/node/v13/ts3.1/test/tls.ts b/types/node/v13/test/tls.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/tls.ts
rename to types/node/v13/test/tls.ts
diff --git a/types/node/v13/ts3.1/test/tty.ts b/types/node/v13/test/tty.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/tty.ts
rename to types/node/v13/test/tty.ts
diff --git a/types/node/v13/ts3.1/test/url.ts b/types/node/v13/test/url.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/url.ts
rename to types/node/v13/test/url.ts
diff --git a/types/node/v13/ts3.1/test/util.ts b/types/node/v13/test/util.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/util.ts
rename to types/node/v13/test/util.ts
diff --git a/types/node/v13/ts3.1/test/v8.ts b/types/node/v13/test/v8.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/v8.ts
rename to types/node/v13/test/v8.ts
diff --git a/types/node/v13/ts3.1/test/vm.ts b/types/node/v13/test/vm.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/vm.ts
rename to types/node/v13/test/vm.ts
diff --git a/types/node/v13/ts3.1/test/worker_threads.ts b/types/node/v13/test/worker_threads.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/worker_threads.ts
rename to types/node/v13/test/worker_threads.ts
diff --git a/types/node/v13/ts3.1/test/zlib.ts b/types/node/v13/test/zlib.ts
similarity index 100%
rename from types/node/v13/ts3.1/test/zlib.ts
rename to types/node/v13/test/zlib.ts
diff --git a/types/node/v13/ts3.1/timers.d.ts b/types/node/v13/timers.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/timers.d.ts
rename to types/node/v13/timers.d.ts
diff --git a/types/node/v13/ts3.1/tls.d.ts b/types/node/v13/tls.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/tls.d.ts
rename to types/node/v13/tls.d.ts
diff --git a/types/node/v13/ts3.1/trace_events.d.ts b/types/node/v13/trace_events.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/trace_events.d.ts
rename to types/node/v13/trace_events.d.ts
diff --git a/types/node/v13/ts3.1/base.d.ts b/types/node/v13/ts3.1/base.d.ts
index f9bc0b3d91..1be74c9f1b 100644
--- a/types/node/v13/ts3.1/base.d.ts
+++ b/types/node/v13/ts3.1/base.d.ts
@@ -1,40 +1,40 @@
 // base definitions for all NodeJS modules that are not specific to any version of TypeScript
 /// <reference path="globals.d.ts" />
-/// <reference path="async_hooks.d.ts" />
-/// <reference path="buffer.d.ts" />
-/// <reference path="child_process.d.ts" />
-/// <reference path="cluster.d.ts" />
-/// <reference path="console.d.ts" />
-/// <reference path="constants.d.ts" />
-/// <reference path="crypto.d.ts" />
-/// <reference path="dgram.d.ts" />
-/// <reference path="dns.d.ts" />
-/// <reference path="domain.d.ts" />
-/// <reference path="events.d.ts" />
+/// <reference path="../async_hooks.d.ts" />
+/// <reference path="../buffer.d.ts" />
+/// <reference path="../child_process.d.ts" />
+/// <reference path="../cluster.d.ts" />
+/// <reference path="../console.d.ts" />
+/// <reference path="../constants.d.ts" />
+/// <reference path="../crypto.d.ts" />
+/// <reference path="../dgram.d.ts" />
+/// <reference path="../dns.d.ts" />
+/// <reference path="../domain.d.ts" />
+/// <reference path="../events.d.ts" />
 /// <reference path="fs.d.ts" />
-/// <reference path="http.d.ts" />
-/// <reference path="http2.d.ts" />
-/// <reference path="https.d.ts" />
-/// <reference path="inspector.d.ts" />
-/// <reference path="module.d.ts" />
-/// <reference path="net.d.ts" />
-/// <reference path="os.d.ts" />
-/// <reference path="path.d.ts" />
-/// <reference path="perf_hooks.d.ts" />
-/// <reference path="process.d.ts" />
-/// <reference path="punycode.d.ts" />
-/// <reference path="querystring.d.ts" />
-/// <reference path="readline.d.ts" />
-/// <reference path="repl.d.ts" />
-/// <reference path="stream.d.ts" />
-/// <reference path="string_decoder.d.ts" />
-/// <reference path="timers.d.ts" />
-/// <reference path="tls.d.ts" />
-/// <reference path="trace_events.d.ts" />
-/// <reference path="tty.d.ts" />
-/// <reference path="url.d.ts" />
+/// <reference path="../http.d.ts" />
+/// <reference path="../http2.d.ts" />
+/// <reference path="../https.d.ts" />
+/// <reference path="../inspector.d.ts" />
+/// <reference path="../module.d.ts" />
+/// <reference path="../net.d.ts" />
+/// <reference path="../os.d.ts" />
+/// <reference path="../path.d.ts" />
+/// <reference path="../perf_hooks.d.ts" />
+/// <reference path="../process.d.ts" />
+/// <reference path="../punycode.d.ts" />
+/// <reference path="../querystring.d.ts" />
+/// <reference path="../readline.d.ts" />
+/// <reference path="../repl.d.ts" />
+/// <reference path="../stream.d.ts" />
+/// <reference path="../string_decoder.d.ts" />
+/// <reference path="../timers.d.ts" />
+/// <reference path="../tls.d.ts" />
+/// <reference path="../trace_events.d.ts" />
+/// <reference path="../tty.d.ts" />
+/// <reference path="../url.d.ts" />
 /// <reference path="util.d.ts" />
-/// <reference path="v8.d.ts" />
-/// <reference path="vm.d.ts" />
-/// <reference path="worker_threads.d.ts" />
-/// <reference path="zlib.d.ts" />
+/// <reference path="../v8.d.ts" />
+/// <reference path="../vm.d.ts" />
+/// <reference path="../worker_threads.d.ts" />
+/// <reference path="../zlib.d.ts" />
diff --git a/types/node/v13/ts3.1/tsconfig.json b/types/node/v13/ts3.1/tsconfig.json
index 710dbc1822..e2e30153f8 100644
--- a/types/node/v13/ts3.1/tsconfig.json
+++ b/types/node/v13/ts3.1/tsconfig.json
@@ -1,40 +1,7 @@
 {
     "files": [
         "index.d.ts",
-        "node-tests.ts",
-        "test/assert.ts",
-        "test/async_hooks.ts",
-        "test/buffer.ts",
-        "test/child_process.ts",
-        "test/constants.ts",
-        "test/cluster.ts",
-        "test/crypto.ts",
-        "test/dgram.ts",
-        "test/dns.ts",
-        "test/events.ts",
-        "test/fs.ts",
-        "test/global.ts",
-        "test/http.ts",
-        "test/http2.ts",
-        "test/module.ts",
-        "test/net.ts",
-        "test/os.ts",
-        "test/path.ts",
-        "test/perf_hooks.ts",
-        "test/process.ts",
-        "test/querystring.ts",
-        "test/readline.ts",
-        "test/repl.ts",
-        "test/stream.ts",
-        "test/string_decoder.ts",
-        "test/tls.ts",
-        "test/tty.ts",
-        "test/util.ts",
-        "test/v8.ts",
-        "test/vm.ts",
-        "test/worker_threads.ts",
-        "test/zlib.ts",
-        "test/url.ts"
+        "node-tests.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/node/v13/ts3.1/tslint.json b/types/node/v13/ts3.1/tslint.json
index 464f610b93..65e8b18d2a 100644
--- a/types/node/v13/ts3.1/tslint.json
+++ b/types/node/v13/ts3.1/tslint.json
@@ -2,9 +2,9 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "ban-types": false,
+        "no-bad-reference": false,
         "no-empty-interface": false,
         "no-single-declare-module": false,
-        "no-unnecessary-class": false,
         "unified-signatures": false
     }
 }
diff --git a/types/node/v13/ts3.4/base.d.ts b/types/node/v13/ts3.4/base.d.ts
index 2df19a6b03..ae43027b06 100644
--- a/types/node/v13/ts3.4/base.d.ts
+++ b/types/node/v13/ts3.4/base.d.ts
@@ -17,6 +17,6 @@
 /// <reference path="../ts3.1/base.d.ts" />
 
 // TypeScript 3.2-specific augmentations:
-/// <reference path="fs.d.ts" />
-/// <reference path="util.d.ts" />
-/// <reference path="globals.d.ts" />
+/// <reference path="../fs.d.ts" />
+/// <reference path="../util.d.ts" />
+/// <reference path="../globals.d.ts" />
diff --git a/types/node/v13/ts3.4/tslint.json b/types/node/v13/ts3.4/tslint.json
index 1a8ddd9863..9061fbd0e3 100644
--- a/types/node/v13/ts3.4/tslint.json
+++ b/types/node/v13/ts3.4/tslint.json
@@ -1,10 +1,6 @@
 {
   "extends": "dtslint/dt.json",
   "rules": {
-    "ban-types": false,
-    "unified-signatures": false,
-    "no-empty-interface": false,
-    "no-single-declare-module": false,
-    "strict-export-declare-modifiers": false // http2 needs this
+    "no-bad-reference": false
   }
 }
diff --git a/types/node/v13/ts3.6/base.d.ts b/types/node/v13/ts3.6/base.d.ts
index a8c0d1a667..877a9e8e1f 100644
--- a/types/node/v13/ts3.6/base.d.ts
+++ b/types/node/v13/ts3.6/base.d.ts
@@ -17,7 +17,7 @@
 /// <reference path="../ts3.4/base.d.ts" />
 
 // TypeScript 3.4-specific augmentations:
-/// <reference path="globals.global.d.ts" />
+/// <reference path="../globals.global.d.ts" />
 
 // TypeScript 3.5-specific augmentations:
-/// <reference path="wasi.d.ts" />
+/// <reference path="../wasi.d.ts" />
diff --git a/types/node/v13/ts3.6/tsconfig.json b/types/node/v13/ts3.6/tsconfig.json
index 26d7b6b5ec..e2e30153f8 100644
--- a/types/node/v13/ts3.6/tsconfig.json
+++ b/types/node/v13/ts3.6/tsconfig.json
@@ -1,8 +1,7 @@
 {
     "files": [
         "index.d.ts",
-        "node-tests.ts",
-        "test/globals.ts"
+        "node-tests.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/node/v13/ts3.6/tslint.json b/types/node/v13/ts3.6/tslint.json
index 075fa88707..56086bb86a 100644
--- a/types/node/v13/ts3.6/tslint.json
+++ b/types/node/v13/ts3.6/tslint.json
@@ -1,6 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-single-declare-module": false
+        "no-bad-reference": false
     }
 }
diff --git a/types/node/v13/tsconfig.json b/types/node/v13/tsconfig.json
index 381371a02c..7d373947ca 100644
--- a/types/node/v13/tsconfig.json
+++ b/types/node/v13/tsconfig.json
@@ -1,7 +1,41 @@
 {
     "files": [
         "index.d.ts",
-        "node-tests.ts"
+        "node-tests.ts",
+        "test/assert.ts",
+        "test/async_hooks.ts",
+        "test/buffer.ts",
+        "test/child_process.ts",
+        "test/cluster.ts",
+        "test/constants.ts",
+        "test/crypto.ts",
+        "test/dgram.ts",
+        "test/dns.ts",
+        "test/events.ts",
+        "test/fs.ts",
+        "test/global.ts",
+        "test/globals.ts",
+        "test/http.ts",
+        "test/http2.ts",
+        "test/module.ts",
+        "test/net.ts",
+        "test/os.ts",
+        "test/path.ts",
+        "test/perf_hooks.ts",
+        "test/process.ts",
+        "test/querystring.ts",
+        "test/readline.ts",
+        "test/repl.ts",
+        "test/stream.ts",
+        "test/string_decoder.ts",
+        "test/tls.ts",
+        "test/tty.ts",
+        "test/url.ts",
+        "test/util.ts",
+        "test/v8.ts",
+        "test/vm.ts",
+        "test/worker_threads.ts",
+        "test/zlib.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/node/v13/tslint.json b/types/node/v13/tslint.json
index 1a8ddd9863..0637c40202 100644
--- a/types/node/v13/tslint.json
+++ b/types/node/v13/tslint.json
@@ -2,9 +2,9 @@
   "extends": "dtslint/dt.json",
   "rules": {
     "ban-types": false,
-    "unified-signatures": false,
     "no-empty-interface": false,
     "no-single-declare-module": false,
-    "strict-export-declare-modifiers": false // http2 needs this
+    "no-unnecessary-class": false,
+    "unified-signatures": false
   }
 }
diff --git a/types/node/v13/ts3.1/tty.d.ts b/types/node/v13/tty.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/tty.d.ts
rename to types/node/v13/tty.d.ts
diff --git a/types/node/v13/ts3.1/url.d.ts b/types/node/v13/url.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/url.d.ts
rename to types/node/v13/url.d.ts
diff --git a/types/node/ts3.4/util.d.ts b/types/node/v13/util.d.ts
similarity index 84%
rename from types/node/ts3.4/util.d.ts
rename to types/node/v13/util.d.ts
index cd68bce0cd..84d7ae2c0b 100644
--- a/types/node/ts3.4/util.d.ts
+++ b/types/node/v13/util.d.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.1/util.d.ts" />
+/// <reference path="ts3.1/util.d.ts" />
 
 declare module "util" {
     namespace types {
diff --git a/types/node/ts3.1/v8.d.ts b/types/node/v13/v8.d.ts
similarity index 100%
rename from types/node/ts3.1/v8.d.ts
rename to types/node/v13/v8.d.ts
diff --git a/types/node/v13/ts3.1/vm.d.ts b/types/node/v13/vm.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/vm.d.ts
rename to types/node/v13/vm.d.ts
diff --git a/types/node/ts3.6/wasi.d.ts b/types/node/v13/wasi.d.ts
similarity index 100%
rename from types/node/ts3.6/wasi.d.ts
rename to types/node/v13/wasi.d.ts
diff --git a/types/node/v13/ts3.1/worker_threads.d.ts b/types/node/v13/worker_threads.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/worker_threads.d.ts
rename to types/node/v13/worker_threads.d.ts
diff --git a/types/node/v12/ts3.1/zlib.d.ts b/types/node/v13/zlib.d.ts
similarity index 100%
rename from types/node/v12/ts3.1/zlib.d.ts
rename to types/node/v13/zlib.d.ts
diff --git a/types/node/v13/ts3.1/v8.d.ts b/types/node/v8.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/v8.d.ts
rename to types/node/v8.d.ts
diff --git a/types/node/ts3.1/vm.d.ts b/types/node/vm.d.ts
similarity index 100%
rename from types/node/ts3.1/vm.d.ts
rename to types/node/vm.d.ts
diff --git a/types/node/v13/ts3.6/wasi.d.ts b/types/node/wasi.d.ts
similarity index 100%
rename from types/node/v13/ts3.6/wasi.d.ts
rename to types/node/wasi.d.ts
diff --git a/types/node/ts3.1/worker_threads.d.ts b/types/node/worker_threads.d.ts
similarity index 100%
rename from types/node/ts3.1/worker_threads.d.ts
rename to types/node/worker_threads.d.ts
diff --git a/types/node/v13/ts3.1/zlib.d.ts b/types/node/zlib.d.ts
similarity index 100%
rename from types/node/v13/ts3.1/zlib.d.ts
rename to types/node/zlib.d.ts