Index: background.js
===================================================================
--- a/background.js
+++ b/background.js
@@ -85,17 +85,17 @@
   const acceptableAds = `${subscriptionServer}/exceptionrules.txt`;
   const acceptableAdsPrivacyFriendly =
     `${subscriptionServer}/exceptionrules-privacy-friendly.txt`;
   const redirectLink = "https://adblockplus.org/redirect?link=";
 
   const modules = {};
   window.require = function(module)
   {
-    return modules[module];
+    return modules[module.split("/").pop()];
   };
 
   modules.utils = {
     Utils: {
       getDocLink(link)
       {
         return `${redirectLink}${encodeURIComponent(link)}`;
       },
Index: lib/antiadblockInit.js
===================================================================
--- a/lib/antiadblockInit.js
+++ b/lib/antiadblockInit.js
@@ -12,22 +12,22 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-const {Prefs} = require("prefs");
-const {ActiveFilter} = require("filterClasses");
-const {FilterStorage} = require("filterStorage");
-const {FilterNotifier} = require("filterNotifier");
-const {Subscription} = require("subscriptionClasses");
-const {Notification} = require("notification");
+const {Prefs} = require("../../lib/prefs");
+const {ActiveFilter} = require("../../adblockpluscore/lib/filterClasses");
+const {FilterStorage} = require("../../adblockpluscore/lib/filterStorage");
+const {FilterNotifier} = require("../../adblockpluscore/lib/filterNotifier");
+const {Subscription} = require("../../adblockpluscore/lib/subscriptionClasses");
+const {Notification} = require("../../adblockpluscore/lib/notification");
 
 exports.initAntiAdblockNotification = function initAntiAdblockNotification()
 {
   const notification = {
     id: "antiadblock",
     type: "question",
     title: browser.i18n.getMessage("notification_antiadblock_title"),
     message: browser.i18n.getMessage("notification_antiadblock_message"),
Index: messageResponder.js
===================================================================
--- a/messageResponder.js
+++ b/messageResponder.js
@@ -16,41 +16,42 @@
  */
 
 /* globals require */
 
 "use strict";
 
 (function(global)
 {
-  const {port} = require("messaging");
-  const {Prefs} = require("prefs");
-  const {Utils} = require("utils");
-  const {FilterStorage} = require("filterStorage");
-  const {FilterNotifier} = require("filterNotifier");
-  const {defaultMatcher} = require("matcher");
-  const {Notification: NotificationStorage} = require("notification");
+  const {port} = require("../lib/messaging");
+  const {Prefs} = require("../lib/prefs");
+  const {Utils} = require("../lib/utils");
+  const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
+  const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+  const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
+  const {Notification:
+         NotificationStorage} = require("../adblockpluscore/lib/notification");
   const {getActiveNotification, shouldDisplay,
-         notificationClicked} = require("notificationHelper");
-  const {HitLogger} = require("hitLogger");
+         notificationClicked} = require("../lib/notificationHelper");
+  const {HitLogger} = require("../lib/hitLogger");
 
   const {
     Filter, ActiveFilter, BlockingFilter, RegExpFilter
-  } = require("filterClasses");
-  const {Synchronizer} = require("synchronizer");
+  } = require("../adblockpluscore/lib/filterClasses");
+  const {Synchronizer} = require("../adblockpluscore/lib/synchronizer");
 
   const info = require("info");
   const {
     Subscription,
     DownloadableSubscription,
     SpecialSubscription,
     RegularSubscription
-  } = require("subscriptionClasses");
+  } = require("../adblockpluscore/lib/subscriptionClasses");
 
-  const {showOptions} = require("options");
+  const {showOptions} = require("../lib/options");
 
   port.on("types.get", (message, sender) =>
   {
     const filterTypes = Array.from(require("requestBlocker").filterTypes);
     filterTypes.push(...filterTypes.splice(filterTypes.indexOf("OTHER"), 1));
     return filterTypes;
   });