Refactoring of client maps.

Adds the ClientMDMap class and underlying ClientMap classes.