diff --git a/convert b/convert
index f034355..7d82d8e 100755
--- a/convert
+++ b/convert
@@ -26,8 +26,8 @@ CMD=`basename $0`
     return 1
 }
 
-source ${DIR}/zuper
-source ${DIR}/zuper.init
+source ${DIR}/zuper/zuper
+source ${DIR}/zuper/zuper.init
 
 DEBUG=1
 
diff --git a/init b/init
index 7a25eb3..50697d0 100755
--- a/init
+++ b/init
@@ -22,9 +22,9 @@ QUIET=0
 DEBUG=0
 
 SYS=`dirname $0`
-source $SYS/zuper
+source $SYS/zuper/zuper
 
-source $SYS/zuper.init
+source $SYS/zuper/zuper.init
 
 act "Initializing Webnomad"
 
diff --git a/lock b/lock
index abed931..70e4fd9 100755
--- a/lock
+++ b/lock
@@ -21,9 +21,9 @@
 # full path to webnomad's system
 R="`pwd`"
 SYS="$R/webnomad"
-source $SYS/zuper
+source $SYS/zuper/zuper
 
-source $SYS/zuper.init
+source $SYS/zuper/zuper.init
 
 source $R/config.zsh
 
diff --git a/preview b/preview
index 3b6d2ed..1942b80 100755
--- a/preview
+++ b/preview
@@ -21,10 +21,10 @@
 # full path to webnomad's system
 R="`pwd`"
 SYS="$R/webnomad"
-source $SYS/zuper
+source $SYS/zuper/zuper
 vars=(BROWSER TIME_FORMAT OUTPUT_FORMAT SYS)
 vars=(views BROWSER_WINDOW_ID)
-source $SYS/zuper.init
+source $SYS/zuper/zuper.init
 
 source $R/config.zsh
 
diff --git a/theme b/theme
index f2d823a..10dfbe2 100755
--- a/theme
+++ b/theme
@@ -31,13 +31,13 @@ CMD="`basename $0`"
 QUIET=0
 DEBUG=0
 
-source ${DIR}/zuper
+source ${DIR}/zuper/zuper
 
 { test -r config.zsh } || {
     error "Directory not configured for WebNomad. First use ./webnomad/init"
     return 1 }
 
-source ${DIR}/zuper.init
+source ${DIR}/zuper/zuper.init
 
 source config.zsh