Reorganized build package to make the Java build more modular