Moved models to separate directory