p24, p25, remove from subfolders