diff --git a/cpp/ql/lib/ext/generated/brotli/brotli.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/brotli/brotli.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/brotli/brotli.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/brotli/brotli.model.yml
diff --git a/cpp/ql/lib/ext/generated/curl/curl.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/curl/curl.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/curl/curl.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/curl/curl.model.yml
diff --git a/cpp/ql/lib/ext/generated/glibc/glibc.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/glibc/glibc.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/glibc/glibc.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/glibc/glibc.model.yml
diff --git a/cpp/ql/lib/ext/generated/libidn2/libidn2.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/libidn2/libidn2.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/libidn2/libidn2.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/libidn2/libidn2.model.yml
diff --git a/cpp/ql/lib/ext/generated/libssh2/libssh2.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/libssh2/libssh2.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/libssh2/libssh2.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/libssh2/libssh2.model.yml
diff --git a/cpp/ql/lib/ext/generated/libuv/libuv.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/libuv/libuv.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/libuv/libuv.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/libuv/libuv.model.yml
diff --git a/cpp/ql/lib/ext/generated/nghttp2/nghttp2.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/nghttp2/nghttp2.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/nghttp2/nghttp2.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/nghttp2/nghttp2.model.yml
diff --git a/cpp/ql/lib/ext/generated/openssl/openssl.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/openssl/openssl.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/openssl/openssl.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/openssl/openssl.model.yml
diff --git a/cpp/ql/lib/ext/generated/sqlite/sqlite.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/sqlite/sqlite.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/sqlite/sqlite.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/sqlite/sqlite.model.yml
diff --git a/cpp/ql/lib/ext/generated/zlib/zlib.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/zlib/zlib.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/zlib/zlib.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/zlib/zlib.model.yml
diff --git a/csharp/ql/lib/ext/generated/Generators.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Generators.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Generators.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Generators.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.IBC.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.IBC.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Arm.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.Arm.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Arm.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.Arm.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Arm64.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.Arm64.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Arm64.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.Arm64.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.LoongArch64.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.LoongArch64.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.LoongArch64.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.LoongArch64.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.MachO.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.MachO.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.MachO.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.MachO.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.RiscV64.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.RiscV64.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.RiscV64.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.RiscV64.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.x86.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.x86.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.x86.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.Reflection.ReadyToRun.x86.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILCompiler.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILCompiler.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILCompiler.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.CodeFix.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.CodeFix.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.CodeFix.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.CodeFix.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.DataFlow.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.RoslynAnalyzer.DataFlow.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.DataFlow.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.RoslynAnalyzer.DataFlow.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.RoslynAnalyzer.TrimAnalysis.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.RoslynAnalyzer.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.RoslynAnalyzer.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.RoslynAnalyzer.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.Shared.DataFlow.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.Shared.DataFlow.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.Shared.DataFlow.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.Shared.TrimAnalysis.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.Shared.TrimAnalysis.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.Shared.TrimAnalysis.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.Shared.TrimAnalysis.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.Shared.TypeSystemProxy.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.Shared.TypeSystemProxy.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.Shared.TypeSystemProxy.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.Shared.TypeSystemProxy.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.Shared.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.Shared.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.Shared.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.Shared.model.yml
diff --git a/csharp/ql/lib/ext/generated/ILLink.Tasks.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/ILLink.Tasks.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/ILLink.Tasks.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/ILLink.Tasks.model.yml
diff --git a/csharp/ql/lib/ext/generated/Internal.IL.Stubs.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Internal.IL.Stubs.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Internal.IL.Stubs.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Internal.IL.Stubs.model.yml
diff --git a/csharp/ql/lib/ext/generated/Internal.IL.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Internal.IL.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Internal.IL.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Internal.IL.model.yml
diff --git a/csharp/ql/lib/ext/generated/Internal.NativeFormat.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Internal.NativeFormat.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Internal.NativeFormat.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Internal.NativeFormat.model.yml
diff --git a/csharp/ql/lib/ext/generated/Internal.Pgo.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Internal.Pgo.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Internal.Pgo.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Internal.Pgo.model.yml
diff --git a/csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Internal.TypeSystem.Ecma.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Internal.TypeSystem.Ecma.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Internal.TypeSystem.Ecma.model.yml
diff --git a/csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Internal.TypeSystem.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Internal.TypeSystem.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Internal.TypeSystem.model.yml
diff --git a/csharp/ql/lib/ext/generated/Internal.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Internal.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Internal.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Internal.model.yml
diff --git a/csharp/ql/lib/ext/generated/IntrinsicsInSystemPrivateCoreLib.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/IntrinsicsInSystemPrivateCoreLib.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/IntrinsicsInSystemPrivateCoreLib.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/IntrinsicsInSystemPrivateCoreLib.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.CSharp.RuntimeBinder.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.CSharp.RuntimeBinder.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.CSharp.RuntimeBinder.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.CSharp.RuntimeBinder.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.CSharp.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.CSharp.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.CSharp.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.CSharp.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.JitTrace.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Diagnostics.JitTrace.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Diagnostics.JitTrace.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Diagnostics.JitTrace.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Diagnostics.Tools.Pgo.TypeRefTypeSystem.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Diagnostics.Tools.Pgo.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Diagnostics.Tools.Pgo.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Diagnostics.Tools.Pgo.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.DotNet.Build.Tasks.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.DotNet.Build.Tasks.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.DotNet.Build.Tasks.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.DotNet.Build.Tasks.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.DotNet.PlatformAbstractions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.DotNet.PlatformAbstractions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.DotNet.PlatformAbstractions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.DotNet.PlatformAbstractions.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Distributed.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Caching.Distributed.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Distributed.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Caching.Distributed.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Hybrid.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Caching.Hybrid.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Hybrid.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Caching.Hybrid.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Memory.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Caching.Memory.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Caching.Memory.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Caching.Memory.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Binder.SourceGeneration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Binder.SourceGeneration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Binder.SourceGeneration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Binder.SourceGeneration.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.CommandLine.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.CommandLine.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.CommandLine.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.CommandLine.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.EnvironmentVariables.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.EnvironmentVariables.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.EnvironmentVariables.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.EnvironmentVariables.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Ini.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Ini.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Ini.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Ini.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Json.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Json.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Json.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Json.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Memory.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Memory.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Memory.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Memory.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.UserSecrets.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.UserSecrets.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.UserSecrets.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Xml.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Xml.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.Xml.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.Xml.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Configuration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Configuration.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Extensions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyInjection.Extensions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Extensions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyInjection.Extensions.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.Fakes.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyInjection.Specification.Fakes.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.Fakes.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyInjection.Specification.Fakes.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyInjection.Specification.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.Specification.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyInjection.Specification.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyInjection.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyInjection.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyInjection.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyModel.Resolution.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.Resolution.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyModel.Resolution.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyModel.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.DependencyModel.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.DependencyModel.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Diagnostics.Metrics.Configuration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Diagnostics.Metrics.Configuration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Diagnostics.Metrics.Configuration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Diagnostics.Metrics.Configuration.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Diagnostics.Metrics.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Diagnostics.Metrics.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Diagnostics.Metrics.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Diagnostics.Metrics.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Composite.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileProviders.Composite.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Composite.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileProviders.Composite.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Internal.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileProviders.Internal.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Internal.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileProviders.Internal.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Physical.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileProviders.Physical.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.Physical.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileProviders.Physical.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileProviders.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileProviders.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileProviders.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Abstractions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Abstractions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Abstractions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Abstractions.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Internal.PathSegments.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Internal.PatternContexts.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Internal.Patterns.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Internal.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.Internal.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.Internal.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.FileSystemGlobbing.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.FileSystemGlobbing.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.Internal.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Hosting.Internal.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.Internal.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Hosting.Internal.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.Systemd.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Hosting.Systemd.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.Systemd.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Hosting.Systemd.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.WindowsServices.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Hosting.WindowsServices.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.WindowsServices.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Hosting.WindowsServices.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Hosting.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Hosting.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Hosting.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.Logging.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Http.Logging.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.Logging.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Http.Logging.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Http.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Http.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Http.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Internal.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Internal.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Internal.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Internal.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Abstractions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Abstractions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Abstractions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Abstractions.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Configuration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Configuration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Configuration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Configuration.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Console.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Console.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Console.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Console.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Debug.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Debug.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Debug.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Debug.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.EventLog.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.EventLog.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.EventLog.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.EventLog.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.EventSource.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.EventSource.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.EventSource.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.EventSource.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Generators.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Generators.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.Generators.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.Generators.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.TraceSource.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.TraceSource.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.TraceSource.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.TraceSource.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Logging.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Logging.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.Generators.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Options.Generators.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.Generators.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Options.Generators.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Options.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Options.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Options.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Extensions.Primitives.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Primitives.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Extensions.Primitives.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Extensions.Primitives.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Interop.Analyzers.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Interop.Analyzers.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Interop.Analyzers.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Interop.Analyzers.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Interop.JavaScript.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Interop.JavaScript.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Interop.JavaScript.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Interop.JavaScript.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Interop.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Interop.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Interop.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.NET.Build.Tasks.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.NET.Build.Tasks.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.NET.Build.Tasks.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.NET.Build.Tasks.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.NETCore.Platforms.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.NETCore.Platforms.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.NETCore.Platforms.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.NETCore.Platforms.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.CompilerServices.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.VisualBasic.CompilerServices.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.VisualBasic.CompilerServices.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.VisualBasic.CompilerServices.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.FileIO.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.VisualBasic.FileIO.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.VisualBasic.FileIO.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.VisualBasic.FileIO.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.VisualBasic.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.VisualBasic.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.VisualBasic.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.VisualBasic.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Win32.SafeHandles.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Win32.SafeHandles.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Win32.SafeHandles.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Win32.SafeHandles.model.yml
diff --git a/csharp/ql/lib/ext/generated/Microsoft.Win32.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Win32.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Microsoft.Win32.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Microsoft.Win32.model.yml
diff --git a/csharp/ql/lib/ext/generated/Mono.Linker.Dataflow.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Mono.Linker.Dataflow.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Mono.Linker.Dataflow.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Mono.Linker.Dataflow.model.yml
diff --git a/csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Mono.Linker.Steps.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Mono.Linker.Steps.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Mono.Linker.Steps.model.yml
diff --git a/csharp/ql/lib/ext/generated/Mono.Linker.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/Mono.Linker.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/Mono.Linker.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/Mono.Linker.model.yml
diff --git a/csharp/ql/lib/ext/generated/SourceGenerators.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/SourceGenerators.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/SourceGenerators.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/SourceGenerators.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Buffers.Binary.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Buffers.Binary.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Buffers.Binary.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Buffers.Binary.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Buffers.Text.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Buffers.Text.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Buffers.Text.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Buffers.Text.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Buffers.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Buffers.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Buffers.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Buffers.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.CodeDom.Compiler.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.CodeDom.Compiler.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.CodeDom.Compiler.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.CodeDom.Compiler.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.CodeDom.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.CodeDom.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.CodeDom.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.CodeDom.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Concurrent.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Concurrent.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Collections.Concurrent.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Concurrent.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Frozen.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Collections.Frozen.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Frozen.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Generic.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Collections.Generic.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Generic.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Immutable.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Immutable.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Collections.Immutable.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Immutable.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Collections.ObjectModel.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Collections.ObjectModel.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Collections.ObjectModel.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Collections.ObjectModel.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Collections.Specialized.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Specialized.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Collections.Specialized.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Collections.Specialized.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Collections.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Collections.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Collections.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Collections.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Hosting.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.Hosting.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Hosting.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.Hosting.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Primitives.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.Primitives.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Primitives.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.Primitives.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.ReflectionModel.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.ReflectionModel.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.Composition.ReflectionModel.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.ReflectionModel.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Registration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.Registration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.Composition.Registration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.Registration.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Composition.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.Composition.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Composition.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.Schema.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.DataAnnotations.Schema.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.Schema.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.DataAnnotations.Schema.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.DataAnnotations.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.DataAnnotations.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.DataAnnotations.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Design.Serialization.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Design.Serialization.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.Design.Serialization.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Design.Serialization.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.Design.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Design.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.Design.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.Design.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ComponentModel.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ComponentModel.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ComponentModel.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Composition.Convention.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Composition.Convention.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Composition.Convention.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Composition.Convention.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Composition.Hosting.Core.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Composition.Hosting.Core.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Composition.Hosting.Core.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Composition.Hosting.Core.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Composition.Hosting.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Composition.Hosting.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Composition.Hosting.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Composition.Hosting.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Composition.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Composition.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Composition.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Composition.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Configuration.Internal.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Configuration.Internal.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Configuration.Internal.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Configuration.Internal.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Configuration.Provider.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Configuration.Provider.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Configuration.Provider.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Configuration.Provider.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Configuration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Configuration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Configuration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Configuration.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Data.Common.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Data.Common.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Data.Common.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Data.Common.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Data.Odbc.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Data.Odbc.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Data.Odbc.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Data.Odbc.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Data.OleDb.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Data.OleDb.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Data.OleDb.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Data.OleDb.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Data.OracleClient.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Data.OracleClient.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Data.OracleClient.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Data.OracleClient.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Data.SqlClient.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Data.SqlClient.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Data.SqlClient.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Data.SqlClient.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Data.SqlTypes.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Data.SqlTypes.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Data.SqlTypes.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Data.SqlTypes.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Data.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Data.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Data.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Data.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.CodeAnalysis.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.CodeAnalysis.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Diagnostics.CodeAnalysis.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.CodeAnalysis.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.Contracts.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.Contracts.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Diagnostics.Contracts.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.Contracts.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.Eventing.Reader.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.Eventing.Reader.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Diagnostics.Eventing.Reader.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.Eventing.Reader.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.Metrics.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.Metrics.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Diagnostics.Metrics.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.Metrics.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.PerformanceData.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.PerformanceData.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Diagnostics.PerformanceData.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.PerformanceData.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.SymbolStore.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.SymbolStore.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Diagnostics.SymbolStore.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.SymbolStore.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.Tracing.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.Tracing.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Diagnostics.Tracing.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.Tracing.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Diagnostics.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Diagnostics.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Diagnostics.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.DirectoryServices.AccountManagement.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.DirectoryServices.AccountManagement.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.DirectoryServices.AccountManagement.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.DirectoryServices.AccountManagement.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.DirectoryServices.ActiveDirectory.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.DirectoryServices.ActiveDirectory.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.DirectoryServices.ActiveDirectory.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.DirectoryServices.ActiveDirectory.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.DirectoryServices.Protocols.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.DirectoryServices.Protocols.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.DirectoryServices.Protocols.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.DirectoryServices.Protocols.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.DirectoryServices.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.DirectoryServices.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.DirectoryServices.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.DirectoryServices.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Drawing.Printing.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Drawing.Printing.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Drawing.Printing.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Drawing.Printing.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Drawing.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Drawing.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Drawing.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Drawing.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Dynamic.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Dynamic.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Dynamic.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Dynamic.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Formats.Asn1.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Formats.Asn1.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Formats.Asn1.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Formats.Asn1.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Formats.Cbor.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Formats.Cbor.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Formats.Cbor.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Formats.Cbor.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Formats.Nrbf.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Formats.Nrbf.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Formats.Nrbf.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Formats.Nrbf.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Formats.Tar.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Formats.Tar.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Formats.Tar.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Formats.Tar.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Globalization.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Globalization.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Globalization.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Globalization.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.Compression.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.Compression.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.Compression.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.Compression.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.Enumeration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.Enumeration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.Enumeration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.Enumeration.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.Hashing.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.Hashing.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.Hashing.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.Hashing.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.IsolatedStorage.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.IsolatedStorage.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.IsolatedStorage.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.IsolatedStorage.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.MemoryMappedFiles.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.MemoryMappedFiles.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.MemoryMappedFiles.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.MemoryMappedFiles.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.Packaging.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.Packaging.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.Packaging.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.Packaging.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.Pipelines.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.Pipelines.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.Pipelines.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.Pipelines.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.Pipes.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.Pipes.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.Pipes.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.Pipes.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.Ports.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.Ports.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.Ports.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.Ports.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.IO.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.IO.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.IO.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.IO.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Linq.Expressions.Interpreter.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Linq.Expressions.Interpreter.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Linq.Expressions.Interpreter.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Linq.Expressions.Interpreter.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Linq.Expressions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Linq.Expressions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Linq.Expressions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Linq.Expressions.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Linq.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Linq.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Linq.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Linq.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Management.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Management.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Management.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Management.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Media.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Media.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Media.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Media.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Cache.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Cache.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Cache.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Cache.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.Headers.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Http.Headers.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Http.Headers.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Http.Headers.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.Json.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Http.Json.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Http.Json.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Http.Json.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.Metrics.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Http.Metrics.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Http.Metrics.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Http.Metrics.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Http.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Http.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Http.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Http.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Mail.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Mail.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Mail.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Mail.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Mime.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Mime.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Mime.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Mime.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.NetworkInformation.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.NetworkInformation.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.NetworkInformation.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.NetworkInformation.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.PeerToPeer.Collaboration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.PeerToPeer.Collaboration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.PeerToPeer.Collaboration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.PeerToPeer.Collaboration.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.PeerToPeer.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.PeerToPeer.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.PeerToPeer.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.PeerToPeer.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Quic.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Quic.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Quic.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Quic.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Security.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Security.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Security.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Security.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.ServerSentEvents.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.ServerSentEvents.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.ServerSentEvents.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.ServerSentEvents.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.Sockets.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.Sockets.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.Sockets.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.Sockets.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.WebSockets.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.WebSockets.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.WebSockets.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.WebSockets.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Net.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Net.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Net.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Net.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Numerics.Tensors.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Numerics.Tensors.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Numerics.Tensors.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Numerics.Tensors.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Numerics.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Numerics.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Numerics.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Numerics.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Context.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.Context.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Reflection.Context.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.Context.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Emit.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.Emit.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Reflection.Emit.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.Emit.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Metadata.Ecma335.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.Metadata.Ecma335.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Reflection.Metadata.Ecma335.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.Metadata.Ecma335.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.Metadata.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.Metadata.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Reflection.Metadata.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.Metadata.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.PortableExecutable.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.PortableExecutable.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Reflection.PortableExecutable.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.PortableExecutable.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Reflection.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Reflection.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Reflection.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Resources.Extensions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Resources.Extensions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Resources.Extensions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Resources.Extensions.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Resources.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Resources.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Resources.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Resources.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Caching.Hosting.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Caching.Hosting.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Caching.Hosting.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Caching.Hosting.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Caching.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Caching.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Caching.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Caching.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.CompilerServices.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.CompilerServices.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.CompilerServices.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.CompilerServices.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.ConstrainedExecution.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.ConstrainedExecution.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.ConstrainedExecution.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.ConstrainedExecution.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.ExceptionServices.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.ExceptionServices.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.ExceptionServices.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.ExceptionServices.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.ComTypes.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.ComTypes.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.InteropServices.ComTypes.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.ComTypes.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Java.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.Java.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Java.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.Java.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.JavaScript.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.JavaScript.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.InteropServices.JavaScript.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.JavaScript.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Marshalling.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.Marshalling.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Marshalling.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.Marshalling.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.ObjectiveC.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.ObjectiveC.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.InteropServices.ObjectiveC.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.ObjectiveC.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Swift.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.Swift.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.InteropServices.Swift.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.Swift.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.InteropServices.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.InteropServices.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.InteropServices.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.Arm.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Intrinsics.Arm.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.Arm.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Intrinsics.Arm.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.Wasm.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Intrinsics.Wasm.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.Wasm.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Intrinsics.Wasm.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.X86.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Intrinsics.X86.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.X86.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Intrinsics.X86.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Intrinsics.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Intrinsics.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Intrinsics.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Loader.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Loader.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Loader.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Loader.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Remoting.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Remoting.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Remoting.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Remoting.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.DataContracts.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Serialization.DataContracts.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Serialization.DataContracts.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Serialization.DataContracts.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.Formatters.Binary.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Serialization.Formatters.Binary.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Serialization.Formatters.Binary.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Serialization.Formatters.Binary.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.Json.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Serialization.Json.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Serialization.Json.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Serialization.Json.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Serialization.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Serialization.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Serialization.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Serialization.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.Versioning.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Versioning.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.Versioning.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.Versioning.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Runtime.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Runtime.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Runtime.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.AccessControl.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.AccessControl.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.AccessControl.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.AccessControl.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Authentication.ExtendedProtection.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Authentication.ExtendedProtection.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Authentication.ExtendedProtection.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Authentication.ExtendedProtection.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Authentication.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Authentication.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Authentication.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Authentication.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Claims.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Claims.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Claims.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Claims.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Cose.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.Cose.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Cryptography.Cose.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.Cose.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Pkcs.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.Pkcs.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Cryptography.Pkcs.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.Pkcs.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.X509Certificates.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.X509Certificates.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Cryptography.X509Certificates.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.X509Certificates.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.Xml.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.Xml.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Cryptography.Xml.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.Xml.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Cryptography.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Cryptography.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Permissions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Permissions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Permissions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Permissions.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Policy.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Policy.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Policy.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Policy.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.Principal.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.Principal.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.Principal.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.Principal.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Security.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Security.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Security.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Security.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ServiceModel.Syndication.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ServiceModel.Syndication.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ServiceModel.Syndication.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ServiceModel.Syndication.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.ServiceProcess.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.ServiceProcess.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.ServiceProcess.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.ServiceProcess.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Speech.AudioFormat.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Speech.AudioFormat.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Speech.AudioFormat.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Speech.AudioFormat.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Speech.Recognition.SrgsGrammar.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Speech.Recognition.SrgsGrammar.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Speech.Recognition.SrgsGrammar.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Speech.Recognition.SrgsGrammar.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Speech.Recognition.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Speech.Recognition.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Speech.Recognition.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Speech.Recognition.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Speech.Synthesis.TtsEngine.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Speech.Synthesis.TtsEngine.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Speech.Synthesis.TtsEngine.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Speech.Synthesis.TtsEngine.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Speech.Synthesis.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Speech.Synthesis.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Speech.Synthesis.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Speech.Synthesis.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.Encodings.Web.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.Encodings.Web.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.Encodings.Web.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.Encodings.Web.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.Nodes.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.Nodes.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.Json.Nodes.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.Nodes.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.Schema.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.Schema.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.Json.Schema.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.Schema.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.Metadata.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.Serialization.Metadata.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.Json.Serialization.Metadata.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.Serialization.Metadata.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.Serialization.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.Serialization.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.Json.Serialization.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.Serialization.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.SourceGeneration.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.SourceGeneration.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.Json.SourceGeneration.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.SourceGeneration.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.Json.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.Json.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.Json.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.RegularExpressions.Generator.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.RegularExpressions.Generator.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.RegularExpressions.Generator.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.RegularExpressions.Generator.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.RegularExpressions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.RegularExpressions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.RegularExpressions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.RegularExpressions.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.Unicode.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.Unicode.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.Unicode.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.Unicode.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Text.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Text.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Text.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Text.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Threading.Channels.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Threading.Channels.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Threading.Channels.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Threading.Channels.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Threading.RateLimiting.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Threading.RateLimiting.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Threading.RateLimiting.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Threading.RateLimiting.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Threading.Tasks.Dataflow.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Threading.Tasks.Dataflow.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Threading.Tasks.Dataflow.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Threading.Tasks.Sources.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Threading.Tasks.Sources.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Threading.Tasks.Sources.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Threading.Tasks.Sources.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Threading.Tasks.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Threading.Tasks.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Threading.Tasks.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Threading.Tasks.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Threading.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Threading.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Threading.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Threading.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Timers.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Timers.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Timers.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Timers.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Transactions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Transactions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Transactions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Transactions.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Web.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Web.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Web.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Web.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Windows.Input.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Windows.Input.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Windows.Input.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Windows.Input.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Windows.Markup.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Windows.Markup.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Windows.Markup.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Windows.Markup.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xaml.Permissions.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xaml.Permissions.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xaml.Permissions.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xaml.Permissions.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Linq.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Linq.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xml.Linq.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Linq.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Resolvers.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Resolvers.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xml.Resolvers.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Resolvers.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Schema.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Schema.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xml.Schema.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Schema.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Serialization.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Serialization.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xml.Serialization.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Serialization.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xml.XPath.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xml.XPath.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xml.XPath.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xml.XPath.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Xsl.Runtime.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Xsl.Runtime.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xml.Xsl.Runtime.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Xsl.Runtime.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xml.Xsl.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Xsl.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xml.Xsl.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xml.Xsl.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.Xml.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.Xml.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.Xml.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.Xml.model.yml
diff --git a/csharp/ql/lib/ext/generated/System.model.yml b/csharp/ql/lib/ext/generated/modelgenerator/System.model.yml
similarity index 100%
rename from csharp/ql/lib/ext/generated/System.model.yml
rename to csharp/ql/lib/ext/generated/modelgenerator/System.model.yml
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 7c906e033ad6..26e332652cdb 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -16,6 +16,6 @@ dependencies:
   codeql/xml: ${workspace}
 dataExtensions:
   - ext/*.model.yml
-  - ext/generated/*.model.yml
+  - ext/generated/**/*.model.yml
 warnOnImplicitThis: true
 compileForOverlayEval: true
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.data.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.data.model.yml
new file mode 100644
index 000000000000..58c4329f8a45
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.data.model.yml
@@ -0,0 +1,8 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.data", "ObjectReader", True, "read", "(Object,Decoder)", "", "Argument[1]", "unsafe-deserialization", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.file.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.file.model.yml
new file mode 100644
index 000000000000..82c552dc4494
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.file.model.yml
@@ -0,0 +1,38 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.file", "DataFileReader", True, "DataFileReader", "(File,DatumReader)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader", True, "openReader", "(File,DatumReader)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileWriter", True, "appendTo", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileWriter", True, "create", "(Schema,File)", "", "Argument[1]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SeekableFileInput", True, "SeekableFileInput", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SyncableFileOutputStream", True, "SyncableFileOutputStream", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SyncableFileOutputStream", True, "SyncableFileOutputStream", "(File,boolean)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SyncableFileOutputStream", True, "SyncableFileOutputStream", "(String)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro.file", "SyncableFileOutputStream", True, "SyncableFileOutputStream", "(String,boolean)", "", "Argument[0]", "path-injection", "ai-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["org.apache.avro.file", "DataFileReader12", True, "getMeta", "(String)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader12", True, "getMetaString", "(String)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader12", True, "getSchema", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader12", True, "iterator", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader12", True, "next", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileReader12", True, "next", "(Object)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "getHeader", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "getMeta", "(String)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "getMetaKeys", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "getMetaString", "(String)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "getSchema", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "iterator", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "next", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "next", "(Object)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "DataFileStream", True, "nextBlock", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "FileReader", True, "getSchema", "()", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "FileReader", True, "next", "(Object)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro.file", "SeekableInput", True, "read", "(byte[],int,int)", "", "Argument[0]", "file", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.generic.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.generic.model.yml
new file mode 100644
index 000000000000..264a472ad51b
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.generic.model.yml
@@ -0,0 +1,9 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.generic", "GenericDatumReader", True, "read", "(Object,Decoder)", "", "Argument[1]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.generic", "GenericDatumReader", True, "read", "(Object,Schema,ResolvingDecoder)", "", "Argument[2]", "unsafe-deserialization", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.io.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.io.model.yml
new file mode 100644
index 000000000000..0e7ad977004b
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.io.model.yml
@@ -0,0 +1,11 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.io", "DatumReader", True, "read", "(Object,Decoder)", "", "Argument[1]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.io", "ExecutionStep", True, "execute", "(Object,Decoder)", "", "Argument[1]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.io", "FieldReader", True, "read", "(Object,Decoder)", "", "Argument[1]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.io", "RecordReader", True, "read", "(Object,Decoder)", "", "Argument[1]", "unsafe-deserialization", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.message.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.message.model.yml
new file mode 100644
index 000000000000..2576630571e9
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.message.model.yml
@@ -0,0 +1,20 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.message", "BaseDecoder", True, "decode", "(ByteBuffer)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "BaseDecoder", True, "decode", "(ByteBuffer,Object)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "BaseDecoder", True, "decode", "(InputStream)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "BaseDecoder", True, "decode", "(byte[])", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "BaseDecoder", True, "decode", "(byte[],Object)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "BinaryMessageDecoder", True, "decode", "(InputStream,Object)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "MessageDecoder", True, "decode", "(ByteBuffer)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "MessageDecoder", True, "decode", "(ByteBuffer,Object)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "MessageDecoder", True, "decode", "(InputStream)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "MessageDecoder", True, "decode", "(InputStream,Object)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "MessageDecoder", True, "decode", "(byte[])", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "MessageDecoder", True, "decode", "(byte[],Object)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.message", "RawMessageDecoder", True, "decode", "(InputStream,Object)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.model.yml
new file mode 100644
index 000000000000..670e3d74565c
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.model.yml
@@ -0,0 +1,22 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro", "Parser", True, "parse", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "Protocol", True, "parse", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "Schema", True, "parse", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(File)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(File,Charset)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(Path)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(Path,Charset)", "", "Argument[0]", "path-injection", "ai-generated"]
+      - ["org.apache.avro", "SchemaParser", True, "parse", "(URI,Charset)", "", "Argument[0]", "request-forgery", "ai-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["org.apache.avro", "Parser", True, "parse", "(File)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro", "Protocol", True, "parse", "(File)", "", "ReturnValue", "file", "ai-generated"]
+      - ["org.apache.avro", "Schema", True, "parse", "(File)", "", "ReturnValue", "file", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.reflect.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.reflect.model.yml
new file mode 100644
index 000000000000..e4959b47daf8
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.reflect.model.yml
@@ -0,0 +1,14 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.reflect", "CustomEncoding", True, "read", "(Object,Decoder)", "", "Argument[1]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.reflect", "ReflectDatumReader", True, "read", "(Object,Schema,ResolvingDecoder)", "", "Argument[2]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.reflect", "ReflectDatumReader", True, "readArray", "(Object,Schema,ResolvingDecoder)", "", "Argument[2]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.reflect", "ReflectDatumReader", True, "readBytes", "(Object,Schema,Decoder)", "", "Argument[2]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.reflect", "ReflectDatumReader", True, "readField", "(Object,Schema$Field,Object,ResolvingDecoder,Object)", "", "Argument[3]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.reflect", "ReflectDatumReader", True, "readInt", "(Object,Schema,Decoder)", "", "Argument[2]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.reflect", "ReflectDatumReader", True, "readString", "(Object,Decoder)", "", "Argument[1]", "unsafe-deserialization", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.specific.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.specific.model.yml
new file mode 100644
index 000000000000..1a3a1dec5388
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.specific.model.yml
@@ -0,0 +1,13 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.specific", "SpecificDatumReader", True, "readField", "(Object,Schema$Field,Object,ResolvingDecoder,Object)", "", "Argument[3]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.specific", "SpecificDatumReader", True, "readRecord", "(Object,Schema,ResolvingDecoder)", "", "Argument[2]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.specific", "SpecificExceptionBase", True, "readExternal", "(ObjectInput)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.specific", "SpecificFixed", True, "readExternal", "(ObjectInput)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.specific", "SpecificRecordBase", True, "customDecode", "(ResolvingDecoder)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
+      - ["org.apache.avro.specific", "SpecificRecordBase", True, "readExternal", "(ObjectInput)", "", "Argument[0]", "unsafe-deserialization", "ai-generated"]
diff --git a/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.util.model.yml b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.util.model.yml
new file mode 100644
index 000000000000..dc60add6c93a
--- /dev/null
+++ b/java/ql/lib/ext/generated/llmgenerator/org.apache.avro.util.model.yml
@@ -0,0 +1,13 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+# Generated from https://github.com/apache/avro.git#79017ee391c04f60bdffd5fecf9ecc27c1b1f420 by codeql-mads-via-llm
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["org.apache.avro.util", "RandomData", True, "main", "(String[])", "", "Argument[0]", "path-injection", "ai-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["org.apache.avro.util", "RandomData", True, "main", "(String[])", "", "Argument[0]", "commandargs", "ai-generated"]
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
diff --git a/misc/scripts/models-as-data/generate_mad.py b/misc/scripts/models-as-data/generate_mad.py
index 5eeac91d8571..9e6c5516b492 100755
--- a/misc/scripts/models-as-data/generate_mad.py
+++ b/misc/scripts/models-as-data/generate_mad.py
@@ -31,7 +31,7 @@ def parseData(data):
 
 description = """\
 This generates summary, source, sink and neutral models for the code in the database.
-The files will be placed in `LANGUAGE/ql/lib/ext/generated/DIR`"""
+The files will be placed in `LANGUAGE/ql/lib/ext/generated/modelgenerator/DIR`"""
 
 epilog = """\
 Example invocations:
@@ -67,7 +67,7 @@ def setenvironment(self, database=None, folder=None):
         self.database = database or self.database
         self.folder = folder or self.folder
         self.generated_frameworks = os.path.join(
-            self.codeql_root, f"{self.language}/ql/lib/ext/generated/{self.folder}"
+            self.codeql_root, f"{self.language}/ql/lib/ext/generated/modelgenerator/{self.folder}"
         )
         self.workDir = tempfile.mkdtemp()
         if self.ram is None:
diff --git a/rust/ql/lib/ext/generated/actix-web.model.yml b/rust/ql/lib/ext/generated/modelgenerator/actix-web.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/actix-web.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/actix-web.model.yml
diff --git a/rust/ql/lib/ext/generated/clap.model.yml b/rust/ql/lib/ext/generated/modelgenerator/clap.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/clap.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/clap.model.yml
diff --git a/rust/ql/lib/ext/generated/hyper.model.yml b/rust/ql/lib/ext/generated/modelgenerator/hyper.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/hyper.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/hyper.model.yml
diff --git a/rust/ql/lib/ext/generated/libc.model.yml b/rust/ql/lib/ext/generated/modelgenerator/libc.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/libc.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/libc.model.yml
diff --git a/rust/ql/lib/ext/generated/log.model.yml b/rust/ql/lib/ext/generated/modelgenerator/log.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/log.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/log.model.yml
diff --git a/rust/ql/lib/ext/generated/memchr.model.yml b/rust/ql/lib/ext/generated/modelgenerator/memchr.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/memchr.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/memchr.model.yml
diff --git a/rust/ql/lib/ext/generated/once_cell.model.yml b/rust/ql/lib/ext/generated/modelgenerator/once_cell.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/once_cell.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/once_cell.model.yml
diff --git a/rust/ql/lib/ext/generated/rand.model.yml b/rust/ql/lib/ext/generated/modelgenerator/rand.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/rand.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/rand.model.yml
diff --git a/rust/ql/lib/ext/generated/reqwest.model.yml b/rust/ql/lib/ext/generated/modelgenerator/reqwest.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/reqwest.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/reqwest.model.yml
diff --git a/rust/ql/lib/ext/generated/rust.model.yml b/rust/ql/lib/ext/generated/modelgenerator/rust.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/rust.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/rust.model.yml
diff --git a/rust/ql/lib/ext/generated/serde.model.yml b/rust/ql/lib/ext/generated/modelgenerator/serde.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/serde.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/serde.model.yml
diff --git a/rust/ql/lib/ext/generated/smallvec.model.yml b/rust/ql/lib/ext/generated/modelgenerator/smallvec.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/smallvec.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/smallvec.model.yml
diff --git a/rust/ql/lib/ext/generated/tokio.model.yml b/rust/ql/lib/ext/generated/modelgenerator/tokio.model.yml
similarity index 100%
rename from rust/ql/lib/ext/generated/tokio.model.yml
rename to rust/ql/lib/ext/generated/modelgenerator/tokio.model.yml