Use require() properly instead of importing all symbols of a module

popup.js

 var backgroundPage = chrome.extension.getBackgroundPage();
-var imports = ["FilterStorage", "Filter", "isWhitelisted", "extractHostFromURL", "refreshIconAndContextMenu"];
+var imports = ["require", "isWhitelisted", "extractHostFromURL", "refreshIconAndContextMenu"];
 for (var i = 0; i < imports.length; i++)
   window[imports[i]] = backgroundPage[imports[i]];
 
+var Filter = require("filterClasses").Filter;
+var FilterStorage = require("filterStorage").FilterStorage;
+
 var tab = null;
 
 function init()
 {
   // Attach event listeners
   $("#enabled").click(toggleEnabled);
   $("#clickHideButton").click(activateClickHide);
   $("#cancelButton").click(cancelClickHide);
 
   // Ask content script whether clickhide is active. If so, show cancel button.
@@ skipping 77 matching lines @@
   document.getElementById("clickHideInactiveStuff").style.display = "none";
   document.getElementById("clickHideActiveStuff").style.display = "inherit";
 }
 
 function clickHideInactiveStuff()
 {
   document.getElementById("enabledCheckboxAndLabel").style.display = "block";
   document.getElementById("clickHideActiveStuff").style.display = "none";
   document.getElementById("clickHideInactiveStuff").style.display = "inherit";
 }