diff --git a/java/ql/lib/ext/generated/java.applet.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.applet.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.applet.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.applet.model.yml diff --git a/java/ql/lib/ext/generated/java.beans.beancontext.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.beans.beancontext.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.beans.beancontext.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.beans.beancontext.model.yml diff --git a/java/ql/lib/ext/generated/java.beans.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.beans.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.beans.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.beans.model.yml diff --git a/java/ql/lib/ext/generated/java.io.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.io.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.io.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.io.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.annotation.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.annotation.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.annotation.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.annotation.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.constant.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.constant.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.constant.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.constant.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.instrument.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.instrument.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.instrument.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.instrument.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.invoke.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.invoke.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.invoke.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.invoke.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.management.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.management.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.management.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.management.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.module.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.module.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.module.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.module.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.ref.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.ref.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.ref.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.ref.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.reflect.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.reflect.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.reflect.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.reflect.model.yml diff --git a/java/ql/lib/ext/generated/java.lang.runtime.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.lang.runtime.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.lang.runtime.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.lang.runtime.model.yml diff --git a/java/ql/lib/ext/generated/java.math.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.math.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.math.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.math.model.yml diff --git a/java/ql/lib/ext/generated/java.net.http.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.net.http.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.net.http.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.net.http.model.yml diff --git a/java/ql/lib/ext/generated/java.net.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.net.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.net.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.net.model.yml diff --git a/java/ql/lib/ext/generated/java.nio.channels.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.nio.channels.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.nio.channels.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.nio.channels.model.yml diff --git a/java/ql/lib/ext/generated/java.nio.channels.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.nio.channels.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.nio.channels.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.nio.channels.spi.model.yml diff --git a/java/ql/lib/ext/generated/java.nio.charset.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.nio.charset.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.nio.charset.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.nio.charset.model.yml diff --git a/java/ql/lib/ext/generated/java.nio.charset.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.nio.charset.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.nio.charset.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.nio.charset.spi.model.yml diff --git a/java/ql/lib/ext/generated/java.nio.file.attribute.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.nio.file.attribute.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.nio.file.attribute.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.nio.file.attribute.model.yml diff --git a/java/ql/lib/ext/generated/java.nio.file.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.nio.file.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.nio.file.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.nio.file.model.yml diff --git a/java/ql/lib/ext/generated/java.nio.file.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.nio.file.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.nio.file.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.nio.file.spi.model.yml diff --git a/java/ql/lib/ext/generated/java.nio.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.nio.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.nio.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.nio.model.yml diff --git a/java/ql/lib/ext/generated/java.rmi.dgc.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.rmi.dgc.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.rmi.dgc.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.rmi.dgc.model.yml diff --git a/java/ql/lib/ext/generated/java.rmi.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.rmi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.rmi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.rmi.model.yml diff --git a/java/ql/lib/ext/generated/java.rmi.registry.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.rmi.registry.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.rmi.registry.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.rmi.registry.model.yml diff --git a/java/ql/lib/ext/generated/java.rmi.server.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.rmi.server.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.rmi.server.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.rmi.server.model.yml diff --git a/java/ql/lib/ext/generated/java.security.cert.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.security.cert.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.security.cert.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.security.cert.model.yml diff --git a/java/ql/lib/ext/generated/java.security.interfaces.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.security.interfaces.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.security.interfaces.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.security.interfaces.model.yml diff --git a/java/ql/lib/ext/generated/java.security.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.security.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.security.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.security.model.yml diff --git a/java/ql/lib/ext/generated/java.security.spec.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.security.spec.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.security.spec.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.security.spec.model.yml diff --git a/java/ql/lib/ext/generated/java.sql.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.sql.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.sql.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.sql.model.yml diff --git a/java/ql/lib/ext/generated/java.text.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.text.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.text.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.text.model.yml diff --git a/java/ql/lib/ext/generated/java.text.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.text.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.text.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.text.spi.model.yml diff --git a/java/ql/lib/ext/generated/java.time.chrono.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.time.chrono.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.time.chrono.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.time.chrono.model.yml diff --git a/java/ql/lib/ext/generated/java.time.format.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.time.format.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.time.format.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.time.format.model.yml diff --git a/java/ql/lib/ext/generated/java.time.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.time.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.time.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.time.model.yml diff --git a/java/ql/lib/ext/generated/java.time.temporal.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.time.temporal.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.time.temporal.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.time.temporal.model.yml diff --git a/java/ql/lib/ext/generated/java.time.zone.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.time.zone.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.time.zone.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.time.zone.model.yml diff --git a/java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.concurrent.atomic.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.concurrent.atomic.model.yml diff --git a/java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.concurrent.locks.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.concurrent.locks.model.yml diff --git a/java/ql/lib/ext/generated/java.util.concurrent.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.concurrent.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.concurrent.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.concurrent.model.yml diff --git a/java/ql/lib/ext/generated/java.util.function.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.function.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.function.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.function.model.yml diff --git a/java/ql/lib/ext/generated/java.util.jar.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.jar.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.jar.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.jar.model.yml diff --git a/java/ql/lib/ext/generated/java.util.logging.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.logging.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.logging.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.logging.model.yml diff --git a/java/ql/lib/ext/generated/java.util.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.model.yml diff --git a/java/ql/lib/ext/generated/java.util.prefs.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.prefs.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.prefs.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.prefs.model.yml diff --git a/java/ql/lib/ext/generated/java.util.random.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.random.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.random.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.random.model.yml diff --git a/java/ql/lib/ext/generated/java.util.regex.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.regex.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.regex.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.regex.model.yml diff --git a/java/ql/lib/ext/generated/java.util.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.spi.model.yml diff --git a/java/ql/lib/ext/generated/java.util.stream.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.stream.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.stream.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.stream.model.yml diff --git a/java/ql/lib/ext/generated/java.util.zip.model.yml b/java/ql/lib/ext/generated/modelgenerator/java.util.zip.model.yml similarity index 100% rename from java/ql/lib/ext/generated/java.util.zip.model.yml rename to java/ql/lib/ext/generated/modelgenerator/java.util.zip.model.yml diff --git a/java/ql/lib/ext/generated/javax.accessibility.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.accessibility.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.accessibility.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.accessibility.model.yml diff --git a/java/ql/lib/ext/generated/javax.annotation.processing.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.annotation.processing.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.annotation.processing.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.annotation.processing.model.yml diff --git a/java/ql/lib/ext/generated/javax.crypto.interfaces.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.crypto.interfaces.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.crypto.interfaces.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.crypto.interfaces.model.yml diff --git a/java/ql/lib/ext/generated/javax.crypto.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.crypto.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.crypto.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.crypto.model.yml diff --git a/java/ql/lib/ext/generated/javax.crypto.spec.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.crypto.spec.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.crypto.spec.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.crypto.spec.model.yml diff --git a/java/ql/lib/ext/generated/javax.imageio.metadata.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.imageio.metadata.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.imageio.metadata.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.imageio.metadata.model.yml diff --git a/java/ql/lib/ext/generated/javax.imageio.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.imageio.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.imageio.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.imageio.model.yml diff --git a/java/ql/lib/ext/generated/javax.imageio.plugins.bmp.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.imageio.plugins.bmp.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.imageio.plugins.bmp.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.imageio.plugins.bmp.model.yml diff --git a/java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.imageio.plugins.jpeg.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.imageio.plugins.jpeg.model.yml diff --git a/java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.imageio.plugins.tiff.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.imageio.plugins.tiff.model.yml diff --git a/java/ql/lib/ext/generated/javax.imageio.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.imageio.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.imageio.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.imageio.spi.model.yml diff --git a/java/ql/lib/ext/generated/javax.imageio.stream.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.imageio.stream.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.imageio.stream.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.imageio.stream.model.yml diff --git a/java/ql/lib/ext/generated/javax.lang.model.element.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.lang.model.element.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.lang.model.element.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.lang.model.element.model.yml diff --git a/java/ql/lib/ext/generated/javax.lang.model.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.lang.model.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.lang.model.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.lang.model.model.yml diff --git a/java/ql/lib/ext/generated/javax.lang.model.type.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.lang.model.type.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.lang.model.type.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.lang.model.type.model.yml diff --git a/java/ql/lib/ext/generated/javax.lang.model.util.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.lang.model.util.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.lang.model.util.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.lang.model.util.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.loading.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.loading.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.loading.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.loading.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.modelmbean.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.modelmbean.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.modelmbean.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.modelmbean.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.monitor.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.monitor.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.monitor.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.monitor.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.openmbean.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.openmbean.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.openmbean.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.openmbean.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.relation.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.relation.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.relation.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.relation.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.remote.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.remote.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.remote.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.remote.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.remote.rmi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.remote.rmi.model.yml diff --git a/java/ql/lib/ext/generated/javax.management.timer.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.management.timer.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.management.timer.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.management.timer.model.yml diff --git a/java/ql/lib/ext/generated/javax.naming.directory.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.naming.directory.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.naming.directory.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.naming.directory.model.yml diff --git a/java/ql/lib/ext/generated/javax.naming.event.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.naming.event.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.naming.event.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.naming.event.model.yml diff --git a/java/ql/lib/ext/generated/javax.naming.ldap.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.naming.ldap.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.naming.ldap.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.naming.ldap.model.yml diff --git a/java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.naming.ldap.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.naming.ldap.spi.model.yml diff --git a/java/ql/lib/ext/generated/javax.naming.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.naming.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.naming.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.naming.model.yml diff --git a/java/ql/lib/ext/generated/javax.naming.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.naming.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.naming.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.naming.spi.model.yml diff --git a/java/ql/lib/ext/generated/javax.net.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.net.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.net.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.net.model.yml diff --git a/java/ql/lib/ext/generated/javax.net.ssl.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.net.ssl.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.net.ssl.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.net.ssl.model.yml diff --git a/java/ql/lib/ext/generated/javax.print.attribute.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.print.attribute.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.print.attribute.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.print.attribute.model.yml diff --git a/java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.print.attribute.standard.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.print.attribute.standard.model.yml diff --git a/java/ql/lib/ext/generated/javax.print.event.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.print.event.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.print.event.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.print.event.model.yml diff --git a/java/ql/lib/ext/generated/javax.print.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.print.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.print.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.print.model.yml diff --git a/java/ql/lib/ext/generated/javax.rmi.ssl.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.rmi.ssl.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.rmi.ssl.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.rmi.ssl.model.yml diff --git a/java/ql/lib/ext/generated/javax.script.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.script.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.script.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.script.model.yml diff --git a/java/ql/lib/ext/generated/javax.security.auth.callback.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.security.auth.callback.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.security.auth.callback.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.security.auth.callback.model.yml diff --git a/java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.security.auth.kerberos.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.security.auth.kerberos.model.yml diff --git a/java/ql/lib/ext/generated/javax.security.auth.login.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.security.auth.login.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.security.auth.login.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.security.auth.login.model.yml diff --git a/java/ql/lib/ext/generated/javax.security.auth.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.security.auth.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.security.auth.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.security.auth.model.yml diff --git a/java/ql/lib/ext/generated/javax.security.auth.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.security.auth.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.security.auth.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.security.auth.spi.model.yml diff --git a/java/ql/lib/ext/generated/javax.security.auth.x500.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.security.auth.x500.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.security.auth.x500.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.security.auth.x500.model.yml diff --git a/java/ql/lib/ext/generated/javax.security.cert.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.security.cert.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.security.cert.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.security.cert.model.yml diff --git a/java/ql/lib/ext/generated/javax.security.sasl.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.security.sasl.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.security.sasl.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.security.sasl.model.yml diff --git a/java/ql/lib/ext/generated/javax.smartcardio.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.smartcardio.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.smartcardio.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.smartcardio.model.yml diff --git a/java/ql/lib/ext/generated/javax.sound.midi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.sound.midi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.sound.midi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.sound.midi.model.yml diff --git a/java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.sound.midi.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.sound.midi.spi.model.yml diff --git a/java/ql/lib/ext/generated/javax.sound.sampled.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.sound.sampled.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.sound.sampled.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.sound.sampled.model.yml diff --git a/java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.sound.sampled.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.sound.sampled.spi.model.yml diff --git a/java/ql/lib/ext/generated/javax.sql.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.sql.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.sql.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.sql.model.yml diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.sql.rowset.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.sql.rowset.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.sql.rowset.model.yml diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.sql.rowset.serial.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.sql.rowset.serial.model.yml diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.sql.rowset.spi.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.sql.rowset.spi.model.yml diff --git a/java/ql/lib/ext/generated/javax.tools.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.tools.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.tools.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.tools.model.yml diff --git a/java/ql/lib/ext/generated/javax.transaction.xa.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.transaction.xa.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.transaction.xa.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.transaction.xa.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.catalog.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.catalog.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.catalog.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.catalog.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dom.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dom.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.dom.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.dom.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.keyinfo.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.keyinfo.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.spec.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.spec.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.crypto.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.datatype.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.datatype.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.datatype.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.datatype.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.namespace.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.namespace.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.namespace.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.namespace.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.parsers.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.parsers.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.parsers.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.parsers.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.stream.events.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.stream.events.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.stream.events.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.stream.events.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.stream.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.stream.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.stream.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.stream.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.stream.util.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.stream.util.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.stream.util.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.stream.util.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.dom.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.dom.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.transform.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.transform.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.sax.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.sax.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.stax.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.stax.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.stream.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.stream.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.validation.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.validation.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.validation.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.validation.model.yml diff --git a/java/ql/lib/ext/generated/javax.xml.xpath.model.yml b/java/ql/lib/ext/generated/modelgenerator/javax.xml.xpath.model.yml similarity index 100% rename from java/ql/lib/ext/generated/javax.xml.xpath.model.yml rename to java/ql/lib/ext/generated/modelgenerator/javax.xml.xpath.model.yml diff --git a/java/ql/lib/ext/generated/jenkins-json-lib.model.yml b/java/ql/lib/ext/generated/modelgenerator/jenkins-json-lib.model.yml similarity index 100% rename from java/ql/lib/ext/generated/jenkins-json-lib.model.yml rename to java/ql/lib/ext/generated/modelgenerator/jenkins-json-lib.model.yml diff --git a/java/ql/lib/ext/generated/jenkins.model.yml b/java/ql/lib/ext/generated/modelgenerator/jenkins.model.yml similarity index 100% rename from java/ql/lib/ext/generated/jenkins.model.yml rename to java/ql/lib/ext/generated/modelgenerator/jenkins.model.yml diff --git a/java/ql/lib/ext/generated/kotlinstdlib.model.yml b/java/ql/lib/ext/generated/modelgenerator/kotlinstdlib.model.yml similarity index 100% rename from java/ql/lib/ext/generated/kotlinstdlib.model.yml rename to java/ql/lib/ext/generated/modelgenerator/kotlinstdlib.model.yml diff --git a/java/ql/lib/ext/generated/org.apache.commons.io.model.yml b/java/ql/lib/ext/generated/modelgenerator/org.apache.commons.io.model.yml similarity index 100% rename from java/ql/lib/ext/generated/org.apache.commons.io.model.yml rename to java/ql/lib/ext/generated/modelgenerator/org.apache.commons.io.model.yml diff --git a/java/ql/lib/ext/generated/org.apache.commons.lang.model.yml b/java/ql/lib/ext/generated/modelgenerator/org.apache.commons.lang.model.yml similarity index 100% rename from java/ql/lib/ext/generated/org.apache.commons.lang.model.yml rename to java/ql/lib/ext/generated/modelgenerator/org.apache.commons.lang.model.yml diff --git a/java/ql/lib/ext/generated/stapler.model.yml b/java/ql/lib/ext/generated/modelgenerator/stapler.model.yml similarity index 100% rename from java/ql/lib/ext/generated/stapler.model.yml rename to java/ql/lib/ext/generated/modelgenerator/stapler.model.yml diff --git a/java/ql/lib/ext/generated/struts2.model.yml b/java/ql/lib/ext/generated/modelgenerator/struts2.model.yml similarity index 100% rename from java/ql/lib/ext/generated/struts2.model.yml rename to java/ql/lib/ext/generated/modelgenerator/struts2.model.yml diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml index efa1d011ea57..d256d2a84c13 100644 --- a/java/ql/lib/qlpack.yml +++ b/java/ql/lib/qlpack.yml @@ -20,7 +20,7 @@ dependencies: codeql/xml: ${workspace} dataExtensions: - ext/*.model.yml - - ext/generated/*.model.yml + - ext/generated/**/*.model.yml - ext/experimental/*.model.yml warnOnImplicitThis: true compileForOverlayEval: true