At the 11-story Watergate office building, renovations that started last summer are almost finished, and the National Trust for Historic Preservation is set to move its headquarters to