Moved aggregator out, slight MUC refactor