update directory locations

acoburn requested to merge rename-template.2 into rename-template

@bseeger This implements my suggested changes to your rename-template branch. Once these are in, we can merge your PR into master.

Merge request reports