reorg of entire code base