Merge pull request #5 from nikolas/jpm

jpm

38 files changed, 170 insertions, 150 deletions

diff --git a/lib/addon_management/install_uninstall.js b/lib/addon_management/install_uninstall.js
index c5c150f..084b448 100644
--- a/lib/addon_management/install_uninstall.js
+++ b/lib/addon_management/install_uninstall.js
@@ -27,10 +27,10 @@
 
 const {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-const httpObserver = require("http_observer/http_request_observer");
-var narcissusWorker = require("parser/narcissus_worker")
+const httpObserver = require("../http_observer/http_request_observer");
+var narcissusWorker = require("../parser/narcissus_worker")
     .narcissusWorker;
-const caching = require("http_observer/caching");
+const caching = require("../http_observer/caching");
 
 const prompt = Cc["@mozilla.org/embedcomp/prompt-service;1"].
   getService(Ci.nsIPromptService);
@@ -46,7 +46,7 @@ exports.onUnload = function(reason) {
         reason == "shutdown" ||
         reason == "upgrade" ||
         reason == "downgrade") {
-        require("settings/storage").librejsStorage.writeCacheToDB();
+        require("../settings/storage").librejsStorage.writeCacheToDB();
         // remove all http notifications
         httpObserver.removeHttpObserver();
         // remove worker.
diff --git a/lib/addon_management/prefchange.js b/lib/addon_management/prefchange.js
index 910a103..48a8765 100644
--- a/lib/addon_management/prefchange.js
+++ b/lib/addon_management/prefchange.js
@@ -27,7 +27,7 @@ var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
 var prompt = Cc['@mozilla.org/embedcomp/prompt-service;1'].
     getService(Ci.nsIPromptService);
-var scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+var scriptsCached = require("../script_entries/scripts_cache").scriptsCached;
 
 var setWhitelist = function () {
     whitelist = [];
diff --git a/lib/html_script_finder/dom_handler.js b/lib/html_script_finder/dom_handler.js
index c57c945..e16f673 100644
--- a/lib/html_script_finder/dom_handler.js
+++ b/lib/html_script_finder/dom_handler.js
@@ -32,33 +32,32 @@
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-var scriptProperties =
-    require("html_script_finder/dom_handler/script_properties");
+var scriptProperties = require("./dom_handler/script_properties");
 
 const scriptTypes = scriptProperties.scriptTypes;
 const statusTypes = scriptProperties.statusTypes;
 const reasons = scriptProperties.reasons;
 
-var urlHandler = require("url_handler/url_handler");
+var urlHandler = require("../url_handler/url_handler");
 
-var WebLabelFinder =
-    require("html_script_finder/web_labels/js_web_labels").WebLabelFinder;
+var WebLabelFinder = require("./web_labels/js_web_labels").WebLabelFinder;
 
 // object model for script entries.
-var scriptObject = require("html_script_finder/dom_handler/script_object");
+var scriptObject = require("./dom_handler/script_object");
 
-var privacyChecker = require("js_checker/privacy_checker").privacyCheck;
-var jsChecker = require("js_checker/js_checker");
-const types = require("js_checker/constant_types");
+var privacyChecker = require("../js_checker/privacy_checker").privacyCheck;
+var jsChecker = require("../js_checker/js_checker");
+const types = require("../js_checker/constant_types");
 
 var checkTypes = types.checkTypes;
 
 var stripCDATAOpen = /<\!\[CDATA\[/gi;
 var stripCDATAClose = /]]>/g;
 
-var isDryRun = require("addon_management/prefchange").isDryRun;
-var allowedRef = require('http_observer/allowed_referrers').allowedReferrers;
-var attributeHelpers = require("html_script_finder/dom_handler/attributes");
+var isDryRun = require("../addon_management/prefchange").isDryRun;
+var allowedRef = require('../http_observer/allowed_referrers')
+    .allowedReferrers;
+var attributeHelpers = require("./dom_handler/attributes");
 
 // javascript:*
 var jsInAttrRe = attributeHelpers.jsInAttrRe;
@@ -66,10 +65,8 @@ var jsInAttrRe = attributeHelpers.jsInAttrRe;
 // the list of all available event attributes
 var intrinsicEvents = attributeHelpers.intrinsicEvents;
 
-var domGatherer =
-    require("html_script_finder/dom_handler/dom_gatherer").domGatherer;
-var domChecker  =
-    require("html_script_finder/dom_handler/dom_checker").domChecker;
+var domGatherer = require("./dom_handler/dom_gatherer").domGatherer;
+var domChecker  = require("./dom_handler/dom_checker").domChecker;
 
 /**
  * The DomHandler object takes a whole document,
diff --git a/lib/html_script_finder/dom_handler/attributes.js b/lib/html_script_finder/dom_handler/attributes.js
index 796e718..ac603fe 100644
--- a/lib/html_script_finder/dom_handler/attributes.js
+++ b/lib/html_script_finder/dom_handler/attributes.js
@@ -21,9 +21,8 @@
  */
 
 // object model for script entries.
-var scriptObject = require("html_script_finder/dom_handler/script_object");
-
-var scriptProperties = require("html_script_finder/dom_handler/script_properties");
+var scriptObject = require("./script_object");
+var scriptProperties = require("./script_properties");
 
 const scriptTypes = scriptProperties.scriptTypes;
 
diff --git a/lib/html_script_finder/dom_handler/dom_checker.js b/lib/html_script_finder/dom_handler/dom_checker.js
index 6a98d61..b4d27b2 100644
--- a/lib/html_script_finder/dom_handler/dom_checker.js
+++ b/lib/html_script_finder/dom_handler/dom_checker.js
@@ -30,25 +30,26 @@
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 var timer = require("sdk/timers");
 
-var scriptProperties = require("html_script_finder/dom_handler/script_properties");
+var scriptProperties = require("./script_properties");
 const scriptTypes = scriptProperties.scriptTypes;
 const statusTypes = scriptProperties.statusTypes;
 const reasons = scriptProperties.reasons;
 
 // ensure xhr won't create an infinite loop
 // with html content.
-var urlTester = require("html_script_finder/url_seen_tester").urlSeenTester;
-var urlHandler = require("url_handler/url_handler");
+var urlTester = require("../url_seen_tester").urlSeenTester;
+var urlHandler = require("../../url_handler/url_handler");
 
-var privacyChecker = require("js_checker/privacy_checker").privacyCheck;
-var jsChecker = require("js_checker/js_checker");
+var privacyChecker = require("../../js_checker/privacy_checker").privacyCheck;
+var jsChecker = require("../../js_checker/js_checker");
 
-const types = require("js_checker/constant_types");
+const types = require("../../js_checker/constant_types");
 var checkTypes = types.checkTypes;
 var stripCDATAOpen = /<\!\[CDATA\[/gi;
 var stripCDATAClose = /]]>/g;
 
-const getHash = require("script_entries/scripts_cache").scriptsCached.getHash;
+const getHash = require("../../script_entries/scripts_cache")
+      .scriptsCached.getHash;
 
 var DomChecker = function() {
     // reference to domHandler instance
@@ -452,8 +453,7 @@ DomChecker.prototype.xhr = function(script, responseCallback) {
         urlTester.addUrl(url);
 
         // request module. Compatible with Https-Everywhere.
-        require('html_script_finder/dom_handler/request')
-            .request(script, responseCallback).request();
+        require('./request').request(script, responseCallback).request();
     }  catch (x) {
         console.debug('error', x, x.lineNumber, x.fileName);
         responseCallback(script, false);
diff --git a/lib/html_script_finder/dom_handler/dom_gatherer.js b/lib/html_script_finder/dom_handler/dom_gatherer.js
index 7bb2569..ce29cf6 100644
--- a/lib/html_script_finder/dom_handler/dom_gatherer.js
+++ b/lib/html_script_finder/dom_handler/dom_gatherer.js
@@ -20,18 +20,19 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var scriptProperties = require("html_script_finder/dom_handler/script_properties");
+var scriptProperties = require("./script_properties");
 
 const scriptTypes = scriptProperties.scriptTypes;
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+const scriptsCached = require("../../script_entries/scripts_cache")
+      .scriptsCached;
 
 const statusTypes = scriptProperties.statusTypes;
 // object model for script entries.
-var scriptObject = require("html_script_finder/dom_handler/script_object");
+var scriptObject = require("./script_object");
 
-var urlHandler = require("url_handler/url_handler");
+var urlHandler = require("../../url_handler/url_handler");
 
-var attributeHelpers = require("html_script_finder/dom_handler/attributes");
+var attributeHelpers = require("./attributes");
 
 // javascript:*
 var jsInAttrRe = attributeHelpers.jsInAttrRe;
@@ -39,9 +40,9 @@ var jsInAttrRe = attributeHelpers.jsInAttrRe;
 // the list of all available event attributes
 var intrinsicEvents = attributeHelpers.intrinsicEvents;
 
-var privacyChecker = require("js_checker/privacy_checker").privacyCheck;
+var privacyChecker = require("../../js_checker/privacy_checker").privacyCheck;
 
-const types = require("js_checker/constant_types");
+const types = require("../../js_checker/constant_types");
 
 var checkTypes = types.checkTypes;
 
@@ -246,8 +247,10 @@ DomGatherer.prototype.gatherScriptsContent = function() {
                     // using else if since script text is
                     // ignored if src attribute is set.
                     // adding this.narcissusBugFixLibreJS to fix comment bug.
-                    var bugfix = require('html_script_finder/bug_fix').narcissusBugFixLibreJS;
-                    currentScript = stripHtmlCommentsInScript(this.d.domScripts[i].text + bugfix);
+                    var bugfix = require('../../html_script_finder/bug_fix')
+                        .narcissusBugFixLibreJS;
+                    currentScript = stripHtmlCommentsInScript(
+                        this.d.domScripts[i].text + bugfix);
 
                     scriptEntry = scriptObject.Script(
                         {'type': scriptTypes.INLINE,
diff --git a/lib/html_script_finder/dom_handler/request.js b/lib/html_script_finder/dom_handler/request.js
index a008295..f25ba8f 100644
--- a/lib/html_script_finder/dom_handler/request.js
+++ b/lib/html_script_finder/dom_handler/request.js
@@ -28,9 +28,10 @@ var {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // ensure xhr won't create an infinite loop
 // with html content.
-var urlTester = require("html_script_finder/url_seen_tester").urlSeenTester;
-var urlHandler = require("url_handler/url_handler");
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+var urlTester = require("../url_seen_tester").urlSeenTester;
+var urlHandler = require("../../url_handler/url_handler");
+const scriptsCached = require("../../script_entries/scripts_cache")
+      .scriptsCached;
 
 var Request = function() {
     this.url = null;
diff --git a/lib/html_script_finder/dom_handler/script_object.js b/lib/html_script_finder/dom_handler/script_object.js
index 83ae073..64468b4 100644
--- a/lib/html_script_finder/dom_handler/script_object.js
+++ b/lib/html_script_finder/dom_handler/script_object.js
@@ -20,11 +20,13 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var removedScripts = require("script_entries/removed_scripts").removedScripts;
+var removedScripts = require("../../script_entries/removed_scripts")
+    .removedScripts;
 
-var acceptedScripts = require("script_entries/accepted_scripts")
+var acceptedScripts = require("../../script_entries/accepted_scripts")
     .acceptedScripts;
-var dryRunScripts = require("script_entries/dryrun_scripts").dryRunScripts;
+var dryRunScripts = require("../../script_entries/dryrun_scripts")
+    .dryRunScripts;
 
 var Script = function(props) {
     // can be an attribute, an inline script,
diff --git a/lib/html_script_finder/html_parser.js b/lib/html_script_finder/html_parser.js
index a2bae80..ab36eaf 100644
--- a/lib/html_script_finder/html_parser.js
+++ b/lib/html_script_finder/html_parser.js
@@ -80,7 +80,7 @@
 
 var {Cc, Ci, Cu} = require("chrome");
 
-var domHandlerModule = require("html_script_finder/dom_handler");
+var domHandlerModule = require("./dom_handler");
 
 const PR_UINT32_MAX = 2147483647;
 
diff --git a/lib/html_script_finder/web_labels/js_web_labels.js b/lib/html_script_finder/web_labels/js_web_labels.js
index 510852b..0cb64bf 100644
--- a/lib/html_script_finder/web_labels/js_web_labels.js
+++ b/lib/html_script_finder/web_labels/js_web_labels.js
@@ -22,19 +22,18 @@
 
 // node.js url module. Makes it easier to resolve
 // urls in that datauri loaded dom
-var urlHandler = require("url_handler/url_handler");
+var urlHandler = require("../../url_handler/url_handler");
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 var data = require("sdk/self").data;
 
 // license definitions, we are using canonical urls and license
 // identifiers.
-var licenses = require('js_checker/license_definitions').licenses;
+var licenses = require('../../js_checker/license_definitions').licenses;
 
-var getLicenseList = require('html_script_finder/web_labels/find_js_labels')
-    .getLicenseList;
-const types = require("js_checker/constant_types");
+var getLicenseList = require('./find_js_labels').getLicenseList;
+const types = require("../../js_checker/constant_types");
 
-const addToCache = require("html_script_finder/web_labels/script_hash_worker")
+const addToCache = require("./script_hash_worker")
       .addToCache;
 
 // keep web labels in memory so that they can be checked even when they
@@ -175,7 +174,7 @@ WebLabelFinder.prototype.isLicenseFree = function(
         var found = false;
 
         // Check if we can look up this license by its identifier.
-        var identifier = lic.licenses[i]['licenseName'];
+        var identifier = lic.licenses[i].licenseName;
         if (typeof identifier !== 'undefined' &&
             typeof licenses[identifier] !== 'undefined'
            ) {
diff --git a/lib/html_script_finder/web_labels/script_hash_worker.js b/lib/html_script_finder/web_labels/script_hash_worker.js
index 92ffb82..4ed9d21 100644
--- a/lib/html_script_finder/web_labels/script_hash_worker.js
+++ b/lib/html_script_finder/web_labels/script_hash_worker.js
@@ -20,9 +20,10 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const types = require("js_checker/constant_types");
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
-const xhr = require('html_script_finder/dom_handler/dom_checker').xhr;
+const types = require("../../js_checker/constant_types");
+const scriptsCached = require("../../script_entries/scripts_cache")
+      .scriptsCached;
+const xhr = require('../dom_handler/dom_checker').xhr;
 const timers = require("sdk/timers");
 
 exports.addToCache = function (lic, delay, jsWebLabelsURL, callback) {
diff --git a/lib/http_observer/allowed_referrers.js b/lib/http_observer/allowed_referrers.js
index 39374c9..06d860b 100644
--- a/lib/http_observer/allowed_referrers.js
+++ b/lib/http_observer/allowed_referrers.js
@@ -20,7 +20,7 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var prefChange = require("addon_management/prefchange");
+var prefChange = require("../addon_management/prefchange");
 
 var allowed = {};
 
diff --git a/lib/http_observer/http_request_observer.js b/lib/http_observer/http_request_observer.js
index e8c9635..0b6e14d 100644
--- a/lib/http_observer/http_request_observer.js
+++ b/lib/http_observer/http_request_observer.js
@@ -31,8 +31,9 @@ var targetMimeTypes = /.*(javascript|ecmascript|html).*/i;
 
 // ensure xhr won't create an infinite loop
 // with html content.
-var urlTester = require("html_script_finder/url_seen_tester").urlSeenTester;
-var streamLoader = require("http_observer/stream_loader").streamLoader;
+var urlTester = require("../html_script_finder/url_seen_tester")
+    .urlSeenTester;
+var streamLoader = require("../http_observer/stream_loader").streamLoader;
 
 var httpRequestObserver = {
     observe: function(request, aTopic, aData) {
diff --git a/lib/http_observer/process_response.js b/lib/http_observer/process_response.js
index 924636b..72f236c 100644
--- a/lib/http_observer/process_response.js
+++ b/lib/http_observer/process_response.js
@@ -27,28 +27,32 @@
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-var jsChecker = require("js_checker/js_checker");
+var jsChecker = require("../js_checker/js_checker");
 
-const types = require("js_checker/constant_types");
+const types = require("../js_checker/constant_types");
 var checkTypes = types.checkTypes;
 
 // check if scripts embedded dynamically have a jsWebLabel entry indexed by referrer.
-var jsWebLabelEntries = require("html_script_finder/web_labels/js_web_labels").jsWebLabelEntries;
+var jsWebLabelEntries = require("../html_script_finder/web_labels/js_web_labels")
+    .jsWebLabelEntries;
 
-var htmlParser = require("html_script_finder/html_parser");
+var htmlParser = require("../html_script_finder/html_parser");
 
-var removedScripts = require("script_entries/removed_scripts").removedScripts;
-var allowedRef = require('http_observer/allowed_referrers').allowedReferrers;
+var removedScripts = require("../script_entries/removed_scripts")
+    .removedScripts;
+var allowedRef = require('../http_observer/allowed_referrers')
+    .allowedReferrers;
 
-var acceptedScripts = require("script_entries/accepted_scripts").acceptedScripts;
+var acceptedScripts = require("../script_entries/accepted_scripts")
+    .acceptedScripts;
 
 // used to display info when a url is whitelisted.
-var dryRunScripts = require("script_entries/dryrun_scripts").dryRunScripts;
+var dryRunScripts = require("../script_entries/dryrun_scripts").dryRunScripts;
 
 // node.js url module. Makes it easier to resolve
 // urls in that datauri loaded dom
-var urlHandler = require("url_handler/url_handler");
-var isDryRun = require("addon_management/prefchange").isDryRun;
+var urlHandler = require("../url_handler/url_handler");
+var isDryRun = require("../addon_management/prefchange").isDryRun;
 
 var jsMimeTypeRe = /.*(javascript|ecmascript).*/i;
 var htmlMimeTypeRe = /.*(xhtml\+xml|html|multipart\/x-mixed-replace).*/i;
diff --git a/lib/http_observer/stream_loader.js b/lib/http_observer/stream_loader.js
index ec21cb7..c790fe2 100644
--- a/lib/http_observer/stream_loader.js
+++ b/lib/http_observer/stream_loader.js
@@ -21,7 +21,7 @@
  */
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-const processResponse = require('http_observer/process_response');
+const processResponse = require('./process_response');
 const CHARSETS = [
     '866', 'ansi_x3.4-1968', 'arabic', 'ascii', 'asmo-708', 'big5',
     'big5-hkscs', 'chinese', 'cn-big5', 'cp1250', 'cp1251', 'cp1252',
diff --git a/lib/js_checker/free_checker.js b/lib/js_checker/free_checker.js
index 71a262e..be190e2 100644
--- a/lib/js_checker/free_checker.js
+++ b/lib/js_checker/free_checker.js
@@ -20,16 +20,16 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var licenses = require('js_checker/license_definitions');
+var licenses = require('./license_definitions');
 var simpleStorage = require("sdk/simple-storage");
 const LAZY = licenses.types.LAZY;
 var licenseRegex = [];
-const END_OF_SCRIPT = require('html_script_finder/bug_fix').END_OF_SCRIPT;
-const types = require("js_checker/constant_types");
+const END_OF_SCRIPT = require('../html_script_finder/bug_fix').END_OF_SCRIPT;
+const types = require("./constant_types");
 
 const token = types.token;
 
-var patternUtils = require('js_checker/pattern_utils').patternUtils;
+var patternUtils = require('./pattern_utils').patternUtils;
 
 var licStartLicEndRe = /@licstartThefollowingistheentirelicensenoticefortheJavaScriptcodeinthis(?:page|file)(.*)?@licendTheaboveistheentirelicensenoticefortheJavaScriptcodeinthis(?:page|file)/mi;
 var licenseMagnet = /.*@license ?(magnet\:\?xt=urn\:btih\:[0-9A-Za-z]+).*/;
diff --git a/lib/js_checker/js_checker.js b/lib/js_checker/js_checker.js
index 21bfeaf..ecf0826 100644
--- a/lib/js_checker/js_checker.js
+++ b/lib/js_checker/js_checker.js
@@ -23,16 +23,17 @@
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-var narcissusWorker = require("parser/narcissus_worker")
+var narcissusWorker = require("../parser/narcissus_worker")
     .narcissusWorker;
 
-const nonTrivialModule = require("js_checker/nontrivial_checker");
-const freeChecker = require("js_checker/free_checker");
-const relationChecker = require("js_checker/relation_checker");
-const types = require("js_checker/constant_types");
+const nonTrivialModule = require("./nontrivial_checker");
+const freeChecker = require("./free_checker");
+const relationChecker = require("./relation_checker");
+const types = require("./constant_types");
 
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
-var isDryRun = require("addon_management/prefchange").isDryRun;
+const scriptsCached = require("../script_entries/scripts_cache")
+      .scriptsCached;
+var isDryRun = require("../addon_management/prefchange").isDryRun;
 
 var checkTypes = types.checkTypes;
 
@@ -165,13 +166,14 @@ JsChecker.prototype.isFreeLicensed = function(script) {
  */
 JsChecker.prototype.searchJs = function(jsCode, resultReady, url) {
     var that = this;
-    var bugfix = require('html_script_finder/bug_fix').narcissusBugFixLibreJS;
+    var bugfix = require('../html_script_finder/bug_fix')
+        .narcissusBugFixLibreJS;
     console.debug('JsChecker.searchJs for script url:', url);
     this.url = url;
     this.resultReady = resultReady;
     this.jsCode = jsCode;
     this.shortText = jsCode.replace(bugfix, '').substring(0,100);
-    this.notification = require("ui/notification")
+    this.notification = require("../ui/notification")
         .createNotification(this.shortText).notification;
 
     var verbatimCode = this.jsCode.replace(bugfix, '');
diff --git a/lib/js_checker/nontrivial_checker.js b/lib/js_checker/nontrivial_checker.js
index 6a22992..1c79a2a 100644
--- a/lib/js_checker/nontrivial_checker.js
+++ b/lib/js_checker/nontrivial_checker.js
@@ -19,7 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
-const types = require("js_checker/constant_types");
+const types = require("./constant_types");
 
 // constants from Narcissus for function types.
 const DECLARED_FORM = 0, EXPRESSED_FORM = 1, STATEMENT_FORM = 2;
diff --git a/lib/js_checker/privacy_checker.js b/lib/js_checker/privacy_checker.js
index f39e0b7..fe0fa8a 100644
--- a/lib/js_checker/privacy_checker.js
+++ b/lib/js_checker/privacy_checker.js
@@ -20,8 +20,8 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const privacyThreatJs = require('js_checker/privacy_threat_definitions.js');
-const patternUtils = require('js_checker/pattern_utils').patternUtils;
+const privacyThreatJs = require('./privacy_threat_definitions.js');
+const patternUtils = require('./pattern_utils').patternUtils;
 
 exports.privacyCheck = {
     checkScriptPrivacyThreat: function (currentScript) {
diff --git a/lib/js_checker/relation_checker.js b/lib/js_checker/relation_checker.js
index c504444..21580a9 100644
--- a/lib/js_checker/relation_checker.js
+++ b/lib/js_checker/relation_checker.js
@@ -25,7 +25,7 @@
  * Finds out if two scripts are related to each other.
  *
  */
-const types = require("js_checker/constant_types");
+const types = require("./constant_types");
 
 const token = types.token;
 
diff --git a/lib/js_load_observer/js_load_observer.js b/lib/js_load_observer/js_load_observer.js
index 7b73ec6..525f58f 100644
--- a/lib/js_load_observer/js_load_observer.js
+++ b/lib/js_load_observer/js_load_observer.js
@@ -25,10 +25,12 @@ var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 var observerService = Cc["@mozilla.org/observer-service;1"]
 .getService(Ci.nsIObserverService);
 
-var acceptedScripts = require("script_entries/accepted_scripts").acceptedScripts;
-var allowedRef = require('http_observer/allowed_referrers').allowedReferrers;
+var acceptedScripts = require("../script_entries/accepted_scripts")
+    .acceptedScripts;
+var allowedRef = require('../http_observer/allowed_referrers')
+    .allowedReferrers;
 
-var urlHandler = require("url_handler/url_handler");
+var urlHandler = require("../url_handler/url_handler");
 
 var ScriptAnalyzer = function() {
     // the URL of the current page.
@@ -51,7 +53,7 @@ ScriptAnalyzer.prototype.analyzeScriptBeforeExec = function (e) {
     var script = e.target, isAccepted;
     var text = script.src ?
         script.src : script.textContent.substring(0,100);
-    var notif = require("ui/notification")
+    var notif = require("../ui/notification")
         .createNotification(text).notification;
     this.pageURL = urlHandler.removeFragment(script.ownerDocument.URL);
     if (!allowedRef.urlInAllowedReferrers(this.pageURL)) {
diff --git a/lib/main.js b/lib/main.js
index ac280a4..b704aad 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -26,15 +26,15 @@
 
 const { Cc, Ci } = require("chrome");
 
-const librejsStorage = require("settings/storage").librejsStorage;
-let addonManage = require("addon_management/install_uninstall");
-let httpObserver = require("http_observer/http_request_observer");
-let prefObserver = require("pref_observer/pref_observer");
-let prefChange = require("addon_management/prefchange");
-let uiInfo = require("ui/ui_info");
-let scriptPanel = require("ui/script_panel.js");
+const librejsStorage = require("./settings/storage").librejsStorage;
+let addonManage = require("./addon_management/install_uninstall");
+let httpObserver = require("./http_observer/http_request_observer");
+let prefObserver = require("./pref_observer/pref_observer");
+let prefChange = require("./addon_management/prefchange");
+let uiInfo = require("./ui/ui_info");
+let scriptPanel = require("./ui/script_panel.js");
 
-require('ui');
+require('./ui');
 
 // set whitelist at startup.
 prefChange.init();
diff --git a/lib/parser/narcissus_worker.js b/lib/parser/narcissus_worker.js
index a25e279..e9829b4 100644
--- a/lib/parser/narcissus_worker.js
+++ b/lib/parser/narcissus_worker.js
@@ -31,7 +31,7 @@ var NarcissusWorker = function() {
     var that = this;
 
     this.worker.onmessage = function(e) {
-        var jsChecker = require("js_checker/js_checker");
+        var jsChecker = require("../js_checker/js_checker");
 
         console.debug('onmessage', e.data.hash);
         try {
diff --git a/lib/pref_observer/pref_observer.js b/lib/pref_observer/pref_observer.js
index d066c2f..2c5e360 100644
--- a/lib/pref_observer/pref_observer.js
+++ b/lib/pref_observer/pref_observer.js
@@ -20,7 +20,7 @@
  */
 
 var {Cc, Ci} = require("chrome");
-const httpObserver = require("http_observer/http_request_observer");
+const httpObserver = require("../http_observer/http_request_observer");
 
 // https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Preferences#Using_preference_observers
 var prefObserver = {
diff --git a/lib/script_entries/accepted_scripts.js b/lib/script_entries/accepted_scripts.js
index c732f31..bac11f0 100644
--- a/lib/script_entries/accepted_scripts.js
+++ b/lib/script_entries/accepted_scripts.js
@@ -20,7 +20,7 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var allScripts = require('script_entries/all_scripts').allScripts;
+var allScripts = require('./all_scripts').allScripts;
 
 var AcceptedScripts = function() {
     this.scripts = {};
diff --git a/lib/script_entries/all_scripts.js b/lib/script_entries/all_scripts.js
index 2028864..c27a410 100644
--- a/lib/script_entries/all_scripts.js
+++ b/lib/script_entries/all_scripts.js
@@ -20,7 +20,7 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var crypto = require('script_entries/crypto');
+var crypto = require('./crypto');
 
 var AllScripts = function() {
     this.scripts = {};
diff --git a/lib/script_entries/dryrun_scripts.js b/lib/script_entries/dryrun_scripts.js
index 87ec482..a15b0b2 100644
--- a/lib/script_entries/dryrun_scripts.js
+++ b/lib/script_entries/dryrun_scripts.js
@@ -20,8 +20,8 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var allScripts = require('script_entries/all_scripts').allScripts;
-const urlHandler = require('url_handler/url_handler');
+var allScripts = require('./all_scripts').allScripts;
+const urlHandler = require('../url_handler/url_handler');
 
 exports.dryRunScripts = {
   scripts: {},
diff --git a/lib/script_entries/free_libraries.js b/lib/script_entries/free_libraries.js
index 8821d04..291b982 100644
--- a/lib/script_entries/free_libraries.js
+++ b/lib/script_entries/free_libraries.js
@@ -22,13 +22,15 @@
 
 // THIS MODULE IS DEPRECATED IN FAVOR OF THE NEW WHITELISTING MODULE (LibreJS 6.0)
 
-var relationChecker = require("js_checker/relation_checker").relationChecker;
-var checkTypes = require("js_checker/constant_types").checkTypes;
-var scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+var relationChecker = require("../js_checker/relation_checker")
+    .relationChecker;
+var checkTypes = require("../js_checker/constant_types").checkTypes;
+var scriptsCached = require("./scripts_cache").scriptsCached;
 
 
 // find the json database path.
-var dbContents = require("sdk/self").data.load("script_libraries/script-libraries.json");
+var dbContents = require("sdk/self").data.load(
+    "script_libraries/script-libraries.json");
 
 const AUTHOR_REASON = "This script has been tagged as free software by LibreJS authors.";
 
diff --git a/lib/script_entries/removed_scripts.js b/lib/script_entries/removed_scripts.js
index b7544e9..2a3b1d3 100644
--- a/lib/script_entries/removed_scripts.js
+++ b/lib/script_entries/removed_scripts.js
@@ -20,8 +20,8 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var allScripts = require('script_entries/all_scripts').allScripts;
-const urlHandler = require('url_handler/url_handler');
+var allScripts = require('./all_scripts').allScripts;
+const urlHandler = require('../url_handler/url_handler');
 
 var RemovedScripts = function() {
     this.scripts = {};
diff --git a/lib/script_entries/scripts_cache.js b/lib/script_entries/scripts_cache.js
index 47ab069..52ae33f 100644
--- a/lib/script_entries/scripts_cache.js
+++ b/lib/script_entries/scripts_cache.js
@@ -19,14 +19,14 @@
  * You should have received a copy of the GNU General Public License
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
-var relationCheckerObj = require("js_checker/relation_checker")
+var relationCheckerObj = require("../js_checker/relation_checker")
     .relationChecker;
 
 // import free_libraries to populate the cache hash map.
-var free_libraries = require("script_entries/free_libraries");
+var free_libraries = require("../script_entries/free_libraries");
 
-var crypto = require('script_entries/crypto');
-const checkTypes = require("js_checker/constant_types").checkTypes;
+var crypto = require('./crypto');
+const checkTypes = require("../js_checker/constant_types").checkTypes;
 
 // cachedResults contains objects with result/relationChecker for
 // scripts entries indexed by SHA1sum
@@ -40,7 +40,8 @@ var ScriptsCached = function() {
 };
 
 ScriptsCached.prototype.getHash = function(scriptText) {
-    require('ui/notification').createNotification(scriptText.substring(0,100));
+    require('../ui/notification').createNotification(
+        scriptText.substring(0,100));
 
     return crypto.sha1Encrypt(scriptText);
 };
diff --git a/lib/settings/settings_tab.js b/lib/settings/settings_tab.js
index 976714a..6e28ef6 100644
--- a/lib/settings/settings_tab.js
+++ b/lib/settings/settings_tab.js
@@ -21,10 +21,9 @@
  */
 const tabs = require("sdk/tabs");
 const data = require("sdk/self").data;
-const storage = require("settings/storage").librejsStorage;
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
-
-exports.settingsManager = settingsManager;
+const storage = require("./storage").librejsStorage;
+const scriptsCached = require("../script_entries/scripts_cache")
+      .scriptsCached;
 
 let settingsManager = {
     settingsTab: {
diff --git a/lib/settings/storage.js b/lib/settings/storage.js
index bc9fe77..abd42e6 100644
--- a/lib/settings/storage.js
+++ b/lib/settings/storage.js
@@ -23,14 +23,18 @@
 
 const { Cc, Ci, Cu, components } = require("chrome");
 
-var { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm");
-var { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm");
-var relationChecker = require("js_checker/relation_checker").relationChecker;
+const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm");
+const { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm");
+var relationChecker = require("../js_checker/relation_checker")
+    .relationChecker;
 var rc = relationChecker(); // a dummy object for legacy module.
-const AUTHOR_REASON = require("script_entries/free_libraries").AUTHOR_REASON;
-var relationChecker = require("js_checker/relation_checker").relationChecker; 
+const AUTHOR_REASON = require("../script_entries/free_libraries")
+      .AUTHOR_REASON;
+var relationChecker = require("../js_checker/relation_checker")
+    .relationChecker;
 
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+const scriptsCached = require("../script_entries/scripts_cache")
+      .scriptsCached;
 
 let librejsStorage = {
 
@@ -59,7 +63,7 @@ let librejsStorage = {
             NetUtil.asyncFetch(channel, function(inputStream, status) {
 
                 if (!components.isSuccessCode(status)) {
-                    require("script_entries/free_libraries").init();
+                    require("../script_entries/free_libraries").init();
                     that.initialWrite();
                 }
                 
@@ -88,7 +92,7 @@ let librejsStorage = {
         console.debug("About to write free libraries");
         // our file is not populated with default contents.
         // use free_libraries.js to populate.
-        require("script_entries/free_libraries").init();
+        require("../script_entries/free_libraries").init();
         this.writeCacheToDB(callback);
     },
 
diff --git a/lib/ui.js b/lib/ui.js
index e135f57..9229c4c 100644
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -25,20 +25,22 @@ let tabs = require("sdk/tabs");
 let {getMostRecentBrowserWindow} = require('sdk/window/utils');
 let {ToggleButton} = require('sdk/ui/button/toggle');
 
-let settings_tab = require('settings/settings_tab');
-let allowedRef = require("http_observer/allowed_referrers").allowedReferrers;
-let urlHandler = require("url_handler/url_handler");
-let removedScripts = require("script_entries/removed_scripts").removedScripts;
-let acceptedScripts = require("script_entries/accepted_scripts")
+let settings_tab = require('./settings/settings_tab');
+let allowedRef = require("./http_observer/allowed_referrers")
+    .allowedReferrers;
+let urlHandler = require("./url_handler/url_handler");
+let removedScripts = require("./script_entries/removed_scripts")
+    .removedScripts;
+let acceptedScripts = require("./script_entries/accepted_scripts")
     .acceptedScripts;
-let jsLabelsPagesVisited = require('html_script_finder/web_labels/js_web_labels')
+let jsLabelsPagesVisited = require('./html_script_finder/web_labels/js_web_labels')
     .jsLabelsPagesVisited;
-let dryRunScripts = require("script_entries/dryrun_scripts").dryRunScripts;
-let types = require("js_checker/constant_types");
-const removeHashCallback = require("js_checker/js_checker").removeHashCallback;
+let dryRunScripts = require("./script_entries/dryrun_scripts").dryRunScripts;
+let types = require("./js_checker/constant_types");
+const removeHashCallback = require("./js_checker/js_checker").removeHashCallback;
 
 // move to sub-module later
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+const scriptsCached = require("./script_entries/scripts_cache").scriptsCached;
 
 function generateDataURI (encodedText) {
     return "data:text/html;charset=UTF-8;base64," + encodedText;
@@ -135,7 +137,7 @@ let UI = exports.UI = {
             }
         });
 
-        var menuitem = require("menuitems").Menuitem({
+        var menuitem = require("menuitem").Menuitem({
             id: 'librejs_settings',
             menuid: 'menu_ToolsPopup',
             label: 'LibreJS Whitelist',
diff --git a/lib/ui/notification.js b/lib/ui/notification.js
index da4b7d5..c49b083 100644
--- a/lib/ui/notification.js
+++ b/lib/ui/notification.js
@@ -24,7 +24,7 @@
 // is running to inform the user it is indeed busy working.
 const timer = require("sdk/timers");
 const self = require("sdk/self");
-const isDisplayNotifications = require("addon_management/prefchange")
+const isDisplayNotifications = require("../addon_management/prefchange")
       .isDisplayNotifications;
 
 exports.createCriticalNotification = function (text) {
diff --git a/lib/ui/script_panel.js b/lib/ui/script_panel.js
index 35b601c..12c25ae 100644
--- a/lib/ui/script_panel.js
+++ b/lib/ui/script_panel.js
@@ -20,7 +20,7 @@
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var urlHandler = require("url_handler/url_handler");
+var urlHandler = require("../url_handler/url_handler");
 
 /**
  * addScriptsToPanelList
diff --git a/lib/ui/ui_info.js b/lib/ui/ui_info.js
index 6df8a09..8b5ad81 100644
--- a/lib/ui/ui_info.js
+++ b/lib/ui/ui_info.js
@@ -24,10 +24,10 @@
 
 var data = require("sdk/self").data;
 var pageMod = require("sdk/page-mod");
-var urlHandler = require("url_handler/url_handler");
+var urlHandler = require("../url_handler/url_handler");
 var pageWorker = require("sdk/page-worker");
 var tabs = require("sdk/tabs");
-var prefs = require("addon_management/prefchange");
+var prefs = require("../addon_management/prefchange");
 
 // contain list of recently found contact links or email addresses.
 var contactList = {};
@@ -162,7 +162,7 @@ var tabProcess = function (worker) {
 
 var searchSecondLevelPage = function(
     worker, urlToSearch, originalUrl) {
-    return;
+/*
     var originalWorker = worker;
 
     console.debug('searchSecondLevelPage');
@@ -195,6 +195,7 @@ var searchSecondLevelPage = function(
             }
         });
     }
+*/
 };
 
 exports.testModule = {
diff --git a/lib/url_handler/node_url.js b/lib/url_handler/node_url.js
index 71d31a6..47779f1 100644
--- a/lib/url_handler/node_url.js
+++ b/lib/url_handler/node_url.js
@@ -19,7 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-var punycode = require('url_handler/node_punycode');
+var punycode = require('./node_punycode');
 
 exports.parse = urlParse;
 exports.resolve = urlResolve;
@@ -92,7 +92,7 @@ var protocolPattern = /^([a-z0-9.+-]+:)/i,
       'gopher:': true,
       'file:': true
     },
-    querystring = require('url_handler/node_querystring');
+    querystring = require('./node_querystring');
 
 function urlParse(url, parseQueryString, slashesDenoteHost) {
   if (url && typeof(url) === 'object' && url instanceof Url) return url;
diff --git a/lib/url_handler/url_handler.js b/lib/url_handler/url_handler.js
index 5117190..234dff5 100644
--- a/lib/url_handler/url_handler.js
+++ b/lib/url_handler/url_handler.js
@@ -29,7 +29,7 @@
 
 // node.js url module. Makes it easier to resolve
 // urls in that datauri loaded dom
-var nodeJsUrl = require("url_handler/node_url");
+var nodeJsUrl = require("./node_url");
 
 var urlUtils = {
     getFragment: function (url) {