Water Street Infrastructure Project to be Completed early July