Moved models and collections to separate files