diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 6332ece4a4..69a2e630b4 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -115,7 +115,7 @@
 								<menuseparator id="zotero-tb-actions-utilities-separator" hidden="true"/>
 								<menuseparator id="zotero-tb-actions-separator"/>
 								<menuitem id="zotero-tb-actions-prefs" label="&zotero.toolbar.preferences.label;"
-									oncommand="window.openDialog('chrome://zotero/content/preferences.xul', 'zotero-prefs', 'chrome,titlebar,toolbar,' + Zotero.Prefs.get('browser.preferences.instantApply', true) ? 'dialog=no' : 'modal')"/>
+									oncommand="window.openDialog('chrome://zotero/content/preferences/preferences.xul', 'zotero-prefs', 'chrome,titlebar,toolbar,' + Zotero.Prefs.get('browser.preferences.instantApply', true) ? 'dialog=no' : 'modal')"/>
 								<menuitem id="zotero-tb-actions-documentation" label="&zotero.toolbar.documentation.label;" oncommand="window.open('http://www.zotero.org/documentation/', '', 'menubar=yes,location=yes,toolbar=yes,personalbar=yes,resizable=yes,scrollbars=yes,status=yes');"/>
 								<menuitem id="zotero-tb-actions-about" label="&zotero.toolbar.about.label;" oncommand="window.openDialog('chrome://zotero/content/about.xul', 'about', 'chrome')"/>
 							</menupopup>
diff --git a/chrome/content/zotero/preferences.js b/chrome/content/zotero/preferences/preferences.js
similarity index 98%
rename from chrome/content/zotero/preferences.js
rename to chrome/content/zotero/preferences/preferences.js
index ab00796622..7eb87fb4a6 100644
--- a/chrome/content/zotero/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -216,7 +216,7 @@ function showQuickCopySiteEditor(index) {
 	var format = Zotero.QuickCopy.getSettingFromFormattedName(format);
 	
 	var io = {domain: domain, format: format, ok: false};
-	window.openDialog('chrome://zotero/content/quickCopySiteEditor.xul', "zotero-preferences-quickCopySiteEditor", "chrome, modal", io);
+	window.openDialog('chrome://zotero/content/preferences/quickCopySiteEditor.xul', "zotero-preferences-quickCopySiteEditor", "chrome, modal", io);
 	
 	if (!io.ok) {
 		return;
diff --git a/chrome/content/zotero/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
similarity index 99%
rename from chrome/content/zotero/preferences.xul
rename to chrome/content/zotero/preferences/preferences.xul
index c2d257631e..5405e73d70 100644
--- a/chrome/content/zotero/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -289,6 +289,6 @@ To add a new preference:
 	
 	<!-- These mess up the prefwindow if they come before the prefpanes
 	     https://bugzilla.mozilla.org/show_bug.cgi?id=296418 -->
-	<script src="include.js"/>
+	<script src="chrome://zotero/content/include.js"/>
 	<script src="preferences.js"/>
 </prefwindow>
\ No newline at end of file
diff --git a/chrome/content/zotero/quickCopySiteEditor.xul b/chrome/content/zotero/preferences/quickCopySiteEditor.xul
similarity index 100%
rename from chrome/content/zotero/quickCopySiteEditor.xul
rename to chrome/content/zotero/preferences/quickCopySiteEditor.xul
diff --git a/install.rdf b/install.rdf
index 355d2a2dbf..38e7847c4d 100644
--- a/install.rdf
+++ b/install.rdf
@@ -16,7 +16,7 @@
     <em:developer>David Norton</em:developer>
     <em:developer>Dan Stillman</em:developer>
     <em:homepageURL>http://www.zotero.org</em:homepageURL>
-    <em:optionsURL>chrome://zotero/content/preferences.xul</em:optionsURL>
+    <em:optionsURL>chrome://zotero/content/preferences/preferences.xul</em:optionsURL>
     <em:aboutURL>chrome://zotero/content/about.xul</em:aboutURL>
     <em:iconURL>chrome://zotero/skin/zotero_z_32px.png</em:iconURL>
     <em:updateURL>http://www.zotero.org/download/update-svn.rdf</em:updateURL>