Added CleanText
Reorganizing the templates to use folders less aggressively