Rearrange the entities in the data model to be readable after the changes we made. (v10)