Move, rename, cleanup.