Moving to sub modules in the hope we can share code between java driver 1 tests and java driver 2