Refactoring of Savanna module
Continue Murano refactoring