diff --git a/2bld.sh b/2bld.sh
index fe10510b3..8cb5ce93f 100755
--- a/2bld.sh
+++ b/2bld.sh
@@ -8,14 +8,14 @@ mkdir -p tmp/tw2
 
 # cook TiddlyWiki5
 
-pushd tw2 > /dev/null
+pushd editions/tw2 > /dev/null
 
-node ../core/boot.js \
+node ../../core/boot.js \
 	--verbose \
 	--load source/tiddlywiki.com/index.html.recipe \
-	--savetiddler $:/core/templates/tiddlywiki2.template.html ../tmp/tw2/index.html text/plain \
+	--savetiddler $:/core/templates/tiddlywiki2.template.html ../../tmp/tw2/index.html text/plain \
 	|| exit 1
 
 popd > /dev/null
 
-opendiff tmp/tw2/index.html tw2/target/index.2.6.5.html
+opendiff tmp/tw2/index.html editions/tw2/target/index.2.6.5.html
diff --git a/bld.sh b/bld.sh
index 40313d223..a1404e2bd 100755
--- a/bld.sh
+++ b/bld.sh
@@ -2,18 +2,18 @@
 
 # build TiddlyWiki5
 
-pushd tw5.com > /dev/null
+pushd editions/tw5.com > /dev/null
 
-echo "five.tiddlywiki.com" > ../../jermolene.github.com/CNAME
+echo "five.tiddlywiki.com" > ../../../jermolene.github.com/CNAME
 
-node ../core/boot.js \
+node ../../core/boot.js \
 	--verbose \
 	--password password \
-	--savetiddler ReadMe ../readme.md text/html \
-	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../jermolene.github.com/index.html text/plain [!is[shadow]]\
-	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../jermolene.github.com/empty.html text/plain [!is[shadow]is[shadow]]\
-	--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html ../../jermolene.github.com/encrypted.html text/plain [!is[shadow]]\
-	--savetiddler $:/core/templates/static.template.html ../../jermolene.github.com/static.html text/plain \
+	--savetiddler ReadMe ../../readme.md text/html \
+	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/index.html text/plain [!is[shadow]]\
+	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/empty.html text/plain [!is[shadow]is[shadow]]\
+	--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html ../../../jermolene.github.com/encrypted.html text/plain [!is[shadow]]\
+	--savetiddler $:/core/templates/static.template.html ../../../jermolene.github.com/static.html text/plain \
 	|| exit 1
 
 popd > /dev/null
diff --git a/dbld.sh b/dbld.sh
index 9cb127e18..0b4a31ea0 100755
--- a/dbld.sh
+++ b/dbld.sh
@@ -9,25 +9,25 @@ cp tw5dropbox/dummycontent/*.* ../../../Apps/TiddlyWiki5/My\ TiddlyWiki/tiddlers
 
 # Build the app wiki
 
-pushd tw5dropbox/appwiki > /dev/null
+pushd editions/tw5dropbox/appwiki > /dev/null
 
-node ../../core/boot.js \
+node ../../../core/boot.js \
 	--verbose \
-	--savetiddler $:/plugins/dropbox/tw5dropbox.template.js ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain [!is[shadow]] \
-	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../Apps/TiddlyWiki5/My\ TiddlyWiki/index.html text/plain [!is[shadow]] \
-	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/apptemplate.html text/plain [!is[shadow]] \
-	--savetiddler $:/plugins/dropbox/styles.template.css ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/styles.css text/plain [!is[shadow]] \
+	--savetiddler $:/plugins/dropbox/tw5dropbox.template.js ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain [!is[shadow]] \
+	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/TiddlyWiki5/My\ TiddlyWiki/index.html text/plain [!is[shadow]] \
+	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/apptemplate.html text/plain [!is[shadow]] \
+	--savetiddler $:/plugins/dropbox/styles.template.css ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/styles.css text/plain [!is[shadow]] \
 	|| exit 1
 
 popd > /dev/null
 
 # Build the main wiki
 
-pushd tw5dropbox/mainwiki > /dev/null
+pushd editions/tw5dropbox/mainwiki > /dev/null
 
-node ../../core/boot.js \
+node ../../../core/boot.js \
 	--verbose \
-	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain [!is[shadow]] \
+	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain [!is[shadow]] \
 	|| exit 1
 
 popd > /dev/null
diff --git a/run.sh b/run.sh
index f02121c4b..da501d737 100755
--- a/run.sh
+++ b/run.sh
@@ -2,11 +2,11 @@
 
 # run TiddlyWiki5
 
-pushd tw5.com > /dev/null
+pushd editions/tw5.com > /dev/null
 
-node ../core/boot.js \
+node ../../core/boot.js \
 	--verbose \
-	--wikitest ../tests/wikitests/ \
+	--wikitest ../../tests/wikitests/ \
 	|| exit 1
 
 popd > /dev/null
diff --git a/serve.sh b/serve.sh
index 208a6a74a..9a19f7fba 100755
--- a/serve.sh
+++ b/serve.sh
@@ -2,9 +2,9 @@
 
 # serve TiddlyWiki5 over HTTP
 
-pushd tw5.com > /dev/null
+pushd editions/tw5.com > /dev/null
 
-node ../core/boot.js \
+node ../../core/boot.js \
 	--verbose \
 	--server 8080 $:/core/templates/tiddlywiki5.template.html text/plain text/html \
 	|| exit 1
diff --git a/wbld.sh b/wbld.sh
index 546e5c688..ed86e0f92 100755
--- a/wbld.sh
+++ b/wbld.sh
@@ -5,11 +5,11 @@
 # usage:
 # ./wbld.sh <tiddlyspace username> <tiddlyspace password>
 
-pushd tw5tiddlyweb > /dev/null
+pushd editions/tw5tiddlyweb > /dev/null
 
-node ../core/boot.js \
+node ../../core/boot.js \
 	--verbose \
-	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../jermolene.github.com/tiddlyweb.html text/plain [!is[shadow]]\
+	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/tiddlyweb.html text/plain [!is[shadow]]\
 	|| exit 1
 
 popd > /dev/null