diff --git a/trunk/Makefile b/trunk/Makefile
index 4cd5f27f..f2f049a0 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,12 +1,13 @@
 
 open:
-	geany *.py &
+	geany src/*.py &
 
 clean:
-	rm -rf *.pyc
+	rm -rf src/*.pyc
 
 install:
-	rsync *.py ~/bin/ocarina-bin/
+	rsync src/ ~/bin/ocarina-bin/
+#	rsync *.py ~/bin/ocarina-bin/
 	cp ocarina ~/bin/ocarina-bin/
 	rm ~/bin/ocarina
 	ln -s /home/bjschuma/bin/ocarina-bin/ocarina /home/bjschuma/bin/ocarina
diff --git a/trunk/ocarina b/trunk/ocarina
index e53e76ec..481ce949 100755
--- a/trunk/ocarina
+++ b/trunk/ocarina
@@ -1,3 +1,13 @@
-#!/bin/bash
-cd ~/bin/ocarina-bin
-/usr/bin/python ocarina.py $@
+#!/bin/sh
+
+######## CONFIGURATION OPTIONS ########
+#PROGRAM_DIR="/home/username/apps/exaile"      # insert full path to Exaile bin dir
+#######################################
+
+# get the app dir if not already defined
+if [ -z "$PROGRAM_DIR" ]; then
+    PROGRAM_DIR=`dirname "$0"`
+fi
+
+cd ${PROGRAM_DIR}
+exec python -O src/ocarina.py "$@"
diff --git a/trunk/duration.py b/trunk/src/duration.py
similarity index 100%
rename from trunk/duration.py
rename to trunk/src/duration.py
diff --git a/trunk/libdata.py b/trunk/src/libdata.py
similarity index 100%
rename from trunk/libdata.py
rename to trunk/src/libdata.py
diff --git a/trunk/library.py b/trunk/src/library.py
similarity index 100%
rename from trunk/library.py
rename to trunk/src/library.py
diff --git a/trunk/ocarina.py b/trunk/src/ocarina.py
similarity index 100%
rename from trunk/ocarina.py
rename to trunk/src/ocarina.py
diff --git a/trunk/operations.py b/trunk/src/operations.py
similarity index 100%
rename from trunk/operations.py
rename to trunk/src/operations.py
diff --git a/trunk/playlist.py b/trunk/src/playlist.py
similarity index 100%
rename from trunk/playlist.py
rename to trunk/src/playlist.py
diff --git a/trunk/song.py b/trunk/src/song.py
similarity index 100%
rename from trunk/song.py
rename to trunk/src/song.py
diff --git a/trunk/songInfo.py b/trunk/src/songInfo.py
similarity index 100%
rename from trunk/songInfo.py
rename to trunk/src/songInfo.py
diff --git a/trunk/window.py b/trunk/src/window.py
similarity index 100%
rename from trunk/window.py
rename to trunk/src/window.py