General clean up and reorg