diff --git a/chrome/chromeFiles/content/scholar/about.xul b/chrome/chromeFiles/content/zotero/about.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/about.xul
rename to chrome/chromeFiles/content/zotero/about.xul
diff --git a/chrome/chromeFiles/content/scholar/addCitationDialog.js b/chrome/chromeFiles/content/zotero/addCitationDialog.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/addCitationDialog.js
rename to chrome/chromeFiles/content/zotero/addCitationDialog.js
diff --git a/chrome/chromeFiles/content/scholar/addCitationDialog.xul b/chrome/chromeFiles/content/zotero/addCitationDialog.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/addCitationDialog.xul
rename to chrome/chromeFiles/content/zotero/addCitationDialog.xul
diff --git a/chrome/chromeFiles/content/scholar/admin/itemTypeManager.css b/chrome/chromeFiles/content/zotero/admin/itemTypeManager.css
similarity index 100%
rename from chrome/chromeFiles/content/scholar/admin/itemTypeManager.css
rename to chrome/chromeFiles/content/zotero/admin/itemTypeManager.css
diff --git a/chrome/chromeFiles/content/scholar/admin/itemTypeManager.js b/chrome/chromeFiles/content/zotero/admin/itemTypeManager.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/admin/itemTypeManager.js
rename to chrome/chromeFiles/content/zotero/admin/itemTypeManager.js
diff --git a/chrome/chromeFiles/content/scholar/admin/itemTypeManager.xul b/chrome/chromeFiles/content/zotero/admin/itemTypeManager.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/admin/itemTypeManager.xul
rename to chrome/chromeFiles/content/zotero/admin/itemTypeManager.xul
diff --git a/chrome/chromeFiles/content/scholar/bibliography.js b/chrome/chromeFiles/content/zotero/bibliography.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/bibliography.js
rename to chrome/chromeFiles/content/zotero/bibliography.js
diff --git a/chrome/chromeFiles/content/scholar/bibliography.xul b/chrome/chromeFiles/content/zotero/bibliography.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/bibliography.xul
rename to chrome/chromeFiles/content/zotero/bibliography.xul
diff --git a/chrome/chromeFiles/content/scholar/bindings/noteeditor.xml b/chrome/chromeFiles/content/zotero/bindings/noteeditor.xml
similarity index 100%
rename from chrome/chromeFiles/content/scholar/bindings/noteeditor.xml
rename to chrome/chromeFiles/content/zotero/bindings/noteeditor.xml
diff --git a/chrome/chromeFiles/content/scholar/bindings/relatedbox.xml b/chrome/chromeFiles/content/zotero/bindings/relatedbox.xml
similarity index 100%
rename from chrome/chromeFiles/content/scholar/bindings/relatedbox.xml
rename to chrome/chromeFiles/content/zotero/bindings/relatedbox.xml
diff --git a/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml b/chrome/chromeFiles/content/zotero/bindings/scholarsearch.xml
similarity index 100%
rename from chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml
rename to chrome/chromeFiles/content/zotero/bindings/scholarsearch.xml
diff --git a/chrome/chromeFiles/content/scholar/bindings/searchtextbox.xml b/chrome/chromeFiles/content/zotero/bindings/searchtextbox.xml
similarity index 100%
rename from chrome/chromeFiles/content/scholar/bindings/searchtextbox.xml
rename to chrome/chromeFiles/content/zotero/bindings/searchtextbox.xml
diff --git a/chrome/chromeFiles/content/scholar/bindings/tagsbox.xml b/chrome/chromeFiles/content/zotero/bindings/tagsbox.xml
similarity index 100%
rename from chrome/chromeFiles/content/scholar/bindings/tagsbox.xml
rename to chrome/chromeFiles/content/zotero/bindings/tagsbox.xml
diff --git a/chrome/chromeFiles/content/scholar/bindings/timedtextarea.xml b/chrome/chromeFiles/content/zotero/bindings/timedtextarea.xml
similarity index 100%
rename from chrome/chromeFiles/content/scholar/bindings/timedtextarea.xml
rename to chrome/chromeFiles/content/zotero/bindings/timedtextarea.xml
diff --git a/chrome/chromeFiles/content/scholar/exportOptions.js b/chrome/chromeFiles/content/zotero/exportOptions.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/exportOptions.js
rename to chrome/chromeFiles/content/zotero/exportOptions.js
diff --git a/chrome/chromeFiles/content/scholar/exportOptions.xul b/chrome/chromeFiles/content/zotero/exportOptions.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/exportOptions.xul
rename to chrome/chromeFiles/content/zotero/exportOptions.xul
diff --git a/chrome/chromeFiles/content/scholar/fileInterface.js b/chrome/chromeFiles/content/zotero/fileInterface.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/fileInterface.js
rename to chrome/chromeFiles/content/zotero/fileInterface.js
diff --git a/chrome/chromeFiles/content/scholar/fileProgress.xul b/chrome/chromeFiles/content/zotero/fileProgress.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/fileProgress.xul
rename to chrome/chromeFiles/content/zotero/fileProgress.xul
diff --git a/chrome/chromeFiles/content/scholar/include.js b/chrome/chromeFiles/content/zotero/include.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/include.js
rename to chrome/chromeFiles/content/zotero/include.js
diff --git a/chrome/chromeFiles/content/scholar/ingester/browser.js b/chrome/chromeFiles/content/zotero/ingester/browser.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/ingester/browser.js
rename to chrome/chromeFiles/content/zotero/ingester/browser.js
diff --git a/chrome/chromeFiles/content/scholar/ingester/browser.xul b/chrome/chromeFiles/content/zotero/ingester/browser.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/ingester/browser.xul
rename to chrome/chromeFiles/content/zotero/ingester/browser.xul
diff --git a/chrome/chromeFiles/content/scholar/ingester/progress.xul b/chrome/chromeFiles/content/zotero/ingester/progress.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/ingester/progress.xul
rename to chrome/chromeFiles/content/zotero/ingester/progress.xul
diff --git a/chrome/chromeFiles/content/scholar/ingester/selectitems.js b/chrome/chromeFiles/content/zotero/ingester/selectitems.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/ingester/selectitems.js
rename to chrome/chromeFiles/content/zotero/ingester/selectitems.js
diff --git a/chrome/chromeFiles/content/scholar/ingester/selectitems.xul b/chrome/chromeFiles/content/zotero/ingester/selectitems.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/ingester/selectitems.xul
rename to chrome/chromeFiles/content/zotero/ingester/selectitems.xul
diff --git a/chrome/chromeFiles/content/scholar/integrationDocPrefs.xul b/chrome/chromeFiles/content/zotero/integrationDocPrefs.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/integrationDocPrefs.xul
rename to chrome/chromeFiles/content/zotero/integrationDocPrefs.xul
diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/zotero/itemPane.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/itemPane.js
rename to chrome/chromeFiles/content/zotero/itemPane.js
diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/zotero/itemPane.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/itemPane.xul
rename to chrome/chromeFiles/content/zotero/itemPane.xul
diff --git a/chrome/chromeFiles/content/scholar/note.js b/chrome/chromeFiles/content/zotero/note.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/note.js
rename to chrome/chromeFiles/content/zotero/note.js
diff --git a/chrome/chromeFiles/content/scholar/note.xul b/chrome/chromeFiles/content/zotero/note.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/note.xul
rename to chrome/chromeFiles/content/zotero/note.xul
diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/zotero/overlay.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/overlay.js
rename to chrome/chromeFiles/content/zotero/overlay.js
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/zotero/overlay.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/overlay.xul
rename to chrome/chromeFiles/content/zotero/overlay.xul
diff --git a/chrome/chromeFiles/content/scholar/preferences.js b/chrome/chromeFiles/content/zotero/preferences.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/preferences.js
rename to chrome/chromeFiles/content/zotero/preferences.js
diff --git a/chrome/chromeFiles/content/scholar/preferences.xul b/chrome/chromeFiles/content/zotero/preferences.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/preferences.xul
rename to chrome/chromeFiles/content/zotero/preferences.xul
diff --git a/chrome/chromeFiles/content/scholar/progressWindow.xul b/chrome/chromeFiles/content/zotero/progressWindow.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/progressWindow.xul
rename to chrome/chromeFiles/content/zotero/progressWindow.xul
diff --git a/chrome/chromeFiles/content/scholar/searchDialog.js b/chrome/chromeFiles/content/zotero/searchDialog.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/searchDialog.js
rename to chrome/chromeFiles/content/zotero/searchDialog.js
diff --git a/chrome/chromeFiles/content/scholar/searchDialog.xul b/chrome/chromeFiles/content/zotero/searchDialog.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/searchDialog.xul
rename to chrome/chromeFiles/content/zotero/searchDialog.xul
diff --git a/chrome/chromeFiles/content/scholar/selectItemsDialog.js b/chrome/chromeFiles/content/zotero/selectItemsDialog.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/selectItemsDialog.js
rename to chrome/chromeFiles/content/zotero/selectItemsDialog.js
diff --git a/chrome/chromeFiles/content/scholar/selectItemsDialog.xul b/chrome/chromeFiles/content/zotero/selectItemsDialog.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/selectItemsDialog.xul
rename to chrome/chromeFiles/content/zotero/selectItemsDialog.xul
diff --git a/chrome/chromeFiles/content/scholar/test/test.js b/chrome/chromeFiles/content/zotero/test/test.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/test/test.js
rename to chrome/chromeFiles/content/zotero/test/test.js
diff --git a/chrome/chromeFiles/content/scholar/test/test.xul b/chrome/chromeFiles/content/zotero/test/test.xul
similarity index 100%
rename from chrome/chromeFiles/content/scholar/test/test.xul
rename to chrome/chromeFiles/content/zotero/test/test.xul
diff --git a/chrome/chromeFiles/content/scholar/xpcom/attachments.js b/chrome/chromeFiles/content/zotero/xpcom/attachments.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/attachments.js
rename to chrome/chromeFiles/content/zotero/xpcom/attachments.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/cite.js b/chrome/chromeFiles/content/zotero/xpcom/cite.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/cite.js
rename to chrome/chromeFiles/content/zotero/xpcom/cite.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/collectionTreeView.js b/chrome/chromeFiles/content/zotero/xpcom/collectionTreeView.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/collectionTreeView.js
rename to chrome/chromeFiles/content/zotero/xpcom/collectionTreeView.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/data_access.js b/chrome/chromeFiles/content/zotero/xpcom/data_access.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/data_access.js
rename to chrome/chromeFiles/content/zotero/xpcom/data_access.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/db.js b/chrome/chromeFiles/content/zotero/xpcom/db.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/db.js
rename to chrome/chromeFiles/content/zotero/xpcom/db.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/file.js b/chrome/chromeFiles/content/zotero/xpcom/file.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/file.js
rename to chrome/chromeFiles/content/zotero/xpcom/file.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/fulltext.js b/chrome/chromeFiles/content/zotero/xpcom/fulltext.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/fulltext.js
rename to chrome/chromeFiles/content/zotero/xpcom/fulltext.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/history.js b/chrome/chromeFiles/content/zotero/xpcom/history.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/history.js
rename to chrome/chromeFiles/content/zotero/xpcom/history.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/ingester.js b/chrome/chromeFiles/content/zotero/xpcom/ingester.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/ingester.js
rename to chrome/chromeFiles/content/zotero/xpcom/ingester.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/integration.js b/chrome/chromeFiles/content/zotero/xpcom/integration.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/integration.js
rename to chrome/chromeFiles/content/zotero/xpcom/integration.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js b/chrome/chromeFiles/content/zotero/xpcom/itemTreeView.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js
rename to chrome/chromeFiles/content/zotero/xpcom/itemTreeView.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/mime.js b/chrome/chromeFiles/content/zotero/xpcom/mime.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/mime.js
rename to chrome/chromeFiles/content/zotero/xpcom/mime.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/notifier.js b/chrome/chromeFiles/content/zotero/xpcom/notifier.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/notifier.js
rename to chrome/chromeFiles/content/zotero/xpcom/notifier.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/progressWindow.js b/chrome/chromeFiles/content/zotero/xpcom/progressWindow.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/progressWindow.js
rename to chrome/chromeFiles/content/zotero/xpcom/progressWindow.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/schema.js b/chrome/chromeFiles/content/zotero/xpcom/schema.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/schema.js
rename to chrome/chromeFiles/content/zotero/xpcom/schema.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/scholar.js b/chrome/chromeFiles/content/zotero/xpcom/scholar.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/scholar.js
rename to chrome/chromeFiles/content/zotero/xpcom/scholar.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/search.js b/chrome/chromeFiles/content/zotero/xpcom/search.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/search.js
rename to chrome/chromeFiles/content/zotero/xpcom/search.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/translate.js b/chrome/chromeFiles/content/zotero/xpcom/translate.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/translate.js
rename to chrome/chromeFiles/content/zotero/xpcom/translate.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/utilities.js b/chrome/chromeFiles/content/zotero/xpcom/utilities.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/xpcom/utilities.js
rename to chrome/chromeFiles/content/zotero/xpcom/utilities.js