diff --git a/chrome/chromeFiles/content/scholar/data_access.js b/chrome/chromeFiles/content/scholar/xpcom/data_access.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/data_access.js
rename to chrome/chromeFiles/content/scholar/xpcom/data_access.js
diff --git a/chrome/chromeFiles/content/scholar/db.js b/chrome/chromeFiles/content/scholar/xpcom/db.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/db.js
rename to chrome/chromeFiles/content/scholar/xpcom/db.js
diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/xpcom/scholar.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/overlay.js
rename to chrome/chromeFiles/content/scholar/xpcom/scholar.js
diff --git a/components/chnmIScholarService.js b/components/chnmIScholarService.js
index abbb222c9..6556ae88f 100644
--- a/components/chnmIScholarService.js
+++ b/components/chnmIScholarService.js
@@ -16,16 +16,16 @@ var ScholarWrapped = this;
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/overlay.js");
+	.loadSubScript("chrome://scholar/content/xpcom/scholar.js");
 
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/db.js");
+	.loadSubScript("chrome://scholar/content/xpcom/db.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/data_access.js");
+	.loadSubScript("chrome://scholar/content/xpcom/data_access.js");
 
 /********************************************************************/