Refactor Rules + Cleaned code

Refined the model for rules and cleaned up the code
issues: +Enrichment methods still won't compile
        +Need to see if new Rule model is satisfying or if we should have a default implementation for report abort & format