now depends on java-exe-helper-4.0
Merge remote-tracking branch 'origin/restructure' into restructure