Moved models to namespace