Moved templates to right directory