More reorg and unused code removed.