Move templates to correct location, fix typos and refactor the same