diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 2301e1df..435b4123 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var exports = {};
 
     exports.get = function(refresh, opts) {
@@ -63,6 +63,8 @@
     };
 
     OctoPrint.plugins.pluginmanager = exports;
+
+    return OctoPrint.plugins.pluginmanager;
 });
 
 $(function() {
diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
index bcac211e..b5c17c1a 100644
--- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
+++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var exports = {};
 
     var url = OctoPrint.getBlueprintUrl("softwareupdate");
@@ -78,6 +78,8 @@
     };
 
     OctoPrint.plugins.softwareupdate = exports;
+
+    return OctoPrint.plugins.softwareupdate;
 });
 
 $(function() {
diff --git a/src/octoprint/static/js/app/client/base.js b/src/octoprint/static/js/app/client/base.js
index 5d541ec4..ff8845e8 100644
--- a/src/octoprint/static/js/app/client/base.js
+++ b/src/octoprint/static/js/app/client/base.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define("OctoPrint", ["jquery", "lodash"], factory);
     } else {
-        global.OctoPrint = factory(window.$, window._);
+        global.OctoPrint = factory(global.$, global._);
     }
-})(window || this, function($, _) {
+})(this, function($, _) {
     var OctoPrint = {};
 
     var noCache = function(opts) {
diff --git a/src/octoprint/static/js/app/client/browser.js b/src/octoprint/static/js/app/client/browser.js
index ac791b6f..ecbc01bf 100644
--- a/src/octoprint/static/js/app/client/browser.js
+++ b/src/octoprint/static/js/app/client/browser.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var loginUrl = "api/login";
     var logoutUrl = "api/logout";
 
@@ -26,4 +26,6 @@
             return OctoPrint.postJson(logoutUrl, {}, opts);
         }
     };
+
+    return OctoPrint.browser;
 });
diff --git a/src/octoprint/static/js/app/client/connection.js b/src/octoprint/static/js/app/client/connection.js
index 98ca4c67..05d85614 100644
--- a/src/octoprint/static/js/app/client/connection.js
+++ b/src/octoprint/static/js/app/client/connection.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var url = "api/connection";
 
     OctoPrint.connection = {
@@ -23,5 +23,7 @@
         fakeAck: function(opts) {
             return OctoPrint.issueCommand(url, "fake_ack", {}, opts);
         }
-    }
+    };
+
+    return OctoPrint.connection;
 });
diff --git a/src/octoprint/static/js/app/client/control.js b/src/octoprint/static/js/app/client/control.js
index a9b7187a..b3314019 100644
--- a/src/octoprint/static/js/app/client/control.js
+++ b/src/octoprint/static/js/app/client/control.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var customUrl = "api/printer/command/custom";
     var commandUrl = "api/printer/command";
 
@@ -49,5 +49,7 @@
         sendGcodeScript: function (script, context, opts) {
             return sendGcodeScriptWithParameters(script, context, undefined, opts);
         }
-    }
+    };
+
+    return OctoPrint.control;
 });
diff --git a/src/octoprint/static/js/app/client/files.js b/src/octoprint/static/js/app/client/files.js
index b8b03cac..a72f1884 100644
--- a/src/octoprint/static/js/app/client/files.js
+++ b/src/octoprint/static/js/app/client/files.js
@@ -1,13 +1,10 @@
-(function (factory) {
-    'use strict';
+(function (global, factory) {
     if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
         define(["OctoPrint", "jquery", "lodash"], factory);
     } else {
-        // Browser globals:
-        factory(window.OctoPrint, window.jQuery, window._);
+        factory(global.OctoPrint, global.$, global._);
     }
-})(function(OctoPrint, $, _) {
+})(this, function(OctoPrint, $, _) {
     var url = "api/files";
     var downloadUrl = "downloads/files";
 
@@ -188,5 +185,7 @@
             log.warn("OctoPrint.files.elementByPath has been renamed to OctoPrint.files.entryForPath, please use that instead");
             return entryForPath(location, startElement);
         }
-    }
+    };
+
+    return OctoPrint.files;
 });
diff --git a/src/octoprint/static/js/app/client/job.js b/src/octoprint/static/js/app/client/job.js
index 38ac0cba..0da2dca3 100644
--- a/src/octoprint/static/js/app/client/job.js
+++ b/src/octoprint/static/js/app/client/job.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var url = "api/job";
 
     var issueCommand = function(command, payload, opts) {
@@ -38,5 +38,7 @@
         cancel: function(opts) {
             return issueCommand("cancel", opts);
         }
-    }
+    };
+
+    return OctoPrint.job;
 });
diff --git a/src/octoprint/static/js/app/client/languages.js b/src/octoprint/static/js/app/client/languages.js
index 2ebec0d5..3fc064df 100644
--- a/src/octoprint/static/js/app/client/languages.js
+++ b/src/octoprint/static/js/app/client/languages.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var url = "api/languages";
 
     OctoPrint.languages = {
@@ -19,4 +19,6 @@
             return OctoPrint.delete(packUrl, opts);
         }
     };
+
+    return OctoPrint.languages;
 });
diff --git a/src/octoprint/static/js/app/client/logs.js b/src/octoprint/static/js/app/client/logs.js
index a1e652e4..fe354985 100644
--- a/src/octoprint/static/js/app/client/logs.js
+++ b/src/octoprint/static/js/app/client/logs.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var url = "api/logs";
 
     OctoPrint.logs = {
@@ -21,5 +21,7 @@
             var fileUrl = url + "/" + file;
             return OctoPrint.download(fileUrl, opts);
         }
-    }
+    };
+
+    return OctoPrint.logs;
 });
diff --git a/src/octoprint/static/js/app/client/printer.js b/src/octoprint/static/js/app/client/printer.js
index baf8b891..10a2dc56 100644
--- a/src/octoprint/static/js/app/client/printer.js
+++ b/src/octoprint/static/js/app/client/printer.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var url = "api/printer";
     var printheadUrl = url + "/printhead";
     var toolUrl = url + "/tool";
@@ -206,5 +206,7 @@
         releaseSd: function (opts) {
             return issueSdCommand("release", {}, opts);
         }
-    }
+    };
+
+    return OctoPrint.printer;
 });
diff --git a/src/octoprint/static/js/app/client/printerprofiles.js b/src/octoprint/static/js/app/client/printerprofiles.js
index 40623ce6..ef7ae852 100644
--- a/src/octoprint/static/js/app/client/printerprofiles.js
+++ b/src/octoprint/static/js/app/client/printerprofiles.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint", "jquery"], factory);
     } else {
-        factory(window.OctoPrint, window.$);
+        factory(global.OctoPrint, global.$);
     }
-})(window || this, function(OctoPrint, $) {
+})(this, function(OctoPrint, $) {
     var url = "api/printerprofiles";
 
     var profileUrl = function(profile) {
@@ -42,5 +42,7 @@
         delete: function (id, opts) {
             return OctoPrint.delete(profileUrl(id), opts);
         }
-    }
+    };
+
+    return OctoPrint.printerprofiles;
 });
diff --git a/src/octoprint/static/js/app/client/settings.js b/src/octoprint/static/js/app/client/settings.js
index d8d15fe2..72fa753f 100644
--- a/src/octoprint/static/js/app/client/settings.js
+++ b/src/octoprint/static/js/app/client/settings.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint", "jquery"], factory);
     } else {
-        factory(window.OctoPrint, window.$);
+        factory(global.OctoPrint, global.$);
     }
-})(window || this, function(OctoPrint, $) {
+})(this, function(OctoPrint, $) {
     var url = "api/settings";
 
     var get = function(opts) {
@@ -39,5 +39,7 @@
             data["plugins"][plugin] = settings;
             return save(data, opts);
         }
-    }
+    };
+
+    return OctoPrint.settings;
 });
diff --git a/src/octoprint/static/js/app/client/slicing.js b/src/octoprint/static/js/app/client/slicing.js
index 268ca361..ff5a312a 100644
--- a/src/octoprint/static/js/app/client/slicing.js
+++ b/src/octoprint/static/js/app/client/slicing.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var url = "api/slicing";
 
     var slicerUrl = function(slicer) {
@@ -41,5 +41,7 @@
         deleteProfileForSlicer: function(slicer, profileId, opts) {
             return OctoPrint.delete(profileUrl(slicer, profileId), opts);
         }
-    }
+    };
+
+    return OctoPrint.slicing;
 });
diff --git a/src/octoprint/static/js/app/client/socket.js b/src/octoprint/static/js/app/client/socket.js
index 253e05c5..ff8a8bd5 100644
--- a/src/octoprint/static/js/app/client/socket.js
+++ b/src/octoprint/static/js/app/client/socket.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint", "jquery", "lodash", "sockjs"], factory);
     } else {
-        factory(window.OctoPrint, window.$, window._, window.SockJS);
+        factory(global.OctoPrint, global.$, global._, global.SockJS);
     }
-})(window || this, function(OctoPrint, $, _, SockJS) {
+})(this, function(OctoPrint, $, _, SockJS) {
     var exports = {};
 
     exports.options = {
@@ -172,4 +172,6 @@
     exports.sendMessage = sendMessage;
 
     OctoPrint.socket = exports;
+
+    return OctoPrint.socket;
 });
diff --git a/src/octoprint/static/js/app/client/system.js b/src/octoprint/static/js/app/client/system.js
index 1a86419a..27b03809 100644
--- a/src/octoprint/static/js/app/client/system.js
+++ b/src/octoprint/static/js/app/client/system.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var url = "api/system";
     var commandUrl = "api/system/commands";
 
@@ -21,4 +21,6 @@
             return OctoPrint.postJson(commandUrl + "/" + source + "/" + action, {}, opts);
         }
     };
+
+    return OctoPrint.system;
 });
diff --git a/src/octoprint/static/js/app/client/timelapse.js b/src/octoprint/static/js/app/client/timelapse.js
index fbbdf1e3..2e6c24d6 100644
--- a/src/octoprint/static/js/app/client/timelapse.js
+++ b/src/octoprint/static/js/app/client/timelapse.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint", "jquery"], factory);
     } else {
-        factory(window.OctoPrint, window.$);
+        factory(global.OctoPrint, global.$);
     }
-})(window || this, function(OctoPrint, $) {
+})(this, function(OctoPrint, $) {
     var url = "api/timelapse";
 
     var downloadUrl = "downloads/timelapse";
@@ -109,5 +109,7 @@
             config = config || {};
             return OctoPrint.postJson(url, config, opts);
         }
-    }
+    };
+
+    return OctoPrint.timelapse;
 });
diff --git a/src/octoprint/static/js/app/client/users.js b/src/octoprint/static/js/app/client/users.js
index 4c715839..d30cab0c 100644
--- a/src/octoprint/static/js/app/client/users.js
+++ b/src/octoprint/static/js/app/client/users.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var baseUrl = "api/users";
 
     var url = function() {
@@ -107,4 +107,6 @@
             return OctoPrint.patchJson(url(name, "settings"), settings, opts);
         }
     };
+
+    return OctoPrint.users;
 });
diff --git a/src/octoprint/static/js/app/client/util.js b/src/octoprint/static/js/app/client/util.js
index 4c0845f0..e8f65dc4 100644
--- a/src/octoprint/static/js/app/client/util.js
+++ b/src/octoprint/static/js/app/client/util.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint", "jquery"], factory);
     } else {
-        factory(window.OctoPrint, window.$);
+        factory(global.OctoPrint, global.$);
     }
-})(window || this, function(OctoPrint, $) {
+})(this, function(OctoPrint, $) {
     var url = "api/util";
     var testUrl = url + "/test";
 
@@ -44,4 +44,6 @@
             return test("url", data, opts);
         }
     };
+
+    return OctoPrint.util;
 });
diff --git a/src/octoprint/static/js/app/client/wizard.js b/src/octoprint/static/js/app/client/wizard.js
index e848e511..fdad2a8a 100644
--- a/src/octoprint/static/js/app/client/wizard.js
+++ b/src/octoprint/static/js/app/client/wizard.js
@@ -2,9 +2,9 @@
     if (typeof define === "function" && define.amd) {
         define(["OctoPrint"], factory);
     } else {
-        factory(window.OctoPrint);
+        factory(global.OctoPrint);
     }
-})(window || this, function(OctoPrint) {
+})(this, function(OctoPrint) {
     var url = "api/setup/wizard";
 
     OctoPrint.wizard = {
@@ -15,4 +15,6 @@
             return OctoPrint.postJson(url, {handled: handled || []}, opts);
         }
     };
+
+    return OctoPrint.wizard;
 });