Refactored models into separate file