Started a major restructuring of Mango-Framework