changes in folder structure p2