Cleanup and reorg.