initial reorg of shift for core in its own repository