Refactor code : move the entity to entity package