Conservation and Renovation of the White Pavilion and the Water Tower