Creation of ModelFacade and restructuration of Solution