Water is a litre per kilogram, which makes it the heaviest thing you carry and the figure most trip planning forgets. A 10 litre container is 10 kg, and dried food only saves weight when water is free – see the arithmetic on the rehydration page.
Rigid containers for the main store, because collapsible ones fail at the seams and always at the worst moment. Food-grade, with a tap if it is going to live in one place.