removed Model and move to Entities