I think we should stick to our original principles then: separate pure-CFEngine logic into one bundle, and anything Rudder specific in surrounding bundles.