Replaces old templates with new

* Chucking the old templates out, replaced with the new.