Added TransformerRule and AggregatorRule, and reformatted everything