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 7c906e033ad..26e332652cd 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