fix: circular imports

119 files changed, 2416 insertions, 351 deletions

diff --git a/.pnp.cjs b/.pnp.cjs
index bf30e67..c516ab5 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -39,6 +39,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@types/common-tags", "npm:1.8.1"],
             ["@types/express", "npm:4.17.13"],
             ["@types/humanize-duration", "npm:3.25.1"],
+            ["@types/module-alias", "npm:2.0.1"],
             ["@types/node", "npm:14.17.5"],
             ["@types/uuid", "npm:8.3.1"],
             ["@typescript-eslint/eslint-plugin", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:4.28.2"],
@@ -46,14 +47,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["body-parser", "npm:1.19.0"],
             ["chalk", "npm:4.1.1"],
             ["common-tags", "npm:1.8.0"],
-            ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=58e5a8610d9cb47257cb163a94e284113a39a62b"],
+            ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=67e935e92f12105f2dfc517bb566d8325c794d8a"],
             ["discord-api-types", "npm:0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e"],
-            ["discord.js", "https://github.com/NotEnoughUpdates/discord.js.git#commit=c71d1042962848d9f644262fa27e6f777cda4d35"],
+            ["discord.js", "https://github.com/NotEnoughUpdates/discord.js.git#commit=20c84839fa43aad6c47ff6ffb11b34cc785e920b"],
             ["esbuild", "npm:0.12.15"],
             ["eslint", "npm:7.30.0"],
             ["eslint-config-prettier", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:8.3.0"],
             ["got", "npm:11.8.2"],
             ["humanize-duration", "npm:3.27.0"],
+            ["madge", "npm:5.0.1"],
+            ["module-alias", "npm:2.2.2"],
             ["moment", "npm:2.29.1"],
             ["pg", "virtua