Cleanup/reorg some stuff.