diff --git a/BUILD_PACKAGE.command b/BUILD_PACKAGE.command
index 76ba0c7a..40744d56 100755
--- a/BUILD_PACKAGE.command
+++ b/BUILD_PACKAGE.command
@@ -9,12 +9,12 @@ cd "`dirname "$0"`"
 rm -rf Inky-darwin-x64/
 
 # Create icon from PNG
-./makeIcns.command
+./resources/makeIcns.command
 
-electron-packager . Inky --platform=darwin --icon=Icon.icns --arch=x64 --extend-info=info.plist --ignore='.command$|inky\.sublime|.md$|Icon1024.png|Info.plist|Inky-darwin-x64|.zip$' --prune
+electron-packager app Inky --platform=darwin --icon=resources/Icon.icns --arch=x64 --extend-info=resources/info.plist --prune
 
 # Remove .icns again
-rm Icon.icns
+rm resources/Icon.icns
 
 # Create a zip file ready for upload
 zip -r Inky-darwin-x64/Inky.app.zip Inky-darwin-x64/Inky.app
\ No newline at end of file
diff --git a/INSTALL_AND_RUN.command b/INSTALL_AND_RUN.command
index 9584839c..a3e16fd3 100755
--- a/INSTALL_AND_RUN.command
+++ b/INSTALL_AND_RUN.command
@@ -1,2 +1,3 @@
 cd "`dirname "$0"`"
+cd app
 npm install && npm start
\ No newline at end of file
diff --git a/package.json b/app/package.json
similarity index 87%
rename from package.json
rename to app/package.json
index 1634dd7f..ac3937c3 100644
--- a/package.json
+++ b/app/package.json
@@ -3,9 +3,9 @@
   "productName": "Inky",
   "version": "1.0.0",
   "description": "An editor for ink",
-  "main": "app/main-process/main.js",
+  "main": "main-process/main.js",
   "scripts": {
-    "start": "electron app/main-process/main.js"
+    "start": "electron main-process/main.js"
   },
   "repository": {
     "type": "git",
diff --git a/Icon1024.png b/resources/Icon1024.png
similarity index 100%
rename from Icon1024.png
rename to resources/Icon1024.png
diff --git a/Info.plist b/resources/Info.plist
similarity index 100%
rename from Info.plist
rename to resources/Info.plist
diff --git a/makeIcns.command b/resources/makeIcns.command
similarity index 97%
rename from makeIcns.command
rename to resources/makeIcns.command
index a28a59ff..17ebb091 100755
--- a/makeIcns.command
+++ b/resources/makeIcns.command
@@ -1,3 +1,5 @@
+cd "`dirname "$0"`"
+
 # http://stackoverflow.com/questions/12306223/how-to-manually-create-icns-files-using-iconutil
 mkdir Icon.iconset
 sips -z 16 16     Icon1024.png --out Icon.iconset/icon_16x16.png