Moved models to their own namespace