Moved models to masterdirac.models.aggregate