Rearrange datamodel.