Added class DrinkExtra
Some modifications to the code and some refactoring added