diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
index 7cbdd3acb3a..ba4c5ffe6a1 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmCodeModelGenerator.cs
@@ -68,7 +68,7 @@ public override async Task WriteAdditionalFiles(string outputPath)
ConfigurationSchema.OptionsRef);
if (schemaContent != null)
{
- var schemaPath = Path.Combine(outputPath, "Generated", "schema", "ConfigurationSchema.json");
+ var schemaPath = Path.Combine(outputPath, "src", "Generated", "schema", "ConfigurationSchema.json");
var schemaDir = Path.GetDirectoryName(schemaPath);
if (schemaDir != null)
{
diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
index c073d186ae8..e58c5ff3a79 100644
--- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
+++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs
@@ -90,7 +90,7 @@ protected virtual string GetSourceProjectFileContent()
var customSchemaPath = Path.Combine(CodeModelGenerator.Instance.Configuration.OutputDirectory, "schema", "ConfigurationSchema.json");
if (!File.Exists(customSchemaPath))
{
- builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"..\Generated\schema\ConfigurationSchema.json", @"\"));
+ builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem(@"Generated\schema\ConfigurationSchema.json", @"\"));
builder.PackItems.Add(new CSharpProjectWriter.CSProjPackItem($@"..\{packageName}.NuGet.targets", @"buildTransitive\netstandard2.0\" + $"{packageName}.targets"));
}
diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj
index 155e2653d9d..cde3e14b047 100644
--- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/SampleTypeSpec.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
index 9bc0d55655e..a71a9e4fd04 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Authentication.ApiKey.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/api-key/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
index 9adda454f93..3a351cdfca3 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Authentication.Http.Custom.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/http/custom/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj
index cc511afb644..ab616d00dca 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Authentication.OAuth2.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/oauth2/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
index a0db46d4c37..b31707d9fbe 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Authentication.Union.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/authentication/union/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj
index a16ed7db93b..e192640ee20 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Client.Structure.Service.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/client-operation-group/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj
index 0b080a1f5ed..ddfabd4261b 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Client.Structure.Service.Default.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/default/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj
index ee07fbfa38f..61e469eeebc 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Client.Structure.Service.Multi.Client.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/multi-client/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj
index 37d7827ffde..60d5bc3d136 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Client.Structure.Service.Renamed.Operation.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/renamed-operation/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj
index e5830fd996a..2dc596e34e8 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Client.Structure.Service.TwoOperationGroup.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/client/structure/two-operation-group/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj
index 9018fac9650..975a58bd719 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Documentation.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/documentation/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj
index 2c5e8aa1116..ef50ac3f6a5 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Encode.Array.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/array/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj
index 6856e4ec83c..e1b3d2e4c6c 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Encode.Bytes.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/bytes/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj
index 6b285b889b3..3066c05859d 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Encode.Datetime.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/datetime/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj
index 0b09a1fa0ba..0ec2ef16ca4 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Encode.Duration.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/duration/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj
index 2f7ab56954a..a33e02214f9 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Encode.Numeric.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/encode/numeric/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj
index 200605ce4ee..c4bcd1cc26e 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/basic/src/Parameters.Basic.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
index 09ffa6a1edd..632267956e9 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/body-optionality/src/Parameters.BodyOptionality.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj
index b953f0a3771..4c2c2e53c53 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/collection-format/src/Parameters.CollectionFormat.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj
index 0dc89295a57..20eae8bd239 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/path/src/Parameters.Path.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj
index f675c78b200..0a3522afdb2 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/query/src/Parameters.Query.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj
index c799a563e0a..3f5f69e6179 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/parameters/spread/src/Parameters.Spread.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
index 0237cec1351..5afd4c7323c 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/src/Payload.ContentNegotiation.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
index d3d1e4c2778..b1f07e8bb25 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/json-merge-patch/src/Payload.JsonMergePatch.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj
index 2fb2c3c4657..b52b73c19fd 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/media-type/src/Payload.MediaType.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj
index 0bd10b19ed0..578b3219500 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/multipart/src/Payload.MultiPart.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj
index 86f22a60ab5..9fdeae7e0a8 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/pageable/src/Payload.Pageable.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj
index 84362a38a77..7031abad3e7 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/src/Payload.Xml.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj
index 158f68bb914..6a9176b7e73 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v1/src/Resiliency.SrvDriven.V1.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj
index 30dae266b12..b7f9308e5b7 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/resiliency/srv-driven/v2/src/Resiliency.SrvDriven.V2.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj
index d28a8cefed3..1fbee0dd12b 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/response/status-code-range/src/Response.StatusCodeRange.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/routes/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj
index 4b2d88403c3..16938248707 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/routes/src/Routes.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
index 903f9748d28..2fe228069b3 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/serialization/encoded-name/json/src/Serialization.EncodedName.Json.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
index 51950f9c6bc..eda2fb6f3aa 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/endpoint/not-defined/src/Server.Endpoint.NotDefined.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj
index 60f9090a352..4da67dc2ac1 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/multiple/src/Server.Path.Multiple.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj
index 5712462d9a7..efb0c0d431e 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/path/single/src/Server.Path.Single.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
index 54f04ffde69..2e7f7d36f4b 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/not-versioned/src/Server.Versions.NotVersioned.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj
index 848695e24eb..78e39157df2 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/server/versions/versioned/src/Server.Versions.Versioned.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
index ae5b66d8100..4e67efb0ab7 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/conditional-request/src/SpecialHeaders.ConditionalRequest.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
index 4a41adcefe4..b003c39b4b7 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-headers/repeatability/src/SpecialHeaders.Repeatability.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj
index c9c5e6ea116..b72f8dce443 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/special-words/src/SpecialWords.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj
index 2a25e1319cc..ac0d5102a0f 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/array/src/Type.Array.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj
index ea98ba17648..947968bf333 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/dictionary/src/Type.Dictionary.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj
index 2b969a7821b..2d84f4c83eb 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/extensible/src/Type.Enum.Extensible.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj
index fcaba6c305f..c3b7f3fcfa0 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/enum/fixed/src/Type.Enum.Fixed.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj
index 7521a83810e..3b980895832 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/empty/src/Type.Model.Empty.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj
index 0ac970a8693..2a13b66e119 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/enum-discriminator/src/Type.Model.Inheritance.EnumDiscriminator.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj
index 315202455ce..316846b25f2 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/nested-discriminator/src/Type.Model.Inheritance.NestedDiscriminator.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj
index 54e293fc407..bce1c6453e4 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/not-discriminated/src/Type.Model.Inheritance.NotDiscriminated.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj
index b2441f862e5..20400292b1b 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/recursive/src/Type.Model.Inheritance.Recursive.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj
index 6682bd9dce1..d3717581700 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/inheritance/single-discriminator/src/Type.Model.Inheritance.SingleDiscriminator.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj
index d1eb6c72547..4f096461b3d 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/usage/src/Type.Model.Usage.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj
index fd033366bfc..11c124b9364 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/model/visibility/src/Type.Model.Visibility.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj
index 5300a4b5bbe..03d3fb00134 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/additional-properties/src/Type.Property.AdditionalProperties.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj
index 7c66e997909..fc1f5e51702 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/nullable/src/Type.Property.Nullable.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj
index 6b53ec32395..c265b27d2b3 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/optionality/src/Type.Property.Optional.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj
index 659d3bd4a6b..bf34932ff9e 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/property/value-types/src/Type.Property.ValueTypes.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj
index 561732ea7a0..611ec9217f9 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/scalar/src/Type.Scalar.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj
index 13c9ea7cc69..200bd190b8b 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/src/Type.Union.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj
index 0ed1430ba64..1451c8c51bb 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v1/src/Versioning.Added.V1.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj
index c8710de28ca..dd7d592b56e 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/added/v2/src/Versioning.Added.V2.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj
index 6a063928b6a..994bc1f36a3 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v1/src/Versioning.MadeOptional.V1.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj
index d9239f7a630..9a5dfc75b2f 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/madeOptional/v2/src/Versioning.MadeOptional.V2.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj
index 9e69b204cf9..17b578c2766 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v1/src/Versioning.Removed.V1.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj
index 60dce52797f..dc31849d11f 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2/src/Versioning.Removed.V2.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj
index 75461886517..c0a3b349fda 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/removed/v2Preview/src/Versioning.Removed.V2Preview.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj
index e9c80186542..83f01b3744f 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v1/src/Versioning.RenamedFrom.V1.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj
index 9c47fb00259..af79e6056da 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/renamedFrom/v2/src/Versioning.RenamedFrom.V2.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj
index 5c7638126c2..4b9773d29e9 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v1/src/Versioning.ReturnTypeChangedFrom.V1.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj
index 5196830b4c4..f4f80ff657d 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/returnTypeChangedFrom/v2/src/Versioning.ReturnTypeChangedFrom.V2.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj
index b0ef8e1aa5e..7302fcce58a 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v1/src/Versioning.TypeChangedFrom.V1.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Generated/schema/ConfigurationSchema.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json
similarity index 100%
rename from packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/Generated/schema/ConfigurationSchema.json
rename to packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Generated/schema/ConfigurationSchema.json
diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj
index 3f003acf02c..865911c2952 100644
--- a/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj
+++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/versioning/typeChangedFrom/v2/src/Versioning.TypeChangedFrom.V2.csproj
@@ -14,7 +14,7 @@
-
+