Moved templates into templates folder