Distribution of packaged drinking water will be streamlined: FSSAI