Moved models to seperate folder