Refactoring of FlavorSettings to extend FlavorConfig