Generalised Eigenfunction Expansion for Water Waves