Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.