refactoring for qbv2
Merge pull request #169 from sonata-project/qbv2

[WIP] refactoring for qbv2