Refactoring

Moved models into their own files