Move java_import calls into Geom module