Correct modules hierarchy

PumpModule should be on the same level as DripCoffeeModule since they are independent.
It is redundant indeed, and according to information I gathered here https://github.com/JakeWharton/u2020/pull/42#issuecomment-63781466, probably a demonstration for `include` is not needed.