Feature/refactoring

Separate facade building from acualisation, and facade building phases separation