rearrange schema in models