Clean up and reorg