Refactored models into their own files