Moved models to organized module