diff --git a/.gitignore b/.gitignore
index 0d35466..7f2d61b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Resources/*
+Contents/Resources/IPMIView
diff --git a/Contents/Info.plist b/Contents/Info.plist
new file mode 100644
index 0000000..fb2119c
--- /dev/null
+++ b/Contents/Info.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleIconFile</key>
+	<string>ipmiview.icns</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/Contents/MacOS/IPMIView b/Contents/MacOS/IPMIView
index f1ee978..a537d4d 100755
--- a/Contents/MacOS/IPMIView
+++ b/Contents/MacOS/IPMIView
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd ${DIR}/../../Resources/IPMIView
+cd ${DIR}/../Resources/IPMIView
 java -jar IPMIView20.jar
diff --git a/Contents/Resources/ipmiview.icns b/Contents/Resources/ipmiview.icns
new file mode 100644
index 0000000..309846a
Binary files /dev/null and b/Contents/Resources/ipmiview.icns differ
diff --git a/README.md b/README.md
index caf98b0..beb9bd6 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 ### IPMIView (java) App wrapper for MacOS**
- 
+
 Download the latest IPMIView software from SuperMicro (to your home directories "Downloads" folder, aka `~/Downloads`:
 
 [https://ftp.supermicro.com/wftp/utility/IPMIView/Linux/](https://ftp.supermicro.com/wftp/utility/IPMIView/Linux/)
 
 Download the code and execute the script to unarchive the linux package and create the Application Bundle:
-```
+```bash
 cd ~
 git clone https://github.com/TheCase/IPMIView.app
 cd IPMIView.app
@@ -14,7 +14,7 @@ sh script.sh
 
 You should now have an application icon in your home directory's Applications (aka `~/Applications`) folder.
 
-#### Using the KVM Console 
+#### Using the KVM Console
 
 You need to add an `Input Monitoring` exception for `java` in the `Security & Privacy` -\> `Privacy` Tab in `System Preferences`:
 
@@ -25,7 +25,7 @@ You need to add an `Input Monitoring` exception for `java` in the `Security & Pr
 (you may need to click the lock in the lower left and enter your password to add a new item)
 - Click the plus `+` symbol
 - In the top of the new window, select MacintoshHD in the pulldown
-Library -> Java -> JavaVirtualMachines -> jdk\<version\>.jdk -> bin -> Contents -> Home -> bin 
+Library -> Java -> JavaVirtualMachines -> jdk\<version\>.jdk -> bin -> Contents -> Home -> bin
 - Double click on `java`
 - Make sure the box next to `java` is now checked and close the window
 
@@ -33,7 +33,7 @@ When you attempt to launch the console, you may be presented with a message that
 
 - Open `System Preferences` -> `Security & Privacy` -> `General` Tab and click `Allow Anyway` next to the message about the jnlilib that was blocked.
 - At this point you can try the `Launch KVM Console` button. You should be presented with another dialog about developer verification. Click the `Open` button.
-- This will trigger another denial window for the sharedLibs jnlilib. Repeat the approval process for this next jnlilib in the `Security Preference` Pane.  
+- This will trigger another denial window for the sharedLibs jnlilib. Repeat the approval process for this next jnlilib in the `Security Preference` Pane.
 - After performing these two approvals, the console should open.
 
 
@@ -41,8 +41,8 @@ When you attempt to launch the console, you may be presented with a message that
 
 If you have Java issues loading the app, please verify that you can run the app from the command line (and outside the jursdiction of this supplied wrapper).
 
-```
-cd ~/Applications/IPMIView.app/Resources/IPMIView/
+```bash
+cd ~/Applications/IPMIView.app/Contents/Resources/IPMIView/
 java -jar IPMIView20.jar
 ```
 
diff --git a/script.sh b/script.sh
index 5d6d0ad..4781c2f 100644
--- a/script.sh
+++ b/script.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 set -
-mkdir -p Resources/IPMIView/Contents/Home/bin
-tar -zxvf ~/Downloads/IPMIView*.tar.gz --strip=1 -C ./Resources/IPMIView/.
-cd Resources/IPMIView/Contents/Home/bin
-ln -s /usr/bin/java
-cd ../../../../../..
-rsync -arv --exclude=.git --exclude=Resources/IPMIView/jre IPMIView.app ~/Applications 
+mkdir -p Contents/Resources/IPMIView/Contents/Home/bin
+tar -zxvf ~/Downloads/IPMIView*.tar.gz --strip=1 -C ./Contents/Resources/IPMIView/.
+ln -s /usr/bin/java Contents/Resources/IPMIView/Contents/Home/bin/java
+cd ..
+rsync -arv --exclude=.git --exclude=Contents/Resources/IPMIView/jre IPMIView.app ~/Applications