More reorg of sprint1