Rearranging, extracting to new classes