renamed package from entity to model