diff --git a/build.sh b/build.sh
index 7a23b1e..784f4b7 100755
--- a/build.sh
+++ b/build.sh
@@ -7,4 +7,5 @@ fi
 
 
 rm -f zotero-ocr-${version}.xpi
-zip -r zotero-ocr-${version}.xpi chrome/* defaults/* chrome.manifest install.rdf
+cd src
+zip -9r ../zotero-ocr-${version}.xpi *
diff --git a/release.sh b/release.sh
index 8e5e7e4..b3e2c78 100755
--- a/release.sh
+++ b/release.sh
@@ -7,9 +7,9 @@ read -p "Enter new version number: " version
 ## Update install.rdf
 ##############
 
-perl -pi -e "s/em:version=\"[^\"]*/em:version=\"$version/;" "install.rdf"
+perl -pi -e "s/em:version=\"[^\"]*/em:version=\"$version/;" src/install.rdf
 rm "install.rdf.bak"
-git add "install.rdf"
+git add src/install.rdf
 
 
 ##############
diff --git a/chrome.manifest b/src/chrome.manifest
similarity index 100%
rename from chrome.manifest
rename to src/chrome.manifest
diff --git a/chrome/content/overlay.xul b/src/chrome/content/overlay.xul
similarity index 100%
rename from chrome/content/overlay.xul
rename to src/chrome/content/overlay.xul
diff --git a/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
similarity index 100%
rename from chrome/content/preferences.xul
rename to src/chrome/content/preferences.xul
diff --git a/chrome/content/zoteroocr.js b/src/chrome/content/zoteroocr.js
similarity index 100%
rename from chrome/content/zoteroocr.js
rename to src/chrome/content/zoteroocr.js
diff --git a/chrome/locale/en-US/zoteroocr.dtd b/src/chrome/locale/en-US/zoteroocr.dtd
similarity index 100%
rename from chrome/locale/en-US/zoteroocr.dtd
rename to src/chrome/locale/en-US/zoteroocr.dtd
diff --git a/chrome/locale/en-US/zoteroocr.properties b/src/chrome/locale/en-US/zoteroocr.properties
similarity index 100%
rename from chrome/locale/en-US/zoteroocr.properties
rename to src/chrome/locale/en-US/zoteroocr.properties
diff --git a/chrome/skin/default/zoteroocr/ubmannheim.png b/src/chrome/skin/default/zoteroocr/ubmannheim.png
similarity index 100%
rename from chrome/skin/default/zoteroocr/ubmannheim.png
rename to src/chrome/skin/default/zoteroocr/ubmannheim.png
diff --git a/chrome/skin/default/zoteroocr/ubmannheim32x32.png b/src/chrome/skin/default/zoteroocr/ubmannheim32x32.png
similarity index 100%
rename from chrome/skin/default/zoteroocr/ubmannheim32x32.png
rename to src/chrome/skin/default/zoteroocr/ubmannheim32x32.png
diff --git a/chrome/skin/default/zoteroocr/ubmannheim64x64.png b/src/chrome/skin/default/zoteroocr/ubmannheim64x64.png
similarity index 100%
rename from chrome/skin/default/zoteroocr/ubmannheim64x64.png
rename to src/chrome/skin/default/zoteroocr/ubmannheim64x64.png
diff --git a/defaults/preferences/defaults.js b/src/defaults/preferences/defaults.js
similarity index 100%
rename from defaults/preferences/defaults.js
rename to src/defaults/preferences/defaults.js
diff --git a/install.rdf b/src/install.rdf
similarity index 100%
rename from install.rdf
rename to src/install.rdf