Restructured the Rules and RuleMatches to match on a per-imsi basis.