Refactored models into their own relevant directories