diff --git a/editions/tw5.com/tiddlers/Documentation Style Guide.tid b/editions/tw5.com/tiddlers/about/Documentation Style Guide.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/Documentation Style Guide.tid
rename to editions/tw5.com/tiddlers/about/Documentation Style Guide.tid
diff --git a/editions/tw5.com/tiddlers/getinvolved/Create support resources.tid b/editions/tw5.com/tiddlers/community/Create support resources.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/getinvolved/Create support resources.tid
rename to editions/tw5.com/tiddlers/community/Create support resources.tid
diff --git a/editions/tw5.com/tiddlers/getinvolved/Develop for TW.tid b/editions/tw5.com/tiddlers/community/Develop for TW.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/getinvolved/Develop for TW.tid
rename to editions/tw5.com/tiddlers/community/Develop for TW.tid
diff --git a/editions/tw5.com/tiddlers/getinvolved/Promote TW.tid b/editions/tw5.com/tiddlers/community/Promote TW.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/getinvolved/Promote TW.tid
rename to editions/tw5.com/tiddlers/community/Promote TW.tid
diff --git a/editions/tw5.com/tiddlers/getinvolved/Report bugs.tid b/editions/tw5.com/tiddlers/community/Report bugs.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/getinvolved/Report bugs.tid
rename to editions/tw5.com/tiddlers/community/Report bugs.tid
diff --git a/editions/tw5.com/tiddlers/getinvolved/Translate TW.tid b/editions/tw5.com/tiddlers/community/Translate TW.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/getinvolved/Translate TW.tid
rename to editions/tw5.com/tiddlers/community/Translate TW.tid
diff --git a/editions/tw5.com/tiddlers/customizingTW/Change layout SystemTags.tid b/editions/tw5.com/tiddlers/customisation/Change layout SystemTags.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/customizingTW/Change layout SystemTags.tid
rename to editions/tw5.com/tiddlers/customisation/Change layout SystemTags.tid
diff --git a/editions/tw5.com/tiddlers/customizingTW/Change the animation speed.tid b/editions/tw5.com/tiddlers/customisation/Change the animation speed.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/customizingTW/Change the animation speed.tid
rename to editions/tw5.com/tiddlers/customisation/Change the animation speed.tid
diff --git a/editions/tw5.com/tiddlers/customizingTW/Change the colour palette.tid b/editions/tw5.com/tiddlers/customisation/Change the colour palette.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/customizingTW/Change the colour palette.tid
rename to editions/tw5.com/tiddlers/customisation/Change the colour palette.tid
diff --git a/editions/tw5.com/tiddlers/customizingTW/Change the storyview.tid b/editions/tw5.com/tiddlers/customisation/Change the storyview.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/customizingTW/Change the storyview.tid
rename to editions/tw5.com/tiddlers/customisation/Change the storyview.tid
diff --git a/editions/tw5.com/tiddlers/customizingTW/Configure buttons.tid b/editions/tw5.com/tiddlers/customisation/Configure buttons.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/customizingTW/Configure buttons.tid
rename to editions/tw5.com/tiddlers/customisation/Configure buttons.tid
diff --git a/editions/tw5.com/tiddlers/customizingTW/Create a CSS.tid b/editions/tw5.com/tiddlers/customisation/Create a CSS.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/customizingTW/Create a CSS.tid
rename to editions/tw5.com/tiddlers/customisation/Create a CSS.tid
diff --git a/editions/tw5.com/tiddlers/gethelplearnmore/User-created editions of TW.tid b/editions/tw5.com/tiddlers/editions/User-created editions of TW.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/gethelplearnmore/User-created editions of TW.tid
rename to editions/tw5.com/tiddlers/editions/User-created editions of TW.tid
diff --git a/editions/tw5.com/tiddlers/about/Scalability.tid b/editions/tw5.com/tiddlers/features/Scalability.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/about/Scalability.tid
rename to editions/tw5.com/tiddlers/features/Scalability.tid
diff --git a/editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid b/editions/tw5.com/tiddlers/fileformats/MultiTiddlerFiles.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/deserializers/MultiTiddlerFiles.tid
rename to editions/tw5.com/tiddlers/fileformats/MultiTiddlerFiles.tid
diff --git a/editions/tw5.com/tiddlers/deserializers/TiddlerFiles.tid b/editions/tw5.com/tiddlers/fileformats/TiddlerFiles.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/deserializers/TiddlerFiles.tid
rename to editions/tw5.com/tiddlers/fileformats/TiddlerFiles.tid
diff --git a/editions/tw5.com/tiddlers/GettingStarted.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/GettingStarted.tid
rename to editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid
diff --git a/editions/tw5.com/tiddlers/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/HelloThere.tid
rename to editions/tw5.com/tiddlers/hellothere/HelloThere.tid
diff --git a/editions/tw5.com/tiddlers/howtos/TitlesPolicy.tid b/editions/tw5.com/tiddlers/howtos/Adopt a Titles Policy.tid
similarity index 97%
rename from editions/tw5.com/tiddlers/howtos/TitlesPolicy.tid
rename to editions/tw5.com/tiddlers/howtos/Adopt a Titles Policy.tid
index 9147b8951..d5230f231 100644
--- a/editions/tw5.com/tiddlers/howtos/TitlesPolicy.tid
+++ b/editions/tw5.com/tiddlers/howtos/Adopt a Titles Policy.tid	
@@ -1,7 +1,7 @@
 created: 20130825103300000
 modified: 20140122173818924
 tags: tips
-title: TitlesPolicy
+title: Adopt a Titles Policy
 type: text/vnd.tiddlywiki
 
 As the structures within your TiddlyWiki documents get more complex it can be hard to keep the titles of tiddlers consistent. For example, should terms be defined in the plural or the singular? Camel case or separate words?
diff --git a/editions/tw5.com/tiddlers/gethelplearnmore/Tips and tutorials.tid b/editions/tw5.com/tiddlers/learning/Tips and tutorials.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/gethelplearnmore/Tips and tutorials.tid
rename to editions/tw5.com/tiddlers/learning/Tips and tutorials.tid
diff --git a/editions/tw5.com/tiddlers/dev/Building TiddlyWikiClassic.tid b/editions/tw5.com/tiddlers/nodejs/Building TiddlyWikiClassic.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/Building TiddlyWikiClassic.tid
rename to editions/tw5.com/tiddlers/nodejs/Building TiddlyWikiClassic.tid
diff --git a/editions/tw5.com/tiddlers/dev/Environment Variables on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/Environment Variables on Node.js.tid
rename to editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid
diff --git a/editions/tw5.com/tiddlers/dev/Installing TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/Installing TiddlyWiki on Node.js.tid
rename to editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid
diff --git a/editions/tw5.com/tiddlers/dev/Naming of System Tiddlers.tid b/editions/tw5.com/tiddlers/nodejs/Naming of System Tiddlers.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/Naming of System Tiddlers.tid
rename to editions/tw5.com/tiddlers/nodejs/Naming of System Tiddlers.tid
diff --git a/editions/tw5.com/tiddlers/dev/Scripts for TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/Scripts for TiddlyWiki on Node.js.tid
rename to editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid
diff --git a/editions/tw5.com/tiddlers/dev/TiddlerFilter Formal Grammar.tid b/editions/tw5.com/tiddlers/nodejs/TiddlerFilter Formal Grammar.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/TiddlerFilter Formal Grammar.tid
rename to editions/tw5.com/tiddlers/nodejs/TiddlerFilter Formal Grammar.tid
diff --git a/editions/tw5.com/tiddlers/dev/TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/TiddlyWiki on Node.js.tid
rename to editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid
diff --git a/editions/tw5.com/tiddlers/dev/TiddlyWiki5 Versioning.tid b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki5 Versioning.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/TiddlyWiki5 Versioning.tid
rename to editions/tw5.com/tiddlers/nodejs/TiddlyWiki5 Versioning.tid
diff --git a/editions/tw5.com/tiddlers/dev/Upgrading TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Upgrading TiddlyWiki on Node.js.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/Upgrading TiddlyWiki on Node.js.tid
rename to editions/tw5.com/tiddlers/nodejs/Upgrading TiddlyWiki on Node.js.tid
diff --git a/editions/tw5.com/tiddlers/dev/Using TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Using TiddlyWiki on Node.js.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/dev/Using TiddlyWiki on Node.js.tid
rename to editions/tw5.com/tiddlers/nodejs/Using TiddlyWiki on Node.js.tid