diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2b054c5
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/util/GPX.git"]
+	path = src/util/GPX.git
+	url = git://github.com/whpthomas/GPX.git
diff --git a/Makefile b/Makefile
index 92e513a..e459384 100644
--- a/Makefile
+++ b/Makefile
@@ -70,9 +70,12 @@ endef
 # directory if it does not already exist.  Likewise $(INSTALL_BIN) contains the 
 # command to copy the binary file from its current location (in our case the build
 # directory) to the install directory.
+
+AUTOWIFI_BASE_DIR := $(PKG_BUILD_DIR)/autowifi
+GPX_BASE_DIR := $(PKG_BUILD_DIR)/util/GPX.git
+
 define Package/wifibox/install
-	
-### create required directories
+### create required directories (autowifi)
 	
 #	$(INSTALL_DIR) $(1)/usr/share/lua/autowifi
 	$(INSTALL_DIR) $(1)/usr/share/lua/autowifi/admin
@@ -82,32 +85,35 @@ define Package/wifibox/install
 	$(INSTALL_DIR) $(1)/etc/rc.d
 	$(INSTALL_DIR) $(1)/www/cgi-bin
 	
+### create all files in /usr/share/lua/autowifi (autowifi)
 	
-### create all files in /usr/share/lua/autowifi
+	$(CP) $(AUTOWIFI_BASE_DIR)/*.lua $(1)/usr/share/lua/autowifi/
+	$(CP) $(AUTOWIFI_BASE_DIR)/admin/* $(1)/usr/share/lua/autowifi/admin/
 	
-	$(CP) $(PKG_BUILD_DIR)/*.lua $(1)/usr/share/lua/autowifi/
-	$(CP) $(PKG_BUILD_DIR)/admin/* $(1)/usr/share/lua/autowifi/admin/
+	$(CP) $(AUTOWIFI_BASE_DIR)/ext/autowifi.js $(1)/usr/share/lua/autowifi/ext
+	$(CP) $(AUTOWIFI_BASE_DIR)/ext/autowifi_init $(1)/usr/share/lua/autowifi/ext
+	$(CP) $(AUTOWIFI_BASE_DIR)/ext/wfcf $(1)/usr/share/lua/autowifi/ext
 	
-	$(CP) $(PKG_BUILD_DIR)/ext/autowifi.js $(1)/usr/share/lua/autowifi/ext
-	$(CP) $(PKG_BUILD_DIR)/ext/autowifi_init $(1)/usr/share/lua/autowifi/ext
-	$(CP) $(PKG_BUILD_DIR)/ext/wfcf $(1)/usr/share/lua/autowifi/ext
-	
-	$(CP) $(PKG_BUILD_DIR)/ext/www/.autowifi-inplace $(1)/usr/share/lua/autowifi/ext/www
-	$(CP) $(PKG_BUILD_DIR)/ext/www/index.html $(1)/usr/share/lua/autowifi/ext/www
+	$(CP) $(AUTOWIFI_BASE_DIR)/ext/www/.autowifi-inplace $(1)/usr/share/lua/autowifi/ext/www
+	$(CP) $(AUTOWIFI_BASE_DIR)/ext/www/index.html $(1)/usr/share/lua/autowifi/ext/www
 	$(LN) -s /usr/share/lua/autowifi/admin $(1)/usr/share/lua/autowifi/ext/www
 	$(LN) -s /usr/share/lua/autowifi/ext/wfcf $(1)/usr/share/lua/autowifi/ext/www/cgi-bin
 	
 ifeq ($(CONFIG_WIFIBOX_DEVEL_PACKAGE),y)
 	$(INSTALL_DIR) $(1)/usr/share/lua/autowifi/misc
-	$(CP) $(PKG_BUILD_DIR)/misc/collect-code.sh $(1)/usr/share/lua/autowifi/misc/
+	$(CP) $(AUTOWIFI_BASE_DIR)/misc/collect-code.sh $(1)/usr/share/lua/autowifi/misc/
 endif
 	
 	
-### create links elsewhere in the system
+### create links elsewhere in the system (autowifi)
 	
 	$(LN) -s /usr/share/lua/autowifi/ext/wfcf $(1)/www/cgi-bin
 	$(LN) -s /usr/share/lua/autowifi/admin $(1)/www
 	$(LN) -s /usr/share/lua/autowifi/ext/autowifi_init $(1)/etc/rc.d/S18autowifi_init
+	
+### install gpx utility
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(GPX_BASE_DIR)/gpx $(1)/usr/bin
 endef
 
 define Package/wifibox/postinst
diff --git a/src/TODO b/TODO
similarity index 92%
rename from src/TODO
rename to TODO
index 327b931..5c20727 100644
--- a/src/TODO
+++ b/TODO
@@ -8,6 +8,9 @@
 - write a shellscript to automate tasks like swapping out /www and packaging modified code for git merging
 - add dependency on either wr703n or mr3020 (and probably comment it out to avoid being to conservative...)
 - see if updating works when a new version is 'released' (probably needs a real feed)
+- add aliases to root profile only when debugging was requested in menuconfig
+- symlinks created in the install section of the Makefile should perhaps be created in the postinstall script,
+  this way the package is truly relocatable
 - add config option to compile sources using luac?
 - add/link general OpenWrt build instructions for OSX to installation page on wiki.
 - remove usr/share/lua/autowifi and subdirectories (if empty) in postrm
diff --git a/post-install.sh b/post-install.sh
index 8fbd14a..2fee890 100755
--- a/post-install.sh
+++ b/post-install.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+### This function makes sure the 'wlan' net is in the 'lan' zone
 addFirewallNet() {
 	cfgChanged=0; zoneNum=-1; i=0
 	
@@ -32,6 +33,7 @@ addFirewallNet() {
 }
 
 
+### Replace the banner with a custom one
 if [ ! -f /etc/banner.default ]; then
 	mv /etc/banner /etc/banner.default
 	cat <<-'EOM' > /etc/banner
@@ -46,6 +48,7 @@ if [ ! -f /etc/banner.default ]; then
 EOM
 fi
 
+### Add some convenience functionality to root's profile
 grep '^# DO NOT MODIFY.*wifibox package.$' /root/.profile >/dev/null 2>&1
 if [ $? -eq 1 ]; then
 		cat <<-EOM >> /root/.profile
@@ -56,6 +59,8 @@ if [ $? -eq 1 ]; then
 EOM
 fi
 
+### Finally make sure basic configuration is set correctly
+
 echo "Enabling wifi device..."
 uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi
 
diff --git a/src/Makefile b/src/Makefile
index fbf9f60..fdf09fd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,9 @@
+GPX_PATH := util/GPX.git
+
+.PHONY: $(GPX_PATH)
+
 all:
-	@echo "No compilation here...(dummy Makefile to keep buildroot happy)"
+	$(MAKE) -C $(GPX_PATH)
 
 clean:
-	@echo "No cleaning here... (dummy Makefile to keep buildroot happy)"
+	$(MAKE) -C $(GPX_PATH) clean
diff --git a/src/README b/src/autowifi/README
similarity index 100%
rename from src/README
rename to src/autowifi/README
diff --git a/src/admin/autowifi.css b/src/autowifi/admin/autowifi.css
similarity index 100%
rename from src/admin/autowifi.css
rename to src/autowifi/admin/autowifi.css
diff --git a/src/admin/autowifi.html b/src/autowifi/admin/autowifi.html
similarity index 100%
rename from src/admin/autowifi.html
rename to src/autowifi/admin/autowifi.html
diff --git a/src/admin/autowifi.js b/src/autowifi/admin/autowifi.js
similarity index 100%
rename from src/admin/autowifi.js
rename to src/autowifi/admin/autowifi.js
diff --git a/src/admin/index.html b/src/autowifi/admin/index.html
similarity index 100%
rename from src/admin/index.html
rename to src/autowifi/admin/index.html
diff --git a/src/admin/jquery-1.9.1.min.js b/src/autowifi/admin/jquery-1.9.1.min.js
similarity index 100%
rename from src/admin/jquery-1.9.1.min.js
rename to src/autowifi/admin/jquery-1.9.1.min.js
diff --git a/src/autowifi.lua b/src/autowifi/autowifi.lua
similarity index 100%
rename from src/autowifi.lua
rename to src/autowifi/autowifi.lua
diff --git a/src/ext/autowifi.js b/src/autowifi/ext/autowifi.js
similarity index 100%
rename from src/ext/autowifi.js
rename to src/autowifi/ext/autowifi.js
diff --git a/src/ext/autowifi_init b/src/autowifi/ext/autowifi_init
similarity index 100%
rename from src/ext/autowifi_init
rename to src/autowifi/ext/autowifi_init
diff --git a/src/ext/wfcf b/src/autowifi/ext/wfcf
similarity index 100%
rename from src/ext/wfcf
rename to src/autowifi/ext/wfcf
diff --git a/src/ext/www/.autowifi-inplace b/src/autowifi/ext/www/.autowifi-inplace
similarity index 100%
rename from src/ext/www/.autowifi-inplace
rename to src/autowifi/ext/www/.autowifi-inplace
diff --git a/src/ext/www/admin b/src/autowifi/ext/www/admin
similarity index 100%
rename from src/ext/www/admin
rename to src/autowifi/ext/www/admin
diff --git a/src/ext/www/cgi-bin/wfcf b/src/autowifi/ext/www/cgi-bin/wfcf
similarity index 100%
rename from src/ext/www/cgi-bin/wfcf
rename to src/autowifi/ext/www/cgi-bin/wfcf
diff --git a/src/ext/www/index.html b/src/autowifi/ext/www/index.html
similarity index 100%
rename from src/ext/www/index.html
rename to src/autowifi/ext/www/index.html
diff --git a/src/misc/collect-code.sh b/src/autowifi/misc/collect-code.sh
similarity index 100%
rename from src/misc/collect-code.sh
rename to src/autowifi/misc/collect-code.sh
diff --git a/src/reconf.lua b/src/autowifi/reconf.lua
similarity index 100%
rename from src/reconf.lua
rename to src/autowifi/reconf.lua
diff --git a/src/urlcode.lua b/src/autowifi/urlcode.lua
similarity index 100%
rename from src/urlcode.lua
rename to src/autowifi/urlcode.lua
diff --git a/src/util.lua b/src/autowifi/util.lua
similarity index 100%
rename from src/util.lua
rename to src/autowifi/util.lua
diff --git a/src/wifihelper.lua b/src/autowifi/wifihelper.lua
similarity index 100%
rename from src/wifihelper.lua
rename to src/autowifi/wifihelper.lua
diff --git a/src/util/GPX.git b/src/util/GPX.git
new file mode 160000
index 0000000..bbca583
--- /dev/null
+++ b/src/util/GPX.git
@@ -0,0 +1 @@
+Subproject commit bbca5831055e25fc312e5ff8b31f32771925bb9f