3 files changed, 18 insertions, 13 deletions
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',