Added P3 folder and substructures