diff --git a/editions/tw5.com/tiddlers/Acknowledgements.tid b/editions/tw5.com/tiddlers/about/Acknowledgements.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Acknowledgements.tid
rename to editions/tw5.com/tiddlers/about/Acknowledgements.tid
diff --git a/editions/tw5.com/tiddlers/Future of TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/Future of TiddlyWiki.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Future of TiddlyWiki.tid
rename to editions/tw5.com/tiddlers/about/Future of TiddlyWiki.tid
diff --git a/editions/tw5.com/tiddlers/Philosophy of Tiddlers.tid b/editions/tw5.com/tiddlers/about/Philosophy of Tiddlers.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Philosophy of Tiddlers.tid
rename to editions/tw5.com/tiddlers/about/Philosophy of Tiddlers.tid
diff --git a/editions/tw5.com/tiddlers/Scalability.tid b/editions/tw5.com/tiddlers/about/Scalability.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Scalability.tid
rename to editions/tw5.com/tiddlers/about/Scalability.tid
diff --git a/editions/tw5.com/tiddlers/Contributing.tid b/editions/tw5.com/tiddlers/community/Contributing.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Contributing.tid
rename to editions/tw5.com/tiddlers/community/Contributing.tid
diff --git a/editions/tw5.com/tiddlers/HelpingTiddlyWiki.tid b/editions/tw5.com/tiddlers/community/HelpingTiddlyWiki.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/HelpingTiddlyWiki.tid
rename to editions/tw5.com/tiddlers/community/HelpingTiddlyWiki.tid
diff --git a/editions/tw5.com/tiddlers/TiddlyWiki Hangouts.tid b/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/TiddlyWiki Hangouts.tid
rename to editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid
diff --git a/editions/tw5.com/tiddlers/GuerillaWiki.tid b/editions/tw5.com/tiddlers/definitions/GuerillaWiki.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/GuerillaWiki.tid
rename to editions/tw5.com/tiddlers/definitions/GuerillaWiki.tid
diff --git a/editions/tw5.com/tiddlers/Features.tid b/editions/tw5.com/tiddlers/features/Features.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Features.tid
rename to editions/tw5.com/tiddlers/features/Features.tid
diff --git a/editions/tw5.com/tiddlers/tips/Adding a Twitter Follow button.tid b/editions/tw5.com/tiddlers/howtos/Adding a Twitter Follow button.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/tips/Adding a Twitter Follow button.tid
rename to editions/tw5.com/tiddlers/howtos/Adding a Twitter Follow button.tid
diff --git a/editions/tw5.com/tiddlers/Configuring the default TiddlerInfo tab.tid b/editions/tw5.com/tiddlers/howtos/Configuring the default TiddlerInfo tab.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Configuring the default TiddlerInfo tab.tid
rename to editions/tw5.com/tiddlers/howtos/Configuring the default TiddlerInfo tab.tid
diff --git a/editions/tw5.com/tiddlers/tips/Editing Tiddlers with Emacs.tid b/editions/tw5.com/tiddlers/howtos/Editing Tiddlers with Emacs.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/tips/Editing Tiddlers with Emacs.tid
rename to editions/tw5.com/tiddlers/howtos/Editing Tiddlers with Emacs.tid
diff --git a/editions/tw5.com/tiddlers/tips/GoogleChromeTips.tid b/editions/tw5.com/tiddlers/howtos/GoogleChromeTips.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/tips/GoogleChromeTips.tid
rename to editions/tw5.com/tiddlers/howtos/GoogleChromeTips.tid
diff --git a/editions/tw5.com/tiddlers/tips/KeyboardShortcuts.tid b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/tips/KeyboardShortcuts.tid
rename to editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid
diff --git a/editions/tw5.com/tiddlers/tips/Preserving open tiddlers at startup.tid b/editions/tw5.com/tiddlers/howtos/Preserving open tiddlers at startup.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/tips/Preserving open tiddlers at startup.tid
rename to editions/tw5.com/tiddlers/howtos/Preserving open tiddlers at startup.tid
diff --git a/editions/tw5.com/tiddlers/Structuring TiddlyWiki.tid b/editions/tw5.com/tiddlers/howtos/Structuring TiddlyWiki.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Structuring TiddlyWiki.tid
rename to editions/tw5.com/tiddlers/howtos/Structuring TiddlyWiki.tid
diff --git a/editions/tw5.com/tiddlers/tips/The First Rule of Using TiddlyWiki.tid b/editions/tw5.com/tiddlers/howtos/The First Rule of Using TiddlyWiki.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/tips/The First Rule of Using TiddlyWiki.tid
rename to editions/tw5.com/tiddlers/howtos/The First Rule of Using TiddlyWiki.tid
diff --git a/editions/tw5.com/tiddlers/tips/TitlesPolicy.tid b/editions/tw5.com/tiddlers/howtos/TitlesPolicy.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/tips/TitlesPolicy.tid
rename to editions/tw5.com/tiddlers/howtos/TitlesPolicy.tid
diff --git a/editions/tw5.com/tiddlers/Upgrading.tid b/editions/tw5.com/tiddlers/howtos/Upgrading.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Upgrading.tid
rename to editions/tw5.com/tiddlers/howtos/Upgrading.tid
diff --git a/editions/tw5.com/tiddlers/Changes to filters in 5.0.9-beta.tid b/editions/tw5.com/tiddlers/releasenotes/Changes to filters in 5.0.9-beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Changes to filters in 5.0.9-beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Changes to filters in 5.0.9-beta.tid
diff --git a/editions/tw5.com/tiddlers/howtos/Notes for upgrading to 5.0.11-beta.tid b/editions/tw5.com/tiddlers/releasenotes/Notes for upgrading to 5.0.11-beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/howtos/Notes for upgrading to 5.0.11-beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Notes for upgrading to 5.0.11-beta.tid
diff --git a/editions/tw5.com/tiddlers/howtos/Notes for upgrading to 5.0.8-beta.tid b/editions/tw5.com/tiddlers/releasenotes/Notes for upgrading to 5.0.8-beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/howtos/Notes for upgrading to 5.0.8-beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Notes for upgrading to 5.0.8-beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha11.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha11.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.0alpha11.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha11.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha12.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha12.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.0alpha12.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha12.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha13.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha13.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.0alpha13.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha13.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha14.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha14.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.0alpha14.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha14.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha15.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha15.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.0alpha15.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha15.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha16.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha16.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.0alpha16.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha16.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha17.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha17.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.0alpha17.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.0alpha17.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.10beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.10beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.10beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.10beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.11beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.11beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.11beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.11beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.12beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.12beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.12beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.12beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.13beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.13beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.13beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.13beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.14beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.14beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.14beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.14beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.15beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.15beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.15beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.15beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.16beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.16beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.16beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.16beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.17beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.17beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.17beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.17beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.1alpha.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.1alpha.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.1alpha.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.1alpha.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.2beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.2beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.2beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.2beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.3beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.3beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.3beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.3beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.4beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.4beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.4beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.4beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.5beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.5beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.5beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.5beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.6beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.6beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.6beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.6beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.7beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.7beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.7beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.7beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.8beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.8beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.8beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.8beta.tid
diff --git a/editions/tw5.com/tiddlers/Release 5.0.9beta.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.0.9beta.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Release 5.0.9beta.tid
rename to editions/tw5.com/tiddlers/releasenotes/Release 5.0.9beta.tid
diff --git a/editions/tw5.com/tiddlers/ReleaseHistory.tid b/editions/tw5.com/tiddlers/releasenotes/ReleaseHistory.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/ReleaseHistory.tid
rename to editions/tw5.com/tiddlers/releasenotes/ReleaseHistory.tid
diff --git a/editions/tw5.com/tiddlers/ReleaseHistoryTemplate.tid b/editions/tw5.com/tiddlers/releasenotes/ReleaseHistoryTemplate.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/ReleaseHistoryTemplate.tid
rename to editions/tw5.com/tiddlers/releasenotes/ReleaseHistoryTemplate.tid
diff --git a/editions/tw5.com/tiddlers/ImageGallery Example.tid b/editions/tw5.com/tiddlers/samples/ImageGallery Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/ImageGallery Example.tid
rename to editions/tw5.com/tiddlers/samples/ImageGallery Example.tid