Moved models to folder for clarity