Move billing templates to correct locn & fix typos