The federal government has confirmed that the restructuring of water supply industry in Selangor will be completed by the end of this year.