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

Let's do a real test here.