Refactoring of Savanna module