Remove dead templates and move used templates

Remove the crap.