Reorder some client-server stuff.