Moving directories around to fit new convention