A heads of agreement has been signed between the Selangor and federal governments to conclude the restructuring of the Selangor water industry.