[WIP] Structural and API refactor in preparation for ejb-client 3.0