Moved models into their own package