Move reporters
Simplify rules, use rule registry