Move ClientMap to clientmap.{h,cpp}