diff --git a/editions/tw5.com/tiddlers/Draft of 'fields'.tid b/editions/tw5.com/tiddlers/Draft of 'fields'.tid
deleted file mode 100644
index 39ce60c65..000000000
--- a/editions/tw5.com/tiddlers/Draft of 'fields'.tid	
+++ /dev/null
@@ -1,7 +0,0 @@
-created: 20140912145816594
-draft.of: fields
-draft.title: fields
-modified: 20140912145815490
-title: Draft of 'fields'
-type: text/vnd.tiddlywiki
-
diff --git a/editions/tw5.com/tiddlers/About.tid b/editions/tw5.com/tiddlers/about/About.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/About.tid
rename to editions/tw5.com/tiddlers/about/About.tid
diff --git a/editions/tw5.com/tiddlers/Improving TiddlyWiki Documentation.tid b/editions/tw5.com/tiddlers/community/Improving TiddlyWiki Documentation.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Improving TiddlyWiki Documentation.tid
rename to editions/tw5.com/tiddlers/community/Improving TiddlyWiki Documentation.tid
diff --git a/editions/tw5.com/tiddlers/Demonstrations.tid b/editions/tw5.com/tiddlers/demonstrations/Demonstrations.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Demonstrations.tid
rename to editions/tw5.com/tiddlers/demonstrations/Demonstrations.tid
diff --git a/editions/tw5.com/tiddlers/samples/ImageGallery Example.tid b/editions/tw5.com/tiddlers/demonstrations/ImageGallery Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/ImageGallery Example.tid
rename to editions/tw5.com/tiddlers/demonstrations/ImageGallery Example.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleAlert.tid b/editions/tw5.com/tiddlers/demonstrations/SampleAlert.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleAlert.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleAlert.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleNotification.tid b/editions/tw5.com/tiddlers/demonstrations/SampleNotification.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleNotification.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleNotification.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleTabFour.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTabFour.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleTabFour.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleTabFour.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleTabOne.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTabOne.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleTabOne.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleTabOne.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleTabThree.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTabThree.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleTabThree.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleTabThree.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleTabTwo.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTabTwo.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleTabTwo.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleTabTwo.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleTiddlerFirst.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerFirst.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleTiddlerFirst.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleTiddlerFirst.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleTiddlerSecond.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerSecond.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleTiddlerSecond.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleTiddlerSecond.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleTiddlerThird.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerThird.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleTiddlerThird.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleTiddlerThird.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleWizard.tid b/editions/tw5.com/tiddlers/demonstrations/SampleWizard.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleWizard.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleWizard.tid
diff --git a/editions/tw5.com/tiddlers/samples/SampleWizard2.tid b/editions/tw5.com/tiddlers/demonstrations/SampleWizard2.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/SampleWizard2.tid
rename to editions/tw5.com/tiddlers/demonstrations/SampleWizard2.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/Contents.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Contents.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/Contents.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/Contents.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/First.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/First.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/First.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/First.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/FirstOne.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstOne.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/FirstOne.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstOne.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/FirstThree.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstThree.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/FirstThree.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstThree.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/FirstTwo.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstTwo.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/FirstTwo.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/FirstTwo.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/Fourth.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Fourth.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/Fourth.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/Fourth.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/Second.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Second.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/Second.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/Second.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondOne.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondOne.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/SecondOne.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondOne.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThree.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThree.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/SecondThree.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThree.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeOne.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeOne.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeOne.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeOne.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeThree.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeThree.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeThree.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeThree.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeTwo.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeTwo.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeTwo.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondThreeTwo.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondTwo.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondTwo.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/SecondTwo.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/SecondTwo.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/Third.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/Third.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/Third.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/Third.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdOne.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdOne.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/ThirdOne.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdOne.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdThree.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdThree.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/ThirdThree.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdThree.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdTwo.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdTwo.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContents/ThirdTwo.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContents/ThirdTwo.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContentsMacro Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContentsMacro Expandable Example.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContentsMacro Selective Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContentsMacro Selective Expandable Example.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContentsMacro Simple Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContentsMacro Simple Example.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContentsMacro Sorted Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/TableOfContentsMacro Sorted Expandable Example.tid
rename to editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid
diff --git a/editions/tw5.com/tiddlers/samples/Tasks/Compose ballad.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/Compose ballad.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/Tasks/Compose ballad.tid
rename to editions/tw5.com/tiddlers/demonstrations/Tasks/Compose ballad.tid
diff --git a/editions/tw5.com/tiddlers/samples/Tasks/Get the Ring.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/Get the Ring.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/Tasks/Get the Ring.tid
rename to editions/tw5.com/tiddlers/demonstrations/Tasks/Get the Ring.tid
diff --git a/editions/tw5.com/tiddlers/samples/Tasks/Go to Mordor.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/Go to Mordor.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/Tasks/Go to Mordor.tid
rename to editions/tw5.com/tiddlers/demonstrations/Tasks/Go to Mordor.tid
diff --git a/editions/tw5.com/tiddlers/samples/Tasks/Kill the Dragon.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/Kill the Dragon.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/Tasks/Kill the Dragon.tid
rename to editions/tw5.com/tiddlers/demonstrations/Tasks/Kill the Dragon.tid
diff --git a/editions/tw5.com/tiddlers/samples/Tasks/Make the beds.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/Make the beds.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/Tasks/Make the beds.tid
rename to editions/tw5.com/tiddlers/demonstrations/Tasks/Make the beds.tid
diff --git a/editions/tw5.com/tiddlers/samples/Tasks/TaskManagementExample.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/Tasks/TaskManagementExample.tid
rename to editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid
diff --git a/editions/tw5.com/tiddlers/samples/sampletag1.tid b/editions/tw5.com/tiddlers/demonstrations/sampletag1.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/sampletag1.tid
rename to editions/tw5.com/tiddlers/demonstrations/sampletag1.tid
diff --git a/editions/tw5.com/tiddlers/samples/sampletag2.tid b/editions/tw5.com/tiddlers/demonstrations/sampletag2.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/samples/sampletag2.tid
rename to editions/tw5.com/tiddlers/demonstrations/sampletag2.tid
diff --git a/editions/tw5.com/tiddlers/Future Proof.tid b/editions/tw5.com/tiddlers/features/Future Proof.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Future Proof.tid
rename to editions/tw5.com/tiddlers/features/Future Proof.tid
diff --git a/editions/tw5.com/tiddlers/Learning.tid b/editions/tw5.com/tiddlers/learning/Learning.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Learning.tid
rename to editions/tw5.com/tiddlers/learning/Learning.tid
diff --git a/editions/tw5.com/tiddlers/Reference.tid b/editions/tw5.com/tiddlers/reference/Reference.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Reference.tid
rename to editions/tw5.com/tiddlers/reference/Reference.tid
diff --git a/editions/tw5.com/tiddlers/Saving.tid b/editions/tw5.com/tiddlers/saving/Saving.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Saving.tid
rename to editions/tw5.com/tiddlers/saving/Saving.tid
diff --git a/editions/tw5.com/tiddlers/Videos.tid b/editions/tw5.com/tiddlers/videos/Videos.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Videos.tid
rename to editions/tw5.com/tiddlers/videos/Videos.tid