Cleanup, and move templates.