Rehabilitation of Potable Water System Supplies - Buildings A, B & ICC