re-organize data