renamed package model to entity