Continue refactoring of Savanna and Murano