diff --git a/pages/attic/_dummy b/attic/_dummy
similarity index 100%
rename from pages/attic/_dummy
rename to attic/_dummy
diff --git a/pages/cache/_dummy b/cache/_dummy
similarity index 100%
rename from pages/cache/_dummy
rename to cache/_dummy
diff --git a/conf/dokuwiki/conf/local.protected.php b/conf/dokuwiki/conf/local.protected.php
index cd09e44c56..9e2041f65d 100644
--- a/conf/dokuwiki/conf/local.protected.php
+++ b/conf/dokuwiki/conf/local.protected.php
@@ -7,7 +7,7 @@
 $conf['start'] = 'homepage';
 $conf['template'] = 'mcneel-public';
 $conf['license'] = '';
-$conf['savedir'] = '/opt/bitnami/apps/dokuwiki/wikidata';
+$conf['savedir'] = './wikidata';
 $conf['breadcrumbs'] = 0;
 $conf['dformat'] = '%Y/%m/%d';
 $conf['maxtoclevel'] = '0';
diff --git a/doku_setup.sh b/doku_setup.sh
index 755119fc80..2cabdf1849 100644
--- a/doku_setup.sh
+++ b/doku_setup.sh
@@ -8,32 +8,32 @@
 
 
 #update apt-get
-apt-get update
-apt-get install lighttpd -y
-apt-get install php5-cgi -y
-apt-get install git -y
+sudo apt-get update
+sudo apt-get install lighttpd -y
+sudo apt-get install php5-cgi -y
+sudo apt-get install git -y
 
 #download latest dokuwiki tarball
 wget http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz
 #unzip tarball
 tar xvfv dokuwiki-stable.tgz
 #move/rename contents to /var/www/dokuwiki
-mv dokuwiki-2014-09-29d/ /var/www/dokuwiki/
+sudo mv dokuwiki-2014-09-29d/ /var/www/dokuwiki/
 
 #change owner to www-data
-chown -R www-data:www-data /var/www/dokuwiki/
+sudo chown -R www-data:www-data /var/www/dokuwiki/
 
 #configure lightttpd for php
-lighttpd-enable-mod fastcgi-php
+sudo lighttpd-enable-mod fastcgi-php
 
-git clone https://github.com/mcneel/wikidata.git /var/dokuwiki/wikidata
-chown -R www-data:www-data /var/www/dokuwiki/wikidata
+sudo git clone https://github.com/mcneel/wikidata.git /var/www/dokuwiki/wikidata
+sudo chown -R www-data:www-data /var/www/dokuwiki/wikidata
 
 # copy configuration files to appropriate locations
-cp /var/www/dokuwiki/wikidata/conf/lighttpd/lighttpd.conf /etc/lighttpd.conf
+sudo cp /var/www/dokuwiki/wikidata/conf/lighttpd/lighttpd.conf /etc/lighttpd.conf
 
-cp /var/www/dokuwiki/wikidata/conf/dokuwiki/conf/* /var/www/dokuwiki/conf/
-cp /var/www/dokuwiki/wikidata/conf/dokuwiki/lib/plugins/* /var/www/dokuwiki/lib/plugins/
-cp /var/www/dokuwiki/wikidata/conf/dokuwiki/lib/tpl/* /var/www/dokuwiki/lib/tpl/
+sudo cp /var/www/dokuwiki/wikidata/conf/dokuwiki/conf/* /var/www/dokuwiki/conf/
+sudo cp -R /var/www/dokuwiki/wikidata/conf/dokuwiki/lib/plugins/* /var/www/dokuwiki/lib/plugins/
+sudo cp -R /var/www/dokuwiki/wikidata/conf/dokuwiki/lib/tpl/* /var/www/dokuwiki/lib/tpl/
 #restart lightttpd
-/etc/init.d/lighttpd force-reload
+sudo /etc/init.d/lighttpd force-reload
diff --git a/pages/index/_dummy b/index/_dummy
similarity index 100%
rename from pages/index/_dummy
rename to index/_dummy
diff --git a/pages/locks/_dummy b/locks/_dummy
similarity index 100%
rename from pages/locks/_dummy
rename to locks/_dummy
diff --git a/pages/media_attic/_dummy b/media_attic/_dummy
similarity index 100%
rename from pages/media_attic/_dummy
rename to media_attic/_dummy
diff --git a/pages/media_meta/_dummy b/media_meta/_dummy
similarity index 100%
rename from pages/media_meta/_dummy
rename to media_meta/_dummy
diff --git a/pages/meta/_dummy b/meta/_dummy
similarity index 100%
rename from pages/meta/_dummy
rename to meta/_dummy