Reorg and rearrange.  Main core almost running.