REformating the rule model

Now trying to unify the rule model