CXX-175 move members around