MHP-1: Fixing structure Folders