Some cleanup and re-org tasks.