Savana and murano refactoring