Refactored models into a separate directory. Tests all passing