Shift into phase 2
Keep deprecated phase 1 files