Adding sub folder and new schema