Broke out rules and tags, cleaned everything,

fixed a bug I introduced by breaking out modules earlier.