Mango fix

This change is to address the proposed changes in the mango project structure.