rename files for consistency
add support for aggregation-rules
wire relay_rules in and make sure we use the right template