Client side reorganization