diff --git a/.gitignore b/.gitignore
index 1aa85f2d..96c1ab5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,12 +59,6 @@ Temporary Items
 .directory
 .Trash-*
 
-# Various Magic Mirror ignoramuses and anti-ignoramuses.
-
-# Don't ignore the node_helper core module.
-!/modules/node_helper
-!/modules/node_helper/**
-
 # Ignore all modules except the default modules.
 /modules/**
 !/modules/default
diff --git a/js/app.js b/js/app.js
index 25a004d9..3c7a51f8 100644
--- a/js/app.js
+++ b/js/app.js
@@ -11,8 +11,11 @@ var Utils = require(__dirname + "/utils.js");
 var defaultModules = require(__dirname + "/../modules/default/defaultmodules.js");
 var path = require("path");
 
+// Alias modules mentioned in package.js under _moduleAliases.
+require("module-alias/register");
+
 // add timestamps in front of log messages
-require('console-stamp')(console, 'HH:MM:ss.l');
+require("console-stamp")(console, "HH:MM:ss.l");
 
 // Get version number.
 global.version = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
diff --git a/modules/node_modules/node_helper/index.js b/js/node_helper.js
similarity index 98%
rename from modules/node_modules/node_helper/index.js
rename to js/node_helper.js
index 92931140..a083d332 100644
--- a/modules/node_modules/node_helper/index.js
+++ b/js/node_helper.js
@@ -5,7 +5,7 @@
  * MIT Licensed.
  */
 
-var Class = require("../../../js/class.js");
+var Class = require("./class.js");
 var express = require("express");
 var path = require("path");
 
diff --git a/package-lock.json b/package-lock.json
index a8399e6c..249b9aae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5635,6 +5635,11 @@
         }
       }
     },
+    "module-alias": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz",
+      "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="
+    },
     "moment": {
       "version": "2.24.0",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
diff --git a/package.json b/package.json
index 8d8867f0..9a102a3e 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "helmet": "^3.21.2",
     "iconv-lite": "latest",
     "lodash": "^4.17.15",
+    "module-alias": "^2.2.2",
     "moment": "latest",
     "request": "^2.88.0",
     "rrule": "^2.6.2",
@@ -74,5 +75,8 @@
     "simple-git": "^1.85.0",
     "socket.io": "^2.1.1",
     "valid-url": "latest"
+  },
+  "_moduleAliases": {
+    "node_helper"  : "js/node_helper.js"
   }
 }
diff --git a/vendor/package-lock.json b/vendor/package-lock.json
index 369827fa..3253cc4e 100644
--- a/vendor/package-lock.json
+++ b/vendor/package-lock.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": {
       "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz",
+      "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.3.tgz",
       "integrity": "sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ=="
     },
     "a-sync-waterfall": {