Removed old templates and moved new ones into better place