Change structure of the framework