reorg of code base