Water Wave Bundles