reorganizes voting rules
Merge pull request #15 from thirdcreed/mixin-refactor

reorganizes voting rules