diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/App.config b/samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/App.config
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/App.config
rename to samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/App.config
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/ControlAndDataPlane.csproj b/samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/ControlAndDataPlane.csproj
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/ControlAndDataPlane.csproj
rename to samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/ControlAndDataPlane.csproj
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/ControlAndDataPlane.sln b/samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/ControlAndDataPlane.sln
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/ControlAndDataPlane.sln
rename to samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/ControlAndDataPlane.sln
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/Program.cs b/samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/Program.cs
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/Program.cs
rename to samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/Program.cs
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/Properties/AssemblyInfo.cs b/samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/Properties/AssemblyInfo.cs
rename to samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/Properties/AssemblyInfo.cs
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/README.md b/samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/README.md
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/README.md
rename to samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/README.md
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/packages.config b/samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/packages.config
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/Rbac/ControlAndDataPlane/packages.config
rename to samples/DotNet/Microsoft.ServiceBus/ControlAndDataPlane/packages.config
diff --git a/samples/Management/DotNet/EventHubsManagementSample.sln b/samples/Management/DotNet/EventHubsManagementSample/EventHubsManagementSample.sln
similarity index 100%
rename from samples/Management/DotNet/EventHubsManagementSample.sln
rename to samples/Management/DotNet/EventHubsManagementSample/EventHubsManagementSample.sln
diff --git a/samples/Management/DotNet/README.md b/samples/Management/DotNet/EventHubsManagementSample/README.md
similarity index 100%
rename from samples/Management/DotNet/README.md
rename to samples/Management/DotNet/EventHubsManagementSample/README.md
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient.sln b/samples/Management/DotNet/GeoDRClient/GeoDRClient.sln
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient.sln
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient.sln
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/App.config b/samples/Management/DotNet/GeoDRClient/GeoDRClient/App.config
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/App.config
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient/App.config
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/GeoDRClient.csproj b/samples/Management/DotNet/GeoDRClient/GeoDRClient/GeoDRClient.csproj
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/GeoDRClient.csproj
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient/GeoDRClient.csproj
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/GeoDRConfig.cs b/samples/Management/DotNet/GeoDRClient/GeoDRClient/GeoDRConfig.cs
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/GeoDRConfig.cs
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient/GeoDRConfig.cs
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/GeoDRSampleConfig1.json b/samples/Management/DotNet/GeoDRClient/GeoDRClient/GeoDRSampleConfig1.json
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/GeoDRSampleConfig1.json
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient/GeoDRSampleConfig1.json
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/GeoDisasterRecoveryClient.cs b/samples/Management/DotNet/GeoDRClient/GeoDRClient/GeoDisasterRecoveryClient.cs
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/GeoDisasterRecoveryClient.cs
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient/GeoDisasterRecoveryClient.cs
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/JsonHelper.cs b/samples/Management/DotNet/GeoDRClient/GeoDRClient/JsonHelper.cs
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/JsonHelper.cs
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient/JsonHelper.cs
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/Program.cs b/samples/Management/DotNet/GeoDRClient/GeoDRClient/Program.cs
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/Program.cs
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient/Program.cs
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/packages.config b/samples/Management/DotNet/GeoDRClient/GeoDRClient/packages.config
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/GeoDRClient/packages.config
rename to samples/Management/DotNet/GeoDRClient/GeoDRClient/packages.config
diff --git a/samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/readme.md b/samples/Management/DotNet/GeoDRClient/readme.md
similarity index 100%
rename from samples/DotNet/Microsoft.Azure.EventHubs/GeoDRClient/readme.md
rename to samples/Management/DotNet/GeoDRClient/readme.md