Move templates to better show where they'll endup.