Changed the structure of Framework