Split Entity into Model and Entity