[WIP] refactoring for qbv2

refactoring for https://github.com/doctrine/phpcr-odm/pull/323
not yet done .. specifically Filters are still broken.