Rearrange definitions inside models