diff --git a/src/module/admin.ts b/src/module/admin.ts
index a181d2a..415434a 100644
--- a/src/module/admin.ts
+++ b/src/module/admin.ts
@@ -51,6 +51,4 @@ class AdminModule extends AbstractModule {
     }
 }
 
-let module = new AdminModule();
-
-export { module };
\ No newline at end of file
+export { AdminModule as Module };
\ No newline at end of file
diff --git a/src/module/giphy.ts b/src/module/giphy.ts
index 82628c4..485f41a 100644
--- a/src/module/giphy.ts
+++ b/src/module/giphy.ts
@@ -47,6 +47,4 @@ class GiphyModule extends AbstractModule {
     }
 }
 
-let module = new GiphyModule();
-
-export { module };
\ No newline at end of file
+export { GiphyModule as Module };
\ No newline at end of file
diff --git a/src/module/index.ts b/src/module/index.ts
index 6993300..602e7d9 100644
--- a/src/module/index.ts
+++ b/src/module/index.ts
@@ -8,9 +8,9 @@ let szurubooru = require('./szurubooru/index');
 
 function getModules() {
     return [
-        admin.module,
-        giphy.module,
-        szurubooru.module
+        new admin.Module(),
+        new giphy.Module(),
+        new szurubooru.Module()
     ];
 }
 
diff --git a/src/module/szurubooru/index.ts b/src/module/szurubooru/index.ts
index 72a1e6c..09e9db9 100644
--- a/src/module/szurubooru/index.ts
+++ b/src/module/szurubooru/index.ts
@@ -59,6 +59,4 @@ class SzurubooruModule extends AbstractModule {
     }
 }
 
-let module = new SzurubooruModule();
-
-export { module };
\ No newline at end of file
+export { SzurubooruModule as Module };
\ No newline at end of file