diff --git a/package-lock.json b/package-lock.json
index 935b1b8..169788d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,19 +95,10 @@
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         }
       }
@@ -196,9 +187,9 @@
       }
     },
     "@types/node": {
-      "version": "12.12.55",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.55.tgz",
-      "integrity": "sha512-Vd6xQUVvPCTm7Nx1N7XHcpX6t047ltm7TgcsOr4gFHjeYgwZevo+V7I1lfzHnj5BT5frztZ42+RTG4MwYw63dw=="
+      "version": "12.12.58",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.58.tgz",
+      "integrity": "sha512-Be46CNIHWAagEfINOjmriSxuv7IVcqbGe+sDSg2SYCEz/0CRBy7LRASGfRbD8KZkqoePU73Wsx3UvOSFcq/9hA=="
     },
     "@types/responselike": {
       "version": "1.0.0",
@@ -230,13 +221,13 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.0.1.tgz",
-      "integrity": "sha512-pQZtXupCn11O4AwpYVUX4PDFfmIJl90ZgrEBg0CEcqlwvPiG0uY81fimr1oMFblZnpKAq6prrT9a59pj1x58rw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.0.tgz",
+      "integrity": "sha512-U+nRJx8XDUqJxYF0FCXbpmD9nWt/xHDDG0zsw1vrVYAmEAuD/r49iowfurjSL2uTA2JsgtpsyG7mjO7PHf2dYw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.0.1",
-        "@typescript-eslint/scope-manager": "4.0.1",
+        "@typescript-eslint/experimental-utils": "4.1.0",
+        "@typescript-eslint/scope-manager": "4.1.0",
         "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
@@ -245,55 +236,55 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.0.1.tgz",
-      "integrity": "sha512-gAqOjLiHoED79iYTt3F4uSHrYmg/GPz/zGezdB0jAdr6S6gwNiR/j7cTZ8nREKVzMVKLd9G3xbg1sV9GClW3sw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.0.tgz",
+      "integrity": "sha512-paEYLA37iqRIDPeQwAmoYSiZ3PiHsaAc3igFeBTeqRHgPnHjHLJ9OGdmP6nwAkF65p2QzEsEBtpjNUBWByNWzA==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.0.1",
-        "@typescript-eslint/types": "4.0.1",
-        "@typescript-eslint/typescript-estree": "4.0.1",
+        "@typescript-eslint/scope-manager": "4.1.0",
+        "@typescript-eslint/types": "4.1.0",
+        "@typescript-eslint/typescript-estree": "4.1.0",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.0.1.tgz",
-      "integrity": "sha512-1+qLmXHNAWSQ7RB6fdSQszAiA7JTwzakj5cNYjBTUmpH2cqilxMZEIV+DRKjVZs8NzP3ALmKexB0w/ExjcK9Iw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.1.0.tgz",
+      "integrity": "sha512-hM/WNCQTzDHgS0Ke3cR9zPndL3OTKr9OoN9CL3UqulsAjYDrglSwIIgswSmHBcSbOzLmgaMARwrQEbIumIglvQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.0.1",
-        "@typescript-eslint/types": "4.0.1",
-        "@typescript-eslint/typescript-estree": "4.0.1",
+        "@typescript-eslint/scope-manager": "4.1.0",
+        "@typescript-eslint/types": "4.1.0",
+        "@typescript-eslint/typescript-estree": "4.1.0",
         "debug": "^4.1.1"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.0.1.tgz",
-      "integrity": "sha512-u3YEXVJ8jsj7QCJk3om0Y457fy2euEOkkzxIB/LKU3MdyI+FJ2gI0M4aKEaXzwCSfNDiZ13a3lDo5DVozc+XLQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.1.0.tgz",
+      "integrity": "sha512-HD1/u8vFNnxwiHqlWKC/Pigdn0Mvxi84Y6GzbZ5f5sbLrFKu0al02573Er+D63Sw67IffVUXR0uR8rpdfdk+vA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.0.1",
-        "@typescript-eslint/visitor-keys": "4.0.1"
+        "@typescript-eslint/types": "4.1.0",
+        "@typescript-eslint/visitor-keys": "4.1.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.0.1.tgz",
-      "integrity": "sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.1.0.tgz",
+      "integrity": "sha512-rkBqWsO7m01XckP9R2YHVN8mySOKKY2cophGM8K5uDK89ArCgahItQYdbg/3n8xMxzu2elss+an1TphlUpDuJw==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz",
-      "integrity": "sha512-zGzleORFXrRWRJAMLTB2iJD1IZbCPkg4hsI8mGdpYlKaqzvKYSEWVAYh14eauaR+qIoZVWrXgYSXqLtTlxotiw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.0.tgz",
+      "integrity": "sha512-r6et57qqKAWU173nWyw31x7OfgmKfMEcjJl9vlJEzS+kf9uKNRr4AVTRXfTCwebr7bdiVEkfRY5xGnpPaNPe4Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.0.1",
-        "@typescript-eslint/visitor-keys": "4.0.1",
+        "@typescript-eslint/types": "4.1.0",
+        "@typescript-eslint/visitor-keys": "4.1.0",
         "debug": "^4.1.1",
         "globby": "^11.0.1",
         "is-glob": "^4.0.1",
@@ -303,21 +294,13 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.0.1.tgz",
-      "integrity": "sha512-yBSqd6FjnTzbg5RUy9J+9kJEyQjTI34JdGMJz+9ttlJzLCnGkBikxw+N5n2VDcc3CesbIEJ0MnZc5uRYnrEnCw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.0.tgz",
+      "integrity": "sha512-+taO0IZGCtCEsuNTTF2Q/5o8+fHrlml8i9YsZt2AiDCdYEJzYlsmRY991l/6f3jNXFyAWepdQj7n8Na6URiDRQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.0.1",
+        "@typescript-eslint/types": "4.1.0",
         "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-          "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
-          "dev": true
-        }
       }
     },
     "acorn": {
@@ -327,9 +310,9 @@
       "dev": true
     },
     "acorn-jsx": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
       "dev": true
     },
     "ajv": {
@@ -445,11 +428,6 @@
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
     "chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -478,13 +456,13 @@
       }
     },
     "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.1.tgz",
+      "integrity": "sha512-rcvHOWyGyid6I1WjT/3NatKj2kDt9OdSHSXpyLXaMWFbKpGACNW8pRhhdPUq9MWUOdwn8Rz9AVETjF4105rZZQ==",
       "requires": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "wrap-ansi": "^7.0.0"
       }
     },
     "clone-response": {
@@ -586,11 +564,6 @@
         "ms": "^2.1.1"
       }
     },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
     "decompress-response": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -667,6 +640,11 @@
         "ansi-colors": "^4.1.1"
       }
     },
+    "escalade": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz",
+      "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -674,9 +652,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.8.1.tgz",
-      "integrity": "sha512-/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz",
+      "integrity": "sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -718,30 +696,27 @@
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         }
       }
     },
     "eslint-scope": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
-      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
+        "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
       }
     },
@@ -752,12 +727,20 @@
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
       "dev": true
     },
     "espree": {
@@ -769,6 +752,14 @@
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.2.0",
         "eslint-visitor-keys": "^1.3.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
     "esprima": {
@@ -795,12 +786,20 @@
       }
     },
     "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
       }
     },
     "estraverse": {
@@ -884,15 +883,6 @@
         "to-regex-range": "^5.0.1"
       }
     },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
     "flat-cache": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
@@ -1006,20 +996,12 @@
         "ignore": "^5.1.4",
         "merge2": "^1.3.0",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-          "dev": true
-        }
       }
     },
     "got": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.6.0.tgz",
-      "integrity": "sha512-ErhWb4IUjQzJ3vGs3+RR12NWlBDDkRciFpAkQ1LPUxi6OnwhGj07gQxjPsyIk69s7qMihwKrKquV6VQq7JNYLA==",
+      "version": "11.6.2",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.6.2.tgz",
+      "integrity": "sha512-/21qgUePCeus29Jk7MEti8cgQUNXFSWfIevNIk4H7u1wmXNDrGPKPY6YsPY+o9CIT/a2DjCjRz0x1nM9FtS2/A==",
       "requires": {
         "@sindresorhus/is": "^3.1.1",
         "@szmarczak/http-timer": "^4.0.5",
@@ -1065,9 +1047,9 @@
       }
     },
     "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
       "dev": true
     },
     "import-fresh": {
@@ -1213,18 +1195,10 @@
         "type-check": "~0.4.0"
       }
     },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
     "lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
       "dev": true
     },
     "logform": {
@@ -1358,27 +1332,6 @@
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz",
       "integrity": "sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="
     },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -1388,11 +1341,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -1475,11 +1423,6 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
     "resolve-alpn": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz",
@@ -1531,11 +1474,6 @@
       "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
       "dev": true
     },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -1812,11 +1750,6 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-    },
     "winston": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
@@ -1878,9 +1811,9 @@
       "dev": true
     },
     "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -1902,36 +1835,28 @@
       }
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.1.tgz",
+      "integrity": "sha512-/jJ831jEs4vGDbYPQp4yGKDYPSCCEQ45uZWJHE1AoYBzqdZi8+LDWas0z4HrmJXmKdpFsTiowSHXdxyFhpmdMg=="
     },
     "yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.0.3.tgz",
+      "integrity": "sha512-6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA==",
       "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.0",
+        "escalade": "^3.0.2",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
         "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "y18n": "^5.0.1",
+        "yargs-parser": "^20.0.0"
       }
     },
     "yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz",
+      "integrity": "sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA=="
     }
   }
 }
diff --git a/package.json b/package.json
index 09c69a4..30210f7 100644
--- a/package.json
+++ b/package.json
@@ -27,25 +27,25 @@
   "homepage": "https://github.com/dscalzi/Nebula#readme",
   "devDependencies": {
     "@types/fs-extra": "^9.0.1",
-    "@types/node": "^12.12.55",
+    "@types/node": "^12.12.58",
     "@types/triple-beam": "^1.3.2",
     "@types/yargs": "^15.0.5",
-    "@typescript-eslint/eslint-plugin": "^4.0.1",
-    "@typescript-eslint/parser": "^4.0.1",
-    "eslint": "^7.8.1",
+    "@typescript-eslint/eslint-plugin": "^4.1.0",
+    "@typescript-eslint/parser": "^4.1.0",
+    "eslint": "^7.9.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.0.2"
   },
   "dependencies": {
     "dotenv": "^8.2.0",
     "fs-extra": "^9.0.1",
-    "got": "^11.6.0",
+    "got": "^11.6.2",
     "helios-distribution-types": "^1.0.0-pre.1",
     "moment": "^2.27.0",
     "node-stream-zip": "^1.11.3",
     "toml": "^3.0.0",
     "triple-beam": "^1.3.0",
     "winston": "^3.3.3",
-    "yargs": "^15.4.1"
+    "yargs": "^16.0.3"
   }
 }
diff --git a/src/index.ts b/src/index.ts
index 3a824d5..4c4c6c1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,8 +5,8 @@ import { resolve as resolvePath } from 'path'
 import { URL } from 'url'
 import { inspect } from 'util'
 import yargs from 'yargs'
-import { DistributionStructure } from './model/struct/model/distribution.struct'
-import { ServerStructure } from './model/struct/model/server.struct'
+import { DistributionStructure } from './structure/spec_model/Distribution.struct'
+import { ServerStructure } from './structure/spec_model/Server.struct'
 import { VersionSegmentedRegistry } from './util/VersionSegmentedRegistry'
 import { VersionUtil } from './util/versionutil'
 import { MinecraftVersion } from './util/MinecraftVersion'
diff --git a/src/resolver/forge/adapter/ForgeGradle2.resolver.ts b/src/resolver/forge/adapter/ForgeGradle2.resolver.ts
index ad73be4..21fb738 100644
--- a/src/resolver/forge/adapter/ForgeGradle2.resolver.ts
+++ b/src/resolver/forge/adapter/ForgeGradle2.resolver.ts
@@ -3,7 +3,7 @@ import { copy, lstat, mkdirs, pathExists, readFile, remove } from 'fs-extra'
 import { Module, Type } from 'helios-distribution-types'
 import { basename, join } from 'path'
 import { VersionManifestFG2 } from '../../../model/forge/VersionManifestFG2'
-import { LibRepoStructure } from '../../../model/struct/repo/librepo.struct'
+import { LibRepoStructure } from '../../../structure/repo/LibRepo.struct'
 import { MavenUtil } from '../../../util/maven'
 import { PackXZExtractWrapper } from '../../../util/java/PackXZExtractWrapper'
 import { VersionUtil } from '../../../util/versionutil'
diff --git a/src/resolver/forge/adapter/ForgeGradle3.resolver.ts b/src/resolver/forge/adapter/ForgeGradle3.resolver.ts
index e567e22..71721ef 100644
--- a/src/resolver/forge/adapter/ForgeGradle3.resolver.ts
+++ b/src/resolver/forge/adapter/ForgeGradle3.resolver.ts
@@ -3,7 +3,7 @@ import { MinecraftVersion } from '../../../util/MinecraftVersion'
 import { LoggerUtil } from '../../../util/LoggerUtil'
 import { VersionUtil } from '../../../util/versionutil'
 import { Module, Type } from 'helios-distribution-types'
-import { LibRepoStructure } from '../../../model/struct/repo/librepo.struct'
+import { LibRepoStructure } from '../../../structure/repo/LibRepo.struct'
 import { pathExists, remove, mkdirs, copy, writeFile, readFile, lstat, move, writeJson } from 'fs-extra'
 import { join, basename, dirname } from 'path'
 import { spawn } from 'child_process'
diff --git a/src/resolver/forge/forge.resolver.ts b/src/resolver/forge/forge.resolver.ts
index b840e46..19bb592 100644
--- a/src/resolver/forge/forge.resolver.ts
+++ b/src/resolver/forge/forge.resolver.ts
@@ -2,7 +2,7 @@ import StreamZip from 'node-stream-zip'
 import { createHash } from 'crypto'
 import { Stats } from 'fs-extra'
 import { Artifact } from 'helios-distribution-types'
-import { RepoStructure } from '../../model/struct/repo/repo.struct'
+import { RepoStructure } from '../../structure/repo/Repo.struct'
 import { BaseResolver } from '../baseresolver'
 import { MinecraftVersion } from '../../util/MinecraftVersion'
 
diff --git a/src/model/struct/BaseFileStructure.ts b/src/structure/BaseFileStructure.ts
similarity index 93%
rename from src/model/struct/BaseFileStructure.ts
rename to src/structure/BaseFileStructure.ts
index 4a9ba25..8415d75 100644
--- a/src/model/struct/BaseFileStructure.ts
+++ b/src/structure/BaseFileStructure.ts
@@ -2,7 +2,7 @@ import { mkdirs } from 'fs-extra'
 import { join, resolve } from 'path'
 import { FileStructure } from './FileStructure'
 import { Logger } from 'winston'
-import { LoggerUtil } from '../../util/LoggerUtil'
+import { LoggerUtil } from '../util/LoggerUtil'
 
 export abstract class BaseFileStructure implements FileStructure {
 
diff --git a/src/model/struct/FileStructure.ts b/src/structure/FileStructure.ts
similarity index 100%
rename from src/model/struct/FileStructure.ts
rename to src/structure/FileStructure.ts
diff --git a/src/model/struct/repo/BaseMavenRepo.ts b/src/structure/repo/BaseMavenRepo.ts
similarity index 97%
rename from src/model/struct/repo/BaseMavenRepo.ts
rename to src/structure/repo/BaseMavenRepo.ts
index 6b1a022..17fcca8 100644
--- a/src/model/struct/repo/BaseMavenRepo.ts
+++ b/src/structure/repo/BaseMavenRepo.ts
@@ -2,9 +2,9 @@ import got from 'got'
 import { createWriteStream, mkdirs, pathExists } from 'fs-extra'
 import { dirname, join, resolve } from 'path'
 import { resolve as resolveURL } from 'url'
-import { MavenUtil } from '../../../util/maven'
+import { MavenUtil } from '../../util/maven'
 import { BaseFileStructure } from '../BaseFileStructure'
-import { LoggerUtil } from '../../../util/LoggerUtil'
+import { LoggerUtil } from '../../util/LoggerUtil'
 
 export abstract class BaseMavenRepo extends BaseFileStructure {
 
diff --git a/src/model/struct/repo/librepo.struct.ts b/src/structure/repo/LibRepo.struct.ts
similarity index 100%
rename from src/model/struct/repo/librepo.struct.ts
rename to src/structure/repo/LibRepo.struct.ts
diff --git a/src/model/struct/repo/repo.struct.ts b/src/structure/repo/Repo.struct.ts
similarity index 91%
rename from src/model/struct/repo/repo.struct.ts
rename to src/structure/repo/Repo.struct.ts
index 38db8f1..8450406 100644
--- a/src/model/struct/repo/repo.struct.ts
+++ b/src/structure/repo/Repo.struct.ts
@@ -1,7 +1,7 @@
 import { join } from 'path'
 import { BaseFileStructure } from '../BaseFileStructure'
-import { LibRepoStructure } from './librepo.struct'
-import { VersionRepoStructure } from './versionrepo.struct'
+import { LibRepoStructure } from './LibRepo.struct'
+import { VersionRepoStructure } from './VersionRepo.struct'
 
 export class RepoStructure extends BaseFileStructure {
 
diff --git a/src/model/struct/repo/versionrepo.struct.ts b/src/structure/repo/VersionRepo.struct.ts
similarity index 94%
rename from src/model/struct/repo/versionrepo.struct.ts
rename to src/structure/repo/VersionRepo.struct.ts
index c4436f1..ca85318 100644
--- a/src/model/struct/repo/versionrepo.struct.ts
+++ b/src/structure/repo/VersionRepo.struct.ts
@@ -1,7 +1,7 @@
 import { join } from 'path'
 import { resolve as resolveURL } from 'url'
 import { BaseFileStructure } from '../BaseFileStructure'
-import { MinecraftVersion } from '../../../util/MinecraftVersion'
+import { MinecraftVersion } from '../../util/MinecraftVersion'
 
 export class VersionRepoStructure extends BaseFileStructure {
 
diff --git a/src/model/struct/model/basemodel.struct.ts b/src/structure/spec_model/BaseModel.struct.ts
similarity index 81%
rename from src/model/struct/model/basemodel.struct.ts
rename to src/structure/spec_model/BaseModel.struct.ts
index 0f92a7b..df13c6f 100644
--- a/src/model/struct/model/basemodel.struct.ts
+++ b/src/structure/spec_model/BaseModel.struct.ts
@@ -1,7 +1,7 @@
 import { BaseFileStructure } from '../BaseFileStructure'
-import { ModelStructure } from './ModelStructure'
+import { SpecModelStructure } from './SpecModelStructure'
 
-export abstract class BaseModelStructure<T> extends BaseFileStructure implements ModelStructure<T[]> {
+export abstract class BaseModelStructure<T> extends BaseFileStructure implements SpecModelStructure<T[]> {
 
     protected resolvedModels: T[] | undefined
 
diff --git a/src/model/struct/model/distribution.struct.ts b/src/structure/spec_model/Distribution.struct.ts
similarity index 82%
rename from src/model/struct/model/distribution.struct.ts
rename to src/structure/spec_model/Distribution.struct.ts
index e13d574..23296ae 100644
--- a/src/model/struct/model/distribution.struct.ts
+++ b/src/structure/spec_model/Distribution.struct.ts
@@ -1,11 +1,11 @@
 import { mkdirs, writeFile, readFile } from 'fs-extra'
 import { Distribution } from 'helios-distribution-types'
-import { ModelStructure } from './ModelStructure'
-import { ServerStructure } from './server.struct'
+import { SpecModelStructure } from './SpecModelStructure'
+import { ServerStructure } from './Server.struct'
 import { join, resolve } from 'path'
-import { DistroMeta, getDefaultDistroMeta } from '../../nebula/distrometa'
+import { DistroMeta, getDefaultDistroMeta } from '../../model/nebula/distrometa'
 
-export class DistributionStructure implements ModelStructure<Distribution> {
+export class DistributionStructure implements SpecModelStructure<Distribution> {
 
     private readonly DISTRO_META_FILE = 'distrometa.json'
 
diff --git a/src/model/struct/model/server.struct.ts b/src/structure/spec_model/Server.struct.ts
similarity index 94%
rename from src/model/struct/model/server.struct.ts
rename to src/structure/spec_model/Server.struct.ts
index 6344269..95473ae 100644
--- a/src/model/struct/model/server.struct.ts
+++ b/src/structure/spec_model/Server.struct.ts
@@ -2,13 +2,13 @@ import { lstat, mkdirs, pathExists, readdir, readFile, writeFile } from 'fs-extr
 import { Server, Module } from 'helios-distribution-types'
 import { dirname, join, resolve as resolvePath } from 'path'
 import { resolve as resolveUrl } from 'url'
-import { VersionSegmentedRegistry } from '../../../util/VersionSegmentedRegistry'
-import { ServerMeta, getDefaultServerMeta, ServerMetaOptions } from '../../nebula/servermeta'
-import { BaseModelStructure } from './basemodel.struct'
-import { MiscFileStructure } from './module/file.struct'
-import { LiteModStructure } from './module/litemod.struct'
-import { LibraryStructure } from './module/library.struct'
-import { MinecraftVersion } from '../../../util/MinecraftVersion'
+import { VersionSegmentedRegistry } from '../../util/VersionSegmentedRegistry'
+import { ServerMeta, getDefaultServerMeta, ServerMetaOptions } from '../../model/nebula/servermeta'
+import { BaseModelStructure } from './BaseModel.struct'
+import { MiscFileStructure } from './module/File.struct'
+import { LiteModStructure } from './module/LiteMod.struct'
+import { LibraryStructure } from './module/Library.struct'
+import { MinecraftVersion } from '../../util/MinecraftVersion'
 
 export class ServerStructure extends BaseModelStructure<Server> {
 
diff --git a/src/model/struct/model/ModelStructure.ts b/src/structure/spec_model/SpecModelStructure.ts
similarity index 57%
rename from src/model/struct/model/ModelStructure.ts
rename to src/structure/spec_model/SpecModelStructure.ts
index 1f6c32e..87fa9a8 100644
--- a/src/model/struct/model/ModelStructure.ts
+++ b/src/structure/spec_model/SpecModelStructure.ts
@@ -1,6 +1,6 @@
 import { FileStructure } from '../FileStructure'
 
-export interface ModelStructure<T> extends FileStructure {
+export interface SpecModelStructure<T> extends FileStructure {
 
     getSpecModel(): Promise<T>
 
diff --git a/src/model/struct/model/module/file.struct.ts b/src/structure/spec_model/module/File.struct.ts
similarity index 94%
rename from src/model/struct/model/module/file.struct.ts
rename to src/structure/spec_model/module/File.struct.ts
index 01bf008..7dd7681 100644
--- a/src/model/struct/model/module/file.struct.ts
+++ b/src/structure/spec_model/module/File.struct.ts
@@ -2,10 +2,10 @@
 import { Stats } from 'fs'
 import { Type, Module } from 'helios-distribution-types'
 import { resolve as resolveURL } from 'url'
-import { ModuleStructure } from './module.struct'
+import { ModuleStructure } from './Module.struct'
 import { readdir, stat } from 'fs-extra'
 import { join, resolve, sep } from 'path'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
 
 export class MiscFileStructure extends ModuleStructure {
 
diff --git a/src/model/struct/model/module/forgemod.struct.ts b/src/structure/spec_model/module/ForgeMod.struct.ts
similarity index 86%
rename from src/model/struct/model/module/forgemod.struct.ts
rename to src/structure/spec_model/module/ForgeMod.struct.ts
index b5e3a05..f41c806 100644
--- a/src/model/struct/model/module/forgemod.struct.ts
+++ b/src/structure/spec_model/module/ForgeMod.struct.ts
@@ -2,11 +2,11 @@ import { Stats } from 'fs-extra'
 import { Type, Module } from 'helios-distribution-types'
 import { join } from 'path'
 import { resolve } from 'url'
-import { VersionSegmented } from '../../../../util/VersionSegmented'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
-import { ToggleableModuleStructure } from './toggleablemodule.struct'
-import { LibraryType } from '../../../claritas/ClaritasLibraryType'
-import { ClaritasException } from './module.struct'
+import { VersionSegmented } from '../../../util/VersionSegmented'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
+import { ToggleableModuleStructure } from './ToggleableModule.struct'
+import { LibraryType } from '../../../model/claritas/ClaritasLibraryType'
+import { ClaritasException } from './Module.struct'
 
 export abstract class BaseForgeModStructure extends ToggleableModuleStructure implements VersionSegmented {
 
diff --git a/src/model/struct/model/module/library.struct.ts b/src/structure/spec_model/module/Library.struct.ts
similarity index 93%
rename from src/model/struct/model/module/library.struct.ts
rename to src/structure/spec_model/module/Library.struct.ts
index fdecf3f..af7c359 100644
--- a/src/model/struct/model/module/library.struct.ts
+++ b/src/structure/spec_model/module/Library.struct.ts
@@ -1,9 +1,9 @@
-import { ModuleStructure } from './module.struct'
+import { ModuleStructure } from './Module.struct'
 import { Type, TypeMetadata } from 'helios-distribution-types'
 import { Stats } from 'fs-extra'
 import { join } from 'path'
 import { resolve } from 'url'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
 
 export class LibraryStructure extends ModuleStructure {
 
diff --git a/src/model/struct/model/module/litemod.struct.ts b/src/structure/spec_model/module/LiteMod.struct.ts
similarity index 89%
rename from src/model/struct/model/module/litemod.struct.ts
rename to src/structure/spec_model/module/LiteMod.struct.ts
index efc0500..2d88c29 100644
--- a/src/model/struct/model/module/litemod.struct.ts
+++ b/src/structure/spec_model/module/LiteMod.struct.ts
@@ -3,12 +3,12 @@ import { Stats } from 'fs-extra'
 import { Type } from 'helios-distribution-types'
 import { join } from 'path'
 import { resolve } from 'url'
-import { capitalize } from '../../../../util/stringutils'
-import { LiteMod } from '../../../liteloader/litemod'
-import { ToggleableModuleStructure } from './toggleablemodule.struct'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
-import { LibraryType } from '../../../claritas/ClaritasLibraryType'
-import { MetadataUtil } from '../../../../util/MetadataUtil'
+import { capitalize } from '../../../util/stringutils'
+import { LiteMod } from '../../../model/liteloader/litemod'
+import { ToggleableModuleStructure } from './ToggleableModule.struct'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
+import { LibraryType } from '../../../model/claritas/ClaritasLibraryType'
+import { MetadataUtil } from '../../../util/MetadataUtil'
 
 export class LiteModStructure extends ToggleableModuleStructure {
 
diff --git a/src/model/struct/model/module/module.struct.ts b/src/structure/spec_model/module/Module.struct.ts
similarity index 95%
rename from src/model/struct/model/module/module.struct.ts
rename to src/structure/spec_model/module/Module.struct.ts
index 5907d4f..91a2d6a 100644
--- a/src/model/struct/model/module/module.struct.ts
+++ b/src/structure/spec_model/module/Module.struct.ts
@@ -2,11 +2,11 @@ import { createHash } from 'crypto'
 import { lstat, pathExists, readdir, readFile, Stats } from 'fs-extra'
 import { Module, Type, TypeMetadata } from 'helios-distribution-types'
 import { resolve } from 'path'
-import { BaseModelStructure } from '../basemodel.struct'
-import { LibraryType } from '../../../claritas/ClaritasLibraryType'
-import { ClaritasResult, ClaritasModuleMetadata } from '../../../claritas/ClaritasResult'
-import { ClaritasWrapper } from '../../../../util/java/ClaritasWrapper'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { BaseModelStructure } from '../BaseModel.struct'
+import { LibraryType } from '../../../model/claritas/ClaritasLibraryType'
+import { ClaritasResult, ClaritasModuleMetadata } from '../../../model/claritas/ClaritasResult'
+import { ClaritasWrapper } from '../../../util/java/ClaritasWrapper'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
 
 export interface ModuleCandidate {
     file: string
diff --git a/src/model/struct/model/module/toggleablemodule.struct.ts b/src/structure/spec_model/module/ToggleableModule.struct.ts
similarity index 95%
rename from src/model/struct/model/module/toggleablemodule.struct.ts
rename to src/structure/spec_model/module/ToggleableModule.struct.ts
index 967a906..c13ec44 100644
--- a/src/model/struct/model/module/toggleablemodule.struct.ts
+++ b/src/structure/spec_model/module/ToggleableModule.struct.ts
@@ -1,8 +1,8 @@
-import { ModuleStructure, ModuleCandidate } from './module.struct'
+import { ModuleStructure, ModuleCandidate } from './Module.struct'
 import { Type, Module } from 'helios-distribution-types'
 import { Stats, mkdirs } from 'fs-extra'
 import { resolve } from 'path'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
 
 export enum ToggleableNamespace {
 
diff --git a/src/model/struct/model/module/forgemod/forgemod113.struct.ts b/src/structure/spec_model/module/forgemod/ForgeMod113.struct.ts
similarity index 95%
rename from src/model/struct/model/module/forgemod/forgemod113.struct.ts
rename to src/structure/spec_model/module/forgemod/ForgeMod113.struct.ts
index c73d0fe..9d00b17 100644
--- a/src/model/struct/model/module/forgemod/forgemod113.struct.ts
+++ b/src/structure/spec_model/module/forgemod/ForgeMod113.struct.ts
@@ -1,10 +1,10 @@
 import StreamZip from 'node-stream-zip'
 import toml from 'toml'
-import { capitalize } from '../../../../../util/stringutils'
-import { VersionUtil } from '../../../../../util/versionutil'
-import { ModsToml } from '../../../../forge/modstoml'
-import { BaseForgeModStructure } from '../forgemod.struct'
-import { MinecraftVersion } from '../../../../../util/MinecraftVersion'
+import { capitalize } from '../../../../util/stringutils'
+import { VersionUtil } from '../../../../util/versionutil'
+import { ModsToml } from '../../../../model/forge/modstoml'
+import { BaseForgeModStructure } from '../ForgeMod.struct'
+import { MinecraftVersion } from '../../../../util/MinecraftVersion'
 
 export class ForgeModStructure113 extends BaseForgeModStructure {
 
diff --git a/src/model/struct/model/module/forgemod/forgemod17.struct.ts b/src/structure/spec_model/module/forgemod/ForgeMod17.struct.ts
similarity index 93%
rename from src/model/struct/model/module/forgemod/forgemod17.struct.ts
rename to src/structure/spec_model/module/forgemod/ForgeMod17.struct.ts
index bcd7b84..f147e7b 100644
--- a/src/model/struct/model/module/forgemod/forgemod17.struct.ts
+++ b/src/structure/spec_model/module/forgemod/ForgeMod17.struct.ts
@@ -1,11 +1,11 @@
 import StreamZip from 'node-stream-zip'
-import { capitalize } from '../../../../../util/stringutils'
-import { VersionUtil } from '../../../../../util/versionutil'
-import { McModInfo } from '../../../../forge/mcmodinfo'
-import { McModInfoList } from '../../../../forge/mcmodinfolist'
-import { BaseForgeModStructure } from '../forgemod.struct'
-import { MinecraftVersion } from '../../../../../util/MinecraftVersion'
-import { ForgeModType_1_7 } from '../../../../claritas/ClaritasResult'
+import { capitalize } from '../../../../util/stringutils'
+import { VersionUtil } from '../../../../util/versionutil'
+import { McModInfo } from '../../../../model/forge/mcmodinfo'
+import { McModInfoList } from '../../../../model/forge/mcmodinfolist'
+import { BaseForgeModStructure } from '../ForgeMod.struct'
+import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { ForgeModType_1_7 } from '../../../../model/claritas/ClaritasResult'
 
 export class ForgeModStructure17 extends BaseForgeModStructure {
 
diff --git a/src/util/VersionSegmentedRegistry.ts b/src/util/VersionSegmentedRegistry.ts
index 95d27d5..549b32b 100644
--- a/src/util/VersionSegmentedRegistry.ts
+++ b/src/util/VersionSegmentedRegistry.ts
@@ -1,9 +1,9 @@
-import { ForgeModStructure113 } from '../model/struct/model/module/forgemod/forgemod113.struct'
-import { ForgeModStructure17 } from '../model/struct/model/module/forgemod/forgemod17.struct'
+import { ForgeModStructure113 } from '../structure/spec_model/module/forgemod/ForgeMod113.struct'
+import { ForgeModStructure17 } from '../structure/spec_model/module/forgemod/ForgeMod17.struct'
 import { ForgeGradle3Adapter } from '../resolver/forge/adapter/ForgeGradle3.resolver'
 import { ForgeGradle2Adapter } from '../resolver/forge/adapter/ForgeGradle2.resolver'
 import { ForgeResolver } from '../resolver/forge/forge.resolver'
-import { BaseForgeModStructure } from '../model/struct/model/module/forgemod.struct'
+import { BaseForgeModStructure } from '../structure/spec_model/module/ForgeMod.struct'
 import { MinecraftVersion } from './MinecraftVersion'
 
 export class VersionSegmentedRegistry {