Refactor killbill interaction into mixin modules