Restructuring ui/thrift/multipeer references