Reorg and project 2 progress