Seperated the new functionality to java-import into java-imports, with a hack that seems to evade the bytecode verify errors.