Restructure clean1 templates.

Done in response to the discussion in #1091. Changes to the tiddler structure led to changes being required in each of the templates.