structural changes to CPT files - added subfolders