Client architecture reorganized