Move things into the correct templates.