Refactored Model to another package