diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDom_GenerateCodeFromMember/vb/module1.vb b/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/module1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDom_GenerateCodeFromMember/vb/module1.vb
rename to snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/module1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CodeProviders/VB/source.vb b/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDom_CodeProviders/VB/source.vb
rename to snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/vbprovider.provideroptions/vb/program.vb b/snippets/visualbasic/Microsoft.VisualBasic/VBCodeProvider/.ctor/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/vbprovider.provideroptions/vb/program.vb
rename to snippets/visualbasic/Microsoft.VisualBasic/VBCodeProvider/.ctor/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeFileHandle.ctor/vb/sample.vb b/snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeFileHandle/.ctor/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeFileHandle.ctor/vb/sample.vb
rename to snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeFileHandle/.ctor/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeFileHandle/vb/sample.vb b/snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeFileHandle/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeFileHandle/vb/sample.vb
rename to snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeFileHandle/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeWaitHandle-ctor/vb/sample.vb b/snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeWaitHandle/.ctor/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeWaitHandle-ctor/vb/sample.vb
rename to snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeWaitHandle/.ctor/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeWaitHandle/vb/sample.vb b/snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeWaitHandle/vb/sample.vb
rename to snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.OpenRemoteBaseKey/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/RegistryHive/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.OpenRemoteBaseKey/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryHive/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RegistryValueOptions/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RegistryValueOptions/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RegistryKey.OpenSubKey/VB/opensubkey.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/OpenSubKey/opensubkey.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RegistryKey.OpenSubKey/VB/opensubkey.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/OpenSubKey/opensubkey.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RegistryKey.OpenSubKey_PermCheck/vb/source.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/OpenSubKey/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RegistryKey.OpenSubKey_PermCheck/vb/source.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/OpenSubKey/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source2.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source2.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RegistrySecurity101/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/SetAccessControl/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RegistrySecurity101/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/SetAccessControl/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.SetValue1/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/SetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.SetValue1/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/SetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ManagedWindowsService/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/SystemEvents/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ManagedWindowsService/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/SystemEvents/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Application.Designer.vb b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Application.myapp b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Application.myapp
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Resources.Designer.vb b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Settings.Designer.vb b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Settings.settings b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Settings.settings
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/assemblyinfo.vb b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/assemblyinfo.vb
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/resources.resx b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/resources.resx
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/My Project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/addinp3hostvb.vbproj b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/addinp3hostvb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/addinp3hostvb.vbproj
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/addinp3hostvb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHost/vb/ListAdaptersHost.vbproj b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Shutdown/ListAdaptersHost.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHost/vb/ListAdaptersHost.vbproj
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Shutdown/ListAdaptersHost.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHost/vb/Program.vb b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Shutdown/Program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHost/vb/Program.vb
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Shutdown/Program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHost/vb/Properties/AssemblyInfo.vb b/snippets/visualbasic/System.AddIn.Hosting/AddInController/Shutdown/Properties/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHost/vb/Properties/AssemblyInfo.vb
rename to snippets/visualbasic/System.AddIn.Hosting/AddInController/Shutdown/Properties/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/Calc1AddInSideAdapter.vbproj b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/Calc1AddInSideAdapter.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/Calc1AddInSideAdapter.vbproj
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/Calc1AddInSideAdapter.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/Calc1ViewToContractAddInSideAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/Calc1ViewToContractAddInSideAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/Calc1ViewToContractAddInSideAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/Calc1ViewToContractAddInSideAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Application.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Application.myapp b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Application.myapp
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Resources.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Settings.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Settings.settings b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Settings.settings
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/assemblyinfo.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/My Project/assemblyinfo.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/resources.resx b/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/resources.resx
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/My Project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/Calc1AddInView.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/Calc1AddInView.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/Calc1AddInView.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/Calc1AddInView.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/Calc1AddInView.vbproj b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/Calc1AddInView.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/Calc1AddInView.vbproj
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/Calc1AddInView.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Application.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Application.myapp b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Application.myapp
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Resources.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Resources.resx b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Resources.resx
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Settings.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Settings.settings b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Settings.settings
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/assemblyinfo.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/My Project/assemblyinfo.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/My Project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/Calc1Contract.vbproj b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/Calc1Contract.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/Calc1Contract.vbproj
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/Calc1Contract.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/ICalc1Contract.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/ICalc1Contract.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/ICalc1Contract.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/ICalc1Contract.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Application.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Application.myapp b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Application.myapp
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Resources.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Resources.resx b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Resources.resx
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Settings.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Settings.settings b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Settings.settings
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/assemblyinfo.vb b/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/My Project/assemblyinfo.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/My Project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/BookInfoContractToViewHostAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/BookInfoContractToViewHostAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/BookInfoContractToViewHostAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/BookInfoContractToViewHostAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/BookInfoHostAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/BookInfoHostAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/BookInfoHostAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/BookInfoHostAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/BookInfoViewToContractHostAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/BookInfoViewToContractHostAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/BookInfoViewToContractHostAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/BookInfoViewToContractHostAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/HostSideAdapters.vbproj b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/HostSideAdapters.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/HostSideAdapters.vbproj
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/HostSideAdapters.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/LibraryManagerContractToViewHostAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/LibraryManagerContractToViewHostAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/LibraryManagerContractToViewHostAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/LibraryManagerContractToViewHostAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/Properties/AssemblyInfo.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/Properties/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/Properties/AssemblyInfo.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/Properties/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/AddInSideAdapters.vbproj b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/AddInSideAdapters.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/AddInSideAdapters.vbproj
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/AddInSideAdapters.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/BookInfoAddInAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/BookInfoAddInAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/BookInfoAddInAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/BookInfoAddInAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/BookInfoContractToViewAddInAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/BookInfoContractToViewAddInAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/BookInfoContractToViewAddInAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/BookInfoContractToViewAddInAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/BookInfoViewToContractAddInAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/BookInfoViewToContractAddInAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/BookInfoViewToContractAddInAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/BookInfoViewToContractAddInAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/LibraryManagerViewToContractAddInAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/LibraryManagerViewToContractAddInAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/LibraryManagerViewToContractAddInAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/LibraryManagerViewToContractAddInAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/Properties/AssemblyInfo.vb b/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/Properties/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/Properties/AssemblyInfo.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/Properties/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/Calc2ContractToViewHostSideAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/Calc2ContractToViewHostSideAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/Calc2ContractToViewHostSideAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/Calc2ContractToViewHostSideAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/Calc2HostSideAdapter.vbproj b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/Calc2HostSideAdapter.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/Calc2HostSideAdapter.vbproj
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/Calc2HostSideAdapter.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Application.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Application.myapp b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Application.myapp
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Resources.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Resources.resx b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Resources.resx
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Settings.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Settings.settings b/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Settings.settings
rename to snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/Calc1ContractToViewHostSideAdapter.vb b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/Calc1ContractToViewHostSideAdapter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/Calc1ContractToViewHostSideAdapter.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/Calc1ContractToViewHostSideAdapter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/Calc1HostSideSideAdapter.vbproj b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/Calc1HostSideSideAdapter.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/Calc1HostSideSideAdapter.vbproj
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/Calc1HostSideSideAdapter.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Application.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Application.myapp b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Application.myapp
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Resources.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Resources.resx b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Resources.resx
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Settings.Designer.vb b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Settings.settings b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Settings.settings
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/assemblyinfo.vb b/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/My Project/assemblyinfo.vb
rename to snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/My Project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/AddInCalcV2.vb b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/AddInCalcV2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/AddInCalcV2.vb
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/AddInCalcV2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/AddInCalcV2.vbproj b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/AddInCalcV2.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/AddInCalcV2.vbproj
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/AddInCalcV2.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Application.Designer.vb b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Application.myapp b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Application.myapp
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Resources.Designer.vb b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Resources.resx b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/My Project/Resources.resx
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Settings.Designer.vb b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Settings.settings b/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/My Project/Settings.settings
rename to snippets/visualbasic/System.AddIn/AddInAttribute/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_CLR/codedomprovider.provideroptions/vb/program.vb b/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/codedomprovider.provideroptions/vb/program.vb
rename to snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb b/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb
rename to snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeGeneratorOptionsExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom.Compiler/CodeGeneratorOptions/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeGeneratorOptionsExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom.Compiler/CodeGeneratorOptions/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb b/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb
rename to snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CompilerResultsExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom.Compiler/CompilerResults/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CompilerResultsExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom.Compiler/CompilerResults/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IndentedTextWriterExample/VB/form1.vb b/snippets/visualbasic/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IndentedTextWriterExample/VB/form1.vb
rename to snippets/visualbasic/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeArgumentReferenceExpressionExample/VB/codeargumentreferenceexpressionexample.vb b/snippets/visualbasic/System.CodeDom/CodeArgumentReferenceExpression/Overview/codeargumentreferenceexpressionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeArgumentReferenceExpressionExample/VB/codeargumentreferenceexpressionexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeArgumentReferenceExpression/Overview/codeargumentreferenceexpressionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeArrayCreateExpressionSnippet/VB/codearraycreateexpressionsnippet.vb b/snippets/visualbasic/System.CodeDom/CodeArrayCreateExpression/Overview/codearraycreateexpressionsnippet.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeArrayCreateExpressionSnippet/VB/codearraycreateexpressionsnippet.vb
rename to snippets/visualbasic/System.CodeDom/CodeArrayCreateExpression/Overview/codearraycreateexpressionsnippet.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeArrayIndexerExpressionSnippet/VB/codearrayindexerexpressionsnippet.vb b/snippets/visualbasic/System.CodeDom/CodeArrayIndexerExpression/Overview/codearrayindexerexpressionsnippet.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeArrayIndexerExpressionSnippet/VB/codearrayindexerexpressionsnippet.vb
rename to snippets/visualbasic/System.CodeDom/CodeArrayIndexerExpression/Overview/codearrayindexerexpressionsnippet.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeAssignStatement/VB/codeassignstatementsnippet.vb b/snippets/visualbasic/System.CodeDom/CodeAssignStatement/Overview/codeassignstatementsnippet.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeAssignStatement/VB/codeassignstatementsnippet.vb
rename to snippets/visualbasic/System.CodeDom/CodeAssignStatement/Overview/codeassignstatementsnippet.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeAttachEventStatementExample/VB/codeattacheventstatementexample.vb b/snippets/visualbasic/System.CodeDom/CodeAttachEventStatement/Overview/codeattacheventstatementexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeAttachEventStatementExample/VB/codeattacheventstatementexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeAttachEventStatement/Overview/codeattacheventstatementexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeBaseReferenceExpressionExample/VB/codebasereferenceexpressionexample.vb b/snippets/visualbasic/System.CodeDom/CodeBaseReferenceExpression/Overview/codebasereferenceexpressionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeBaseReferenceExpressionExample/VB/codebasereferenceexpressionexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeBaseReferenceExpression/Overview/codebasereferenceexpressionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeBinaryOperatorExpression/VB/codebinaryoperatorexpressionexample.vb b/snippets/visualbasic/System.CodeDom/CodeBinaryOperatorExpression/Overview/codebinaryoperatorexpressionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeBinaryOperatorExpression/VB/codebinaryoperatorexpressionexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeBinaryOperatorExpression/Overview/codebinaryoperatorexpressionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeCastExpressionExample/VB/codecastexpressionexample.vb b/snippets/visualbasic/System.CodeDom/CodeCastExpression/Overview/codecastexpressionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeCastExpressionExample/VB/codecastexpressionexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeCastExpression/Overview/codecastexpressionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeTryCatchFinallyExample/VB/codetrycatchfinallyexample.vb b/snippets/visualbasic/System.CodeDom/CodeCatchClause/Overview/codetrycatchfinallyexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeTryCatchFinallyExample/VB/codetrycatchfinallyexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeCatchClause/Overview/codetrycatchfinallyexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeCommentExample/VB/codecommentexample.vb b/snippets/visualbasic/System.CodeDom/CodeComment/Overview/codecommentexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeCommentExample/VB/codecommentexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeComment/Overview/codecommentexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDomHelloWorldSample/vb/program.vb b/snippets/visualbasic/System.CodeDom/CodeCommentStatement/.ctor/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDomHelloWorldSample/vb/program.vb
rename to snippets/visualbasic/System.CodeDom/CodeCommentStatement/.ctor/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDomExample/VB/makefile b/snippets/visualbasic/System.CodeDom/CodeCompileUnit/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDomExample/VB/makefile
rename to snippets/visualbasic/System.CodeDom/CodeCompileUnit/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDomExample/VB/source.vb b/snippets/visualbasic/System.CodeDom/CodeCompileUnit/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDomExample/VB/source.vb
rename to snippets/visualbasic/System.CodeDom/CodeCompileUnit/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeConditionStatementExample/VB/codeconditionstatementexample.vb b/snippets/visualbasic/System.CodeDom/CodeConditionStatement/Overview/codeconditionstatementexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeConditionStatementExample/VB/codeconditionstatementexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeConditionStatement/Overview/codeconditionstatementexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeConstructorExample/VB/codeconstructorexample.vb b/snippets/visualbasic/System.CodeDom/CodeConstructor/Overview/codeconstructorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeConstructorExample/VB/codeconstructorexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeConstructor/Overview/codeconstructorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDelegateInvokeExpressionExample/VB/codedelegateinvokeexpressionexample.vb b/snippets/visualbasic/System.CodeDom/CodeDelegateInvokeExpression/Overview/codedelegateinvokeexpressionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDelegateInvokeExpressionExample/VB/codedelegateinvokeexpressionexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeDelegateInvokeExpression/Overview/codedelegateinvokeexpressionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMultiExample/VB/codemultiexample.vb b/snippets/visualbasic/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMultiExample/VB/codemultiexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeEntryPointMethod/VB/codeentrypointmethodexample.vb b/snippets/visualbasic/System.CodeDom/CodeEntryPointMethod/Overview/codeentrypointmethodexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeEntryPointMethod/VB/codeentrypointmethodexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeEntryPointMethod/Overview/codeentrypointmethodexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeReferenceExample/VB/codereferenceexample.vb b/snippets/visualbasic/System.CodeDom/CodeFieldReferenceExpression/Overview/codereferenceexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeReferenceExample/VB/codereferenceexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeFieldReferenceExpression/Overview/codereferenceexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeGotoStatementExample/VB/codegotostatementexample.vb b/snippets/visualbasic/System.CodeDom/CodeGotoStatement/Overview/codegotostatementexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeGotoStatementExample/VB/codegotostatementexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeGotoStatement/Overview/codegotostatementexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeIterationStatementExample/VB/codeiterationstatementexample.vb b/snippets/visualbasic/System.CodeDom/CodeIterationStatement/Overview/codeiterationstatementexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeIterationStatementExample/VB/codeiterationstatementexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeIterationStatement/Overview/codeiterationstatementexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMemberEventSample/VB/codemembereventexample.vb b/snippets/visualbasic/System.CodeDom/CodeMemberEvent/Overview/codemembereventexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMemberEventSample/VB/codemembereventexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeMemberEvent/Overview/codemembereventexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldInit/VB/program.vb b/snippets/visualbasic/System.CodeDom/CodeMemberField/InitExpression/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldInit/VB/program.vb
rename to snippets/visualbasic/System.CodeDom/CodeMemberField/InitExpression/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldPublicConstExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeMemberField/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldPublicConstExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeMemberField/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldExample/VB/codememberfieldexample.vb b/snippets/visualbasic/System.CodeDom/CodeMemberField/Overview/codememberfieldexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldExample/VB/codememberfieldexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeMemberField/Overview/codememberfieldexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMemberMethodExample/VB/codemembermethodexample.vb b/snippets/visualbasic/System.CodeDom/CodeMemberMethod/Overview/codemembermethodexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMemberMethodExample/VB/codemembermethodexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeMemberMethod/Overview/codemembermethodexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMemberPropertyExample/VB/codememberpropertyexample.vb b/snippets/visualbasic/System.CodeDom/CodeMemberProperty/Overview/codememberpropertyexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMemberPropertyExample/VB/codememberpropertyexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeMemberProperty/Overview/codememberpropertyexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMethodInvokeExpression/VB/codemethodinvokeexpressionexample.vb b/snippets/visualbasic/System.CodeDom/CodeMethodInvokeExpression/Overview/codemethodinvokeexpressionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMethodInvokeExpression/VB/codemethodinvokeexpressionexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeMethodInvokeExpression/Overview/codemethodinvokeexpressionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeMethodReferenceExample/VB/codemethodreferenceexample.vb b/snippets/visualbasic/System.CodeDom/CodeMethodReferenceExpression/Overview/codemethodreferenceexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeMethodReferenceExample/VB/codemethodreferenceexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeMethodReferenceExpression/Overview/codemethodreferenceexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceExample/VB/codenamespaceexample.vb b/snippets/visualbasic/System.CodeDom/CodeNamespace/Overview/codenamespaceexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceExample/VB/codenamespaceexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeNamespace/Overview/codenamespaceexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceImportExample/VB/codenamespaceimportexample.vb b/snippets/visualbasic/System.CodeDom/CodeNamespaceImport/Overview/codenamespaceimportexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceImportExample/VB/codenamespaceimportexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeNamespaceImport/Overview/codenamespaceimportexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExample/VB/codeparameterdeclarationexample.vb b/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpression/Overview/codeparameterdeclarationexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExample/VB/codeparameterdeclarationexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpression/Overview/codeparameterdeclarationexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodePrimitiveExpressionExample/VB/codeprimitiveexpressionexample.vb b/snippets/visualbasic/System.CodeDom/CodePrimitiveExpression/Overview/codeprimitiveexpressionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodePrimitiveExpressionExample/VB/codeprimitiveexpressionexample.vb
rename to snippets/visualbasic/System.CodeDom/CodePrimitiveExpression/Overview/codeprimitiveexpressionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodePropertySetValueExample/VB/codepropertysetvalueexample.vb b/snippets/visualbasic/System.CodeDom/CodePropertySetValueReferenceExpression/Overview/codepropertysetvalueexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodePropertySetValueExample/VB/codepropertysetvalueexample.vb
rename to snippets/visualbasic/System.CodeDom/CodePropertySetValueReferenceExpression/Overview/codepropertysetvalueexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeRemoveEventExample/VB/coderemoveeventexample.vb b/snippets/visualbasic/System.CodeDom/CodeRemoveEventStatement/Overview/coderemoveeventexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeRemoveEventExample/VB/coderemoveeventexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeRemoveEventStatement/Overview/coderemoveeventexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeThrowExceptionStatement/VB/codethrowexceptionstatementexample.vb b/snippets/visualbasic/System.CodeDom/CodeThrowExceptionStatement/Overview/codethrowexceptionstatementexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeThrowExceptionStatement/VB/codethrowexceptionstatementexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeThrowExceptionStatement/Overview/codethrowexceptionstatementexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeTypeConstructorExample/VB/codetypeconstructorexample.vb b/snippets/visualbasic/System.CodeDom/CodeTypeConstructor/Overview/codetypeconstructorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeTypeConstructorExample/VB/codetypeconstructorexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeTypeConstructor/Overview/codetypeconstructorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeDomPartialTypeExample/VB/source.vb b/snippets/visualbasic/System.CodeDom/CodeTypeDeclaration/IsPartial/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeDomPartialTypeExample/VB/source.vb
rename to snippets/visualbasic/System.CodeDom/CodeTypeDeclaration/IsPartial/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationExample/VB/codetypedeclarationexample.vb b/snippets/visualbasic/System.CodeDom/CodeTypeDeclaration/Overview/codetypedeclarationexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationExample/VB/codetypedeclarationexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeTypeDeclaration/Overview/codetypedeclarationexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDelegateExample/VB/codetypedelegateexample.vb b/snippets/visualbasic/System.CodeDom/CodeTypeDelegate/Overview/codetypedelegateexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeTypeDelegateExample/VB/codetypedelegateexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeTypeDelegate/Overview/codetypedelegateexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeTypeOfExample/VB/codetypeofexample.vb b/snippets/visualbasic/System.CodeDom/CodeTypeOfExpression/Overview/codetypeofexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeTypeOfExample/VB/codetypeofexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeTypeOfExpression/Overview/codetypeofexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb b/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb
rename to snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CodeVariableDeclarationStatementExample/VB/codevariabledeclarationstatementexample.vb b/snippets/visualbasic/System.CodeDom/CodeVariableDeclarationStatement/Overview/codevariabledeclarationstatementexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CodeVariableDeclarationStatementExample/VB/codevariabledeclarationstatementexample.vb
rename to snippets/visualbasic/System.CodeDom/CodeVariableDeclarationStatement/Overview/codevariabledeclarationstatementexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IDic/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IDic/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IDicIEqC/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IDicIEqC/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IEqC/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IEqC/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_Int32/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_Int32/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_Int32IEqC/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_Int32IEqC/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source2.vb b/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source2.vb
rename to snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source2.vb b/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source2.vb
rename to snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.LinkedList/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/LinkedListT/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.LinkedList/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/LinkedListT/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_AsReadOnly/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_AsReadOnly/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_Ranges/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_Ranges/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearch/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearch/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearchComparer/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearchComparer/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearchComparerRange/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearchComparerRange/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_CopyTo/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/CopyTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_CopyTo/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/CopyTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_FindEtAl/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/Exists/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_FindEtAl/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/Exists/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/list`1_find_methods/vb/module1.vb b/snippets/visualbasic/System.Collections.Generic/ListT/Find/module1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/list`1_find_methods/vb/module1.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/Find/module1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_IndexOf/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/IndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_IndexOf/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/IndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_LastIndexOf/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/LastIndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_LastIndexOf/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/LastIndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_Reverse/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/ListT/Reverse/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_Reverse/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/ListT/Reverse/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IComp/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IComp/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IDic/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IDic/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IDicIComp/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IDicIComp/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IComp/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IComp/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IDic/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IDic/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IDicIComp/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IDicIComp/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_Int32/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_Int32/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_Int32IComp/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_Int32IComp/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/remarks.vb b/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/remarks.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb b/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb
rename to snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb b/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb
rename to snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb b/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.CollectionInherited/VB/source.vb b/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ObjectModel.CollectionInherited/VB/source.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/KeyedCollectionMutable/VB/source.vb b/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ClearItems/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/KeyedCollectionMutable/VB/source.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ClearItems/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection/VB/source.vb b/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/KeyedCollection/VB/source.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection2/vb/source.vb b/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/KeyedCollection2/vb/source.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb b/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/collections.arraylist.getenumerator/vb/program.vb b/snippets/visualbasic/System.Collections/ArrayList/GetEnumerator/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/collections.arraylist.getenumerator/vb/program.vb
rename to snippets/visualbasic/System.Collections/ArrayList/GetEnumerator/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb b/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb
rename to snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/remarks.vb b/snippets/visualbasic/System.Collections/DictionaryEntry/Key/remarks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/remarks.vb
rename to snippets/visualbasic/System.Collections/DictionaryEntry/Key/remarks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Install/VB/assemblyinstaller_install.vb b/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_install.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Install/VB/assemblyinstaller_install.vb
rename to snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_install.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Uninstall/VB/assemblyinstaller_uninstall.vb b/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_uninstall.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Uninstall/VB/assemblyinstaller_uninstall.vb
rename to snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_uninstall.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_CheckIfInstallable/VB/assemblyinstaller_checkifinstallable.vb b/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/CheckIfInstallable/assemblyinstaller_checkifinstallable.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_CheckIfInstallable/VB/assemblyinstaller_checkifinstallable.vb
rename to snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/CheckIfInstallable/assemblyinstaller_checkifinstallable.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Rollback/VB/assemblyinstaller_rollback.vb b/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/CommandLine/assemblyinstaller_rollback.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Rollback/VB/assemblyinstaller_rollback.vb
rename to snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/CommandLine/assemblyinstaller_rollback.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_HelpText/VB/assemblyinstaller_helptext.vb b/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/HelpText/assemblyinstaller_helptext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_HelpText/VB/assemblyinstaller_helptext.vb
rename to snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/HelpText/assemblyinstaller_helptext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller/VB/assemblyinstaller.vb b/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/Overview/assemblyinstaller.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller/VB/assemblyinstaller.vb
rename to snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/Overview/assemblyinstaller.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ComponentInstaller_CopyFromComponent/VB/componentinstaller_copyfromcomponent.vb b/snippets/visualbasic/System.Configuration.Install/ComponentInstaller/CopyFromComponent/componentinstaller_copyfromcomponent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ComponentInstaller_CopyFromComponent/VB/componentinstaller_copyfromcomponent.vb
rename to snippets/visualbasic/System.Configuration.Install/ComponentInstaller/CopyFromComponent/componentinstaller_copyfromcomponent.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallContext_InstallContext/VB/installcontext_installcontext.vb b/snippets/visualbasic/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallContext_InstallContext/VB/installcontext_installcontext.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallEventArgs/VB/installeventargs.vb b/snippets/visualbasic/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallEventArgs/VB/installeventargs.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallException/VB/installexception.vb b/snippets/visualbasic/System.Configuration.Install/InstallException/Overview/installexception.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallException/VB/installexception.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallException/Overview/installexception.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_AfterInstall/VB/installer_afterinstall.vb b/snippets/visualbasic/System.Configuration.Install/Installer/AfterInstall/installer_afterinstall.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_AfterInstall/VB/installer_afterinstall.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/AfterInstall/installer_afterinstall.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_AfterRollback/VB/installer_afterrollback.vb b/snippets/visualbasic/System.Configuration.Install/Installer/AfterRollback/installer_afterrollback.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_AfterRollback/VB/installer_afterrollback.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/AfterRollback/installer_afterrollback.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_AfterUninstall/VB/installer_afteruninstall.vb b/snippets/visualbasic/System.Configuration.Install/Installer/AfterUninstall/installer_afteruninstall.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_AfterUninstall/VB/installer_afteruninstall.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/AfterUninstall/installer_afteruninstall.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeInstall/VB/installer_beforeinstall.vb b/snippets/visualbasic/System.Configuration.Install/Installer/BeforeInstall/installer_beforeinstall.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeInstall/VB/installer_beforeinstall.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/BeforeInstall/installer_beforeinstall.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeRollback/VB/installer_beforerollback.vb b/snippets/visualbasic/System.Configuration.Install/Installer/BeforeRollback/installer_beforerollback.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeRollback/VB/installer_beforerollback.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/BeforeRollback/installer_beforerollback.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeUninstall/VB/installer_beforeuninstall.vb b/snippets/visualbasic/System.Configuration.Install/Installer/BeforeUninstall/installer_beforeuninstall.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeUninstall/VB/installer_beforeuninstall.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/BeforeUninstall/installer_beforeuninstall.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_Install/VB/installer_install.vb b/snippets/visualbasic/System.Configuration.Install/Installer/Commit/installer_install.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_Install/VB/installer_install.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/Commit/installer_install.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_Committed1/VB/installer_committed.vb b/snippets/visualbasic/System.Configuration.Install/Installer/Committed/installer_committed.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_Committed1/VB/installer_committed.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/Committed/installer_committed.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_Committing/VB/installer_committing.vb b/snippets/visualbasic/System.Configuration.Install/Installer/Committing/installer_committing.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_Committing/VB/installer_committing.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/Committing/installer_committing.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_Context/VB/installer_context.vb b/snippets/visualbasic/System.Configuration.Install/Installer/Context/installer_context.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_Context/VB/installer_context.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/Context/installer_context.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_HelpText/VB/installer_helptext.vb b/snippets/visualbasic/System.Configuration.Install/Installer/HelpText/installer_helptext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_HelpText/VB/installer_helptext.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/HelpText/installer_helptext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_Installers/VB/installer_installers.vb b/snippets/visualbasic/System.Configuration.Install/Installer/Installers/installer_installers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_Installers/VB/installer_installers.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/Installers/installer_installers.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_OnInstall/VB/installer_oninstall.vb b/snippets/visualbasic/System.Configuration.Install/Installer/OnAfterInstall/installer_oninstall.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_OnInstall/VB/installer_oninstall.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/OnAfterInstall/installer_oninstall.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_Committed/VB/installer_committed.vb b/snippets/visualbasic/System.Configuration.Install/Installer/OnCommitted/installer_committed.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_Committed/VB/installer_committed.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/OnCommitted/installer_committed.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer/VB/installer.vb b/snippets/visualbasic/System.Configuration.Install/Installer/Overview/installer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer/VB/installer.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/Overview/installer.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_Rollback/VB/installer_rollback.vb b/snippets/visualbasic/System.Configuration.Install/Installer/Rollback/installer_rollback.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_Rollback/VB/installer_rollback.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/Rollback/installer_rollback.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Installer_Uninstall/VB/installer_uninstall.vb b/snippets/visualbasic/System.Configuration.Install/Installer/Uninstall/installer_uninstall.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Installer_Uninstall/VB/installer_uninstall.vb
rename to snippets/visualbasic/System.Configuration.Install/Installer/Uninstall/installer_uninstall.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_AddRange1/VB/installercollection_addrange1.vb b/snippets/visualbasic/System.Configuration.Install/InstallerCollection/AddRange/installercollection_addrange1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_AddRange1/VB/installercollection_addrange1.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallerCollection/AddRange/installercollection_addrange1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Insert/VB/installercollection_insert.vb b/snippets/visualbasic/System.Configuration.Install/InstallerCollection/AddRange/installercollection_insert.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Insert/VB/installercollection_insert.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallerCollection/AddRange/installercollection_insert.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Remove/VB/installercollection_remove.vb b/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Contains/installercollection_remove.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Remove/VB/installercollection_remove.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallerCollection/Contains/installercollection_remove.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_CopyTo/VB/installercollection_copyto.vb b/snippets/visualbasic/System.Configuration.Install/InstallerCollection/CopyTo/installercollection_copyto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_CopyTo/VB/installercollection_copyto.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallerCollection/CopyTo/installercollection_copyto.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Item/VB/installercollection_item.vb b/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Item/installercollection_item.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Item/VB/installercollection_item.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallerCollection/Item/installercollection_item.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Add/VB/installercollection_add.vb b/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Overview/installercollection_add.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Add/VB/installercollection_add.vb
rename to snippets/visualbasic/System.Configuration.Install/InstallerCollection/Overview/installercollection_add.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TransactedInstaller/VB/transactedinstaller.vb b/snippets/visualbasic/System.Configuration.Install/TransactedInstaller/Overview/transactedinstaller.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TransactedInstaller/VB/transactedinstaller.vb
rename to snippets/visualbasic/System.Configuration.Install/TransactedInstaller/Overview/transactedinstaller.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/UninstallAction_NoAction_Remove_3/VB/uninstallaction_noaction_remove_3.vb b/snippets/visualbasic/System.Configuration.Install/UninstallAction/Overview/uninstallaction_noaction_remove_3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/UninstallAction_NoAction_Remove_3/VB/uninstallaction_noaction_remove_3.vb
rename to snippets/visualbasic/System.Configuration.Install/UninstallAction/Overview/uninstallaction_noaction_remove_3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/contractexample/vb/program.vb b/snippets/visualbasic/System.Diagnostics.Contracts/Contract/Ensures/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/contractexample/vb/program.vb
rename to snippets/visualbasic/System.Diagnostics.Contracts/Contract/Ensures/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/contract.forallexample/vb/program.vb b/snippets/visualbasic/System.Diagnostics.Contracts/Contract/ForAll/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/contract.forallexample/vb/program.vb
rename to snippets/visualbasic/System.Diagnostics.Contracts/Contract/ForAll/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineDocument/VB/modulebuilder_definedocument.vb b/snippets/visualbasic/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineDocument/VB/modulebuilder_definedocument.vb
rename to snippets/visualbasic/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb b/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb
rename to snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ConditionalAttributeSample1/VB/cas.vb b/snippets/visualbasic/System.Diagnostics/ConditionalAttribute/Overview/cas.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ConditionalAttributeSample1/VB/cas.vb
rename to snippets/visualbasic/System.Diagnostics/ConditionalAttribute/Overview/cas.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_ConsoleTraceListener/VB/consoletrace.vb b/snippets/visualbasic/System.Diagnostics/ConsoleTraceListener/Overview/consoletrace.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Diagnostics_ConsoleTraceListener/VB/consoletrace.vb
rename to snippets/visualbasic/System.Diagnostics/ConsoleTraceListener/Overview/consoletrace.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_CounterCreationData/VB/diagnostics_countercreationdata.vb b/snippets/visualbasic/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Diagnostics_CounterCreationData/VB/diagnostics_countercreationdata.vb
rename to snippets/visualbasic/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb b/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb
rename to snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_CounterCreationData/VB/countercreationdatacollection_ctor.vb b/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/.ctor/countercreationdatacollection_ctor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_CounterCreationData/VB/countercreationdatacollection_ctor.vb
rename to snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/.ctor/countercreationdatacollection_ctor.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_CounterCreationDataCollection/VB/countercreationdatacollection_ctor.vb b/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/.ctor/countercreationdatacollection_ctor1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_CounterCreationDataCollection/VB/countercreationdatacollection_ctor.vb
rename to snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/.ctor/countercreationdatacollection_ctor1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_AddRange/VB/countercreationdatacollection_addrange.vb b/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/AddRange/countercreationdatacollection_addrange.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_AddRange/VB/countercreationdatacollection_addrange.vb
rename to snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/AddRange/countercreationdatacollection_addrange.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_Contains/VB/countercreationdatacollection_contains.vb b/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/Contains/countercreationdatacollection_contains.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_Contains/VB/countercreationdatacollection_contains.vb
rename to snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/Contains/countercreationdatacollection_contains.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_Insert_IndexOf/VB/countercreationdatacollection_insert_indexof.vb b/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/IndexOf/countercreationdatacollection_insert_indexof.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_Insert_IndexOf/VB/countercreationdatacollection_insert_indexof.vb
rename to snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/IndexOf/countercreationdatacollection_insert_indexof.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CounterSample_Ctor_2/VB/countersample_ctor_2.vb b/snippets/visualbasic/System.Diagnostics/CounterSample/.ctor/countersample_ctor_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CounterSample_Ctor_2/VB/countersample_ctor_2.vb
rename to snippets/visualbasic/System.Diagnostics/CounterSample/.ctor/countersample_ctor_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/datareceivedevent.vb b/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/datareceivedevent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/datareceivedevent.vb
rename to snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/datareceivedevent.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/makefile b/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/makefile
rename to snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/net_async.vb b/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/net_async.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/net_async.vb
rename to snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/net_async.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/nmake_async.vb b/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/nmake_async.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/nmake_async.vb
rename to snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/nmake_async.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/sort_async.vb b/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/sort_async.vb
rename to snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EntryWrittenEventArgs_ctor2/VB/entrywritteneventargs_ctor2.vb b/snippets/visualbasic/System.Diagnostics/EntryWrittenEventArgs/.ctor/entrywritteneventargs_ctor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EntryWrittenEventArgs_ctor2/VB/entrywritteneventargs_ctor2.vb
rename to snippets/visualbasic/System.Diagnostics/EntryWrittenEventArgs/.ctor/entrywritteneventargs_ctor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EntryWrittenEventArgs_ctor1/VB/entrywritteneventargs_ctor1.vb b/snippets/visualbasic/System.Diagnostics/EntryWrittenEventArgs/Overview/entrywritteneventargs_ctor1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EntryWrittenEventArgs_ctor1/VB/entrywritteneventargs_ctor1.vb
rename to snippets/visualbasic/System.Diagnostics/EntryWrittenEventArgs/Overview/entrywritteneventargs_ctor1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLog_Exists_1/VB/eventlog_exists_1.vb b/snippets/visualbasic/System.Diagnostics/EventLog/Exists/eventlog_exists_1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLog_Exists_1/VB/eventlog_exists_1.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/Exists/eventlog_exists_1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_1_3/VB/eventlog_writeentry_1_3.vb b/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_1_3/VB/eventlog_writeentry_1_3.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_4/VB/eventlog_writeentry_4.vb b/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_4/VB/eventlog_writeentry_4.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_5/VB/eventlog_writeentry_5.vb b/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_5/VB/eventlog_writeentry_5.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Source/VB/eventlogentry_source.vb b/snippets/visualbasic/System.Diagnostics/EventLogEntry/Overview/eventlogentry_source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Source/VB/eventlogentry_source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLogEntry/Overview/eventlogentry_source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Item/VB/eventlogentry_item.vb b/snippets/visualbasic/System.Diagnostics/EventLogEntryCollection/Count/eventlogentry_item.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Item/VB/eventlogentry_item.vb
rename to snippets/visualbasic/System.Diagnostics/EventLogEntryCollection/Count/eventlogentry_item.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_CopyTo/VB/eventlogentry_copyto.vb b/snippets/visualbasic/System.Diagnostics/EventLogEntryCollection/Overview/eventlogentry_copyto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_CopyTo/VB/eventlogentry_copyto.vb
rename to snippets/visualbasic/System.Diagnostics/EventLogEntryCollection/Overview/eventlogentry_copyto.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLogEntryType_6/VB/eventlogentrytype_6.vb b/snippets/visualbasic/System.Diagnostics/EventLogEntryType/Overview/eventlogentrytype_6.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLogEntryType_6/VB/eventlogentrytype_6.vb
rename to snippets/visualbasic/System.Diagnostics/EventLogEntryType/Overview/eventlogentrytype_6.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/eventlogInstaller_Resources/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLogInstaller/CategoryCount/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/eventlogInstaller_Resources/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLogInstaller/CategoryCount/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLogInstaller/VB/eventloginstaller.vb b/snippets/visualbasic/System.Diagnostics/EventLogInstaller/Overview/eventloginstaller.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLogInstaller/VB/eventloginstaller.vb
rename to snippets/visualbasic/System.Diagnostics/EventLogInstaller/Overview/eventloginstaller.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventLog_EventSourceCreation_Properties/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventSourceCreationData/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventLog_EventSourceCreation_Properties/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventSourceCreationData/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PerfCounter/VB/perfcounter.vb b/snippets/visualbasic/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PerfCounter/VB/perfcounter.vb
rename to snippets/visualbasic/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.ElapsedTime/VB/elapsedtime.vb b/snippets/visualbasic/System.Diagnostics/PerformanceCounter/NextValue/elapsedtime.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.ElapsedTime/VB/elapsedtime.vb
rename to snippets/visualbasic/System.Diagnostics/PerformanceCounter/NextValue/elapsedtime.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PerfCounter_ccd/VB/ccd.vb b/snippets/visualbasic/System.Diagnostics/PerformanceCounterCategory/Create/ccd.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PerfCounter_ccd/VB/ccd.vb
rename to snippets/visualbasic/System.Diagnostics/PerformanceCounterCategory/Create/ccd.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterInstaller/VB/performancecounterinstaller.vb b/snippets/visualbasic/System.Diagnostics/PerformanceCounterInstaller/Overview/performancecounterinstaller.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterInstaller/VB/performancecounterinstaller.vb
rename to snippets/visualbasic/System.Diagnostics/PerformanceCounterInstaller/Overview/performancecounterinstaller.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/process_refresh/VB/process_refresh.vb b/snippets/visualbasic/System.Diagnostics/Process/Close/process_refresh.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/process_refresh/VB/process_refresh.vb
rename to snippets/visualbasic/System.Diagnostics/Process/Close/process_refresh.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb b/snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb
rename to snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process_GetProcessesByName2_2/VB/process_getprocessesbyname2_2.vb b/snippets/visualbasic/System.Diagnostics/Process/MachineName/process_getprocessesbyname2_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process_GetProcessesByName2_2/VB/process_getprocessesbyname2_2.vb
rename to snippets/visualbasic/System.Diagnostics/Process/MachineName/process_getprocessesbyname2_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process_MainWindowTitle/VB/process_mainwindowtitle.vb b/snippets/visualbasic/System.Diagnostics/Process/MainWindowTitle/process_mainwindowtitle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process_MainWindowTitle/VB/process_mainwindowtitle.vb
rename to snippets/visualbasic/System.Diagnostics/Process/MainWindowTitle/process_mainwindowtitle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/onexitsample/vb/program.vb b/snippets/visualbasic/System.Diagnostics/Process/OnExited/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/onexitsample/vb/program.vb
rename to snippets/visualbasic/System.Diagnostics/Process/OnExited/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process.Start_instance/VB/processstart.vb b/snippets/visualbasic/System.Diagnostics/Process/Overview/processstart.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process.Start_instance/VB/processstart.vb
rename to snippets/visualbasic/System.Diagnostics/Process/Overview/processstart.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic.vb b/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic.vb
rename to snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic2.vb b/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic2.vb
rename to snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic3.vb b/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic3.vb
rename to snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process_StandardError/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Process/StandardError/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process_StandardError/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Process/StandardError/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process_StandardInput/VB/process_standardinput.vb b/snippets/visualbasic/System.Diagnostics/Process/StandardInput/process_standardinput.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process_StandardInput/VB/process_standardinput.vb
rename to snippets/visualbasic/System.Diagnostics/Process/StandardInput/process_standardinput.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process_StandardOutput/VB/process_standardoutput.vb b/snippets/visualbasic/System.Diagnostics/Process/StandardOutput/process_standardoutput.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process_StandardOutput/VB/process_standardoutput.vb
rename to snippets/visualbasic/System.Diagnostics/Process/StandardOutput/process_standardoutput.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process_SynchronizingObject/VB/process_synchronizingobject.vb b/snippets/visualbasic/System.Diagnostics/Process/SynchronizingObject/process_synchronizingobject.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process_SynchronizingObject/VB/process_synchronizingobject.vb
rename to snippets/visualbasic/System.Diagnostics/Process/SynchronizingObject/process_synchronizingobject.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Process_SynchronizingObject/VB/remarks.vb b/snippets/visualbasic/System.Diagnostics/Process/SynchronizingObject/remarks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Process_SynchronizingObject/VB/remarks.vb
rename to snippets/visualbasic/System.Diagnostics/Process/SynchronizingObject/remarks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/process_sample/VB/process_sample.vb b/snippets/visualbasic/System.Diagnostics/Process/WorkingSet/process_sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/process_sample/VB/process_sample.vb
rename to snippets/visualbasic/System.Diagnostics/Process/WorkingSet/process_sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_BaseAddress/VB/processmodule_baseaddress.vb b/snippets/visualbasic/System.Diagnostics/ProcessModule/BaseAddress/processmodule_baseaddress.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessModule_BaseAddress/VB/processmodule_baseaddress.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessModule/BaseAddress/processmodule_baseaddress.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_EntryPoint/VB/processmodule_entrypoint.vb b/snippets/visualbasic/System.Diagnostics/ProcessModule/EntryPointAddress/processmodule_entrypoint.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessModule_EntryPoint/VB/processmodule_entrypoint.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessModule/EntryPointAddress/processmodule_entrypoint.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_FileName/VB/processmodule_filename.vb b/snippets/visualbasic/System.Diagnostics/ProcessModule/FileName/processmodule_filename.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessModule_FileName/VB/processmodule_filename.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessModule/FileName/processmodule_filename.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_FileVersionInfo/VB/processmodule_fileversioninfo.vb b/snippets/visualbasic/System.Diagnostics/ProcessModule/FileVersionInfo/processmodule_fileversioninfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessModule_FileVersionInfo/VB/processmodule_fileversioninfo.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessModule/FileVersionInfo/processmodule_fileversioninfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ModuleMemorySize/VB/processmodule_modulememorysize.vb b/snippets/visualbasic/System.Diagnostics/ProcessModule/ModuleMemorySize/processmodule_modulememorysize.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ModuleMemorySize/VB/processmodule_modulememorysize.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessModule/ModuleMemorySize/processmodule_modulememorysize.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ModuleName/VB/processmodule_modulename.vb b/snippets/visualbasic/System.Diagnostics/ProcessModule/ModuleName/processmodule_modulename.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ModuleName/VB/processmodule_modulename.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessModule/ModuleName/processmodule_modulename.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessModule/VB/processmodule.vb b/snippets/visualbasic/System.Diagnostics/ProcessModule/Overview/processmodule.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessModule/VB/processmodule.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessModule/Overview/processmodule.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ToString/VB/processmodule_tostring.vb b/snippets/visualbasic/System.Diagnostics/ProcessModule/ToString/processmodule_tostring.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ToString/VB/processmodule_tostring.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessModule/ToString/processmodule_tostring.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessOneStream/VB/stdstr.vb b/snippets/visualbasic/System.Diagnostics/ProcessStartInfo/RedirectStandardOutput/stdstr.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessOneStream/VB/stdstr.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessStartInfo/RedirectStandardOutput/stdstr.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessVerbs_Diagnostics/VB/source.vb b/snippets/visualbasic/System.Diagnostics/ProcessStartInfo/Verb/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessVerbs_Diagnostics/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessStartInfo/Verb/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProcessThreadIdealProcessor/VB/program.vb b/snippets/visualbasic/System.Diagnostics/ProcessThread/IdealProcessor/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProcessThreadIdealProcessor/VB/program.vb
rename to snippets/visualbasic/System.Diagnostics/ProcessThread/IdealProcessor/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StackTraceSample3/VB/stacktracesample3.vb b/snippets/visualbasic/System.Diagnostics/StackFrame/GetMethod/stacktracesample3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StackTraceSample3/VB/stacktracesample3.vb
rename to snippets/visualbasic/System.Diagnostics/StackFrame/GetMethod/stacktracesample3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stackframesample2/vb/program.vb b/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stackframesample2/vb/program.vb
rename to snippets/visualbasic/System.Diagnostics/StackFrame/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb b/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StackTraceSample2/VB/stacktracesample2.vb b/snippets/visualbasic/System.Diagnostics/StackTrace/GetFrames/stacktracesample2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StackTraceSample2/VB/stacktracesample2.vb
rename to snippets/visualbasic/System.Diagnostics/StackTrace/GetFrames/stacktracesample2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StackTraceSample1/VB/stacktracesample1.vb b/snippets/visualbasic/System.Diagnostics/StackTrace/Overview/stacktracesample1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StackTraceSample1/VB/stacktracesample1.vb
rename to snippets/visualbasic/System.Diagnostics/StackTrace/Overview/stacktracesample1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StopWatchPerfSample/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StopWatchPerfSample/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.calendartype/VB/caltype.vb b/snippets/visualbasic/System.Globalization/CalendarAlgorithmType/Overview/caltype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.calendartype/VB/caltype.vb
rename to snippets/visualbasic/System.Globalization/CalendarAlgorithmType/Overview/caltype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CompareInfo/VB/CompareInfo.vb b/snippets/visualbasic/System.Globalization/CompareInfo/Overview/CompareInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CompareInfo/VB/CompareInfo.vb
rename to snippets/visualbasic/System.Globalization/CompareInfo/Overview/CompareInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.saveLdml/vb/makefile b/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CreateFromLdml/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.saveLdml/vb/makefile
rename to snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CreateFromLdml/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.saveLdml/vb/sl.vb b/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CreateFromLdml/sl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.saveLdml/vb/sl.vb
rename to snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CreateFromLdml/sl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/carib.vb b/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/carib.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/carib.vb
rename to snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/carib.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/makefile b/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/makefile
rename to snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.register/VB/makefile b/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Register/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.register/VB/makefile
rename to snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Register/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.register/VB/persist.vb b/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Register/persist.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.register/VB/persist.vb
rename to snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Register/persist.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.unregister/VB/makefile b/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Unregister/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.unregister/VB/makefile
rename to snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Unregister/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.unregister/VB/unregister.vb b/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Unregister/unregister.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.unregister/VB/unregister.vb
rename to snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Unregister/unregister.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.ci.getCFUIC/VB/cfuic.vb b/snippets/visualbasic/System.Globalization/CultureInfo/GetConsoleFallbackUICulture/cfuic.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.ci.getCFUIC/VB/cfuic.vb
rename to snippets/visualbasic/System.Globalization/CultureInfo/GetConsoleFallbackUICulture/cfuic.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IdnMapping.GetX/VB/getx.vb b/snippets/visualbasic/System.Globalization/IdnMapping/GetAscii/getx.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IdnMapping.GetX/VB/getx.vb
rename to snippets/visualbasic/System.Globalization/IdnMapping/GetAscii/getx.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CurrencyDecimalDigits/VB/currencydecimaldigits.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyDecimalDigits/currencydecimaldigits.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CurrencyDecimalDigits/VB/currencydecimaldigits.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyDecimalDigits/currencydecimaldigits.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CurrencyDecimalSeparator/VB/currencydecimalseparator.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyDecimalSeparator/currencydecimalseparator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CurrencyDecimalSeparator/VB/currencydecimalseparator.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyDecimalSeparator/currencydecimalseparator.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CurrencyGroupSeparator/VB/currencygroupseparator.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyGroupSeparator/currencygroupseparator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CurrencyGroupSeparator/VB/currencygroupseparator.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyGroupSeparator/currencygroupseparator.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CurrencyGroupSizes/VB/currencygroupsizes.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyGroupSizes/currencygroupsizes.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CurrencyGroupSizes/VB/currencygroupsizes.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyGroupSizes/currencygroupsizes.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.NFI.nativeDigits/vb/nd.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/NativeDigits/nd.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.NFI.nativeDigits/vb/nd.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/NativeDigits/nd.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/NumberDecimalDigits/VB/numberdecimaldigits.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberDecimalDigits/numberdecimaldigits.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/NumberDecimalDigits/VB/numberdecimaldigits.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberDecimalDigits/numberdecimaldigits.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/NumberDecimalSeparator/VB/numberdecimalseparator.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberDecimalSeparator/numberdecimalseparator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/NumberDecimalSeparator/VB/numberdecimalseparator.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberDecimalSeparator/numberdecimalseparator.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/NumberGroupSeparator/VB/numbergroupseparator.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSeparator/numbergroupseparator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/NumberGroupSeparator/VB/numbergroupseparator.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSeparator/numbergroupseparator.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/NumberGroupSizes/VB/numbergroupsizes.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSizes/numbergroupsizes.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/NumberGroupSizes/VB/numbergroupsizes.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSizes/numbergroupsizes.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/NumberFormatInfo/vb/numberformatinfo.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/Overview/numberformatinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/NumberFormatInfo/vb/numberformatinfo.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/Overview/numberformatinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PercentDecimalDigits/VB/percentdecimaldigits.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentDecimalDigits/percentdecimaldigits.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PercentDecimalDigits/VB/percentdecimaldigits.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentDecimalDigits/percentdecimaldigits.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PercentDecimalSeparator/VB/percentdecimalseparator.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentDecimalSeparator/percentdecimalseparator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PercentDecimalSeparator/VB/percentdecimalseparator.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentDecimalSeparator/percentdecimalseparator.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PercentGroupSeparator/VB/percentgroupseparator.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentGroupSeparator/percentgroupseparator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PercentGroupSeparator/VB/percentgroupseparator.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentGroupSeparator/percentgroupseparator.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PercentGroupSizes/VB/percentgroupsizes.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentGroupSizes/percentgroupsizes.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PercentGroupSizes/VB/percentgroupsizes.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentGroupSizes/percentgroupsizes.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/NumberStyles/vb/numberstyles.vb b/snippets/visualbasic/System.Globalization/NumberStyles/Overview/numberstyles.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/NumberStyles/vb/numberstyles.vb
rename to snippets/visualbasic/System.Globalization/NumberStyles/Overview/numberstyles.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/calendar2.vb b/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/calendar2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/calendar2.vb
rename to snippets/visualbasic/System.Globalization/PersianCalendar/Overview/calendar2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb b/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb
rename to snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.regioninfo.rgn5props/VB/rgn5props.vb b/snippets/visualbasic/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.regioninfo.rgn5props/VB/rgn5props.vb
rename to snippets/visualbasic/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.sortkey.compare/vb/skcmp.vb b/snippets/visualbasic/System.Globalization/SortKey/Compare/skcmp.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.sortkey.compare/vb/skcmp.vb
rename to snippets/visualbasic/System.Globalization/SortKey/Compare/skcmp.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.sortkey.tostring/vb/ts.vb b/snippets/visualbasic/System.Globalization/SortKey/KeyData/ts.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.sortkey.tostring/vb/ts.vb
rename to snippets/visualbasic/System.Globalization/SortKey/KeyData/ts.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StringInfo/vb/stringinfo.vb b/snippets/visualbasic/System.Globalization/StringInfo/Overview/stringinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StringInfo/vb/stringinfo.vb
rename to snippets/visualbasic/System.Globalization/StringInfo/Overview/stringinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.glob.textinfo.clone/vb/ro.vb b/snippets/visualbasic/System.Globalization/TextInfo/Clone/ro.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.glob.textinfo.clone/vb/ro.vb
rename to snippets/visualbasic/System.Globalization/TextInfo/Clone/ro.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/conceptual.isolatedstorage/vb/source.vb b/snippets/visualbasic/System.IO.IsolatedStorage/IsolatedStorageFile/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/conceptual.isolatedstorage/vb/source.vb
rename to snippets/visualbasic/System.IO.IsolatedStorage/IsolatedStorageFile/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.openexisting/vb/program.vb b/snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/OpenExisting/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.openexisting/vb/program.vb
rename to snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/OpenExisting/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.createfromfile/vb/program.vb b/snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.createfromfile/vb/program.vb
rename to snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.Ports.GetPortNames/VB/example.vb b/snippets/visualbasic/System.IO.Ports/SerialPort/GetPortNames/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.Ports.GetPortNames/VB/example.vb
rename to snippets/visualbasic/System.IO.Ports/SerialPort/GetPortNames/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_CreateDir/VB/dir_createdir.vb b/snippets/visualbasic/System.IO/Directory/CreateDirectory/dir_createdir.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_CreateDir/VB/dir_createdir.vb
rename to snippets/visualbasic/System.IO/Directory/CreateDirectory/dir_createdir.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Recursive file finder/VB/directorylisting.vb b/snippets/visualbasic/System.IO/Directory/Exists/directorylisting.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Recursive file finder/VB/directorylisting.vb
rename to snippets/visualbasic/System.IO/Directory/Exists/directorylisting.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_GetCreation/VB/dir_getcreation.vb b/snippets/visualbasic/System.IO/Directory/GetCreationTime/dir_getcreation.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_GetCreation/VB/dir_getcreation.vb
rename to snippets/visualbasic/System.IO/Directory/GetCreationTime/dir_getcreation.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_GetCurDir/VB/dir_getcurdir.vb b/snippets/visualbasic/System.IO/Directory/GetCurrentDirectory/dir_getcurdir.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_GetCurDir/VB/dir_getcurdir.vb
rename to snippets/visualbasic/System.IO/Directory/GetCurrentDirectory/dir_getcurdir.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_GetDirs2/VB/dir_getdirs2.vb b/snippets/visualbasic/System.IO/Directory/GetDirectories/dir_getdirs2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_GetDirs2/VB/dir_getdirs2.vb
rename to snippets/visualbasic/System.IO/Directory/GetDirectories/dir_getdirs2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_GetDirs2/VB/dir_getdirs3.vb b/snippets/visualbasic/System.IO/Directory/GetDirectories/dir_getdirs3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_GetDirs2/VB/dir_getdirs3.vb
rename to snippets/visualbasic/System.IO/Directory/GetDirectories/dir_getdirs3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_GetFiles2/VB/dir_getfiles2.vb b/snippets/visualbasic/System.IO/Directory/GetFiles/dir_getfiles2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_GetFiles2/VB/dir_getfiles2.vb
rename to snippets/visualbasic/System.IO/Directory/GetFiles/dir_getfiles2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_GetLastAccess/VB/dir_getlastaccess.vb b/snippets/visualbasic/System.IO/Directory/GetLastAccessTime/dir_getlastaccess.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_GetLastAccess/VB/dir_getlastaccess.vb
rename to snippets/visualbasic/System.IO/Directory/GetLastAccessTime/dir_getlastaccess.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_GetLastWrite/VB/dir_getlastwrite.vb b/snippets/visualbasic/System.IO/Directory/GetLastWriteTime/dir_getlastwrite.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_GetLastWrite/VB/dir_getlastwrite.vb
rename to snippets/visualbasic/System.IO/Directory/GetLastWriteTime/dir_getlastwrite.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_SetLastAccess/VB/dir_setlastaccess.vb b/snippets/visualbasic/System.IO/Directory/SetLastAccessTime/dir_setlastaccess.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_SetLastAccess/VB/dir_setlastaccess.vb
rename to snippets/visualbasic/System.IO/Directory/SetLastAccessTime/dir_setlastaccess.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Dir_SetLastWrite/VB/dir_setlastwrite.vb b/snippets/visualbasic/System.IO/Directory/SetLastWriteTime/dir_setlastwrite.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Dir_SetLastWrite/VB/dir_setlastwrite.vb
rename to snippets/visualbasic/System.IO/Directory/SetLastWriteTime/dir_setlastwrite.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DirInfo Ctor/VB/dirinfo ctor.vb b/snippets/visualbasic/System.IO/DirectoryInfo/.ctor/dirinfo ctor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DirInfo Ctor/VB/dirinfo ctor.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/.ctor/dirinfo ctor.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DirInfo Create/VB/dirinfo create.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Create/dirinfo create.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DirInfo Create/VB/dirinfo create.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Create/dirinfo create.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/directoryinfocreatesub/VB/directoryinfocreatesub.vb b/snippets/visualbasic/System.IO/DirectoryInfo/CreateSubdirectory/directoryinfocreatesub.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/directoryinfocreatesub/VB/directoryinfocreatesub.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/CreateSubdirectory/directoryinfocreatesub.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/directoryinfodelete/VB/directoryinfodelete.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Delete/directoryinfodelete.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/directoryinfodelete/VB/directoryinfodelete.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Delete/directoryinfodelete.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DirInfo Delete1/VB/dirinfo delete1.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Delete/dirinfo delete1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DirInfo Delete1/VB/dirinfo delete1.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Delete/dirinfo delete1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DirectoryInfo Usage Example/VB/copydirectory.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Exists/copydirectory.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DirectoryInfo Usage Example/VB/copydirectory.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Exists/copydirectory.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.DiretoryInfo.GetAccessControl-SetAccessControl/VB/sample.vb b/snippets/visualbasic/System.IO/DirectoryInfo/GetAccessControl/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.DiretoryInfo.GetAccessControl-SetAccessControl/VB/sample.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/GetAccessControl/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/directoryinfogetdirectories/VB/directoryinfogetdirectories.vb b/snippets/visualbasic/System.IO/DirectoryInfo/GetDirectories/directoryinfogetdirectories.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/directoryinfogetdirectories/VB/directoryinfogetdirectories.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/GetDirectories/directoryinfogetdirectories.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DirInfo GetDirs2/VB/dirinfo getdirs2.vb b/snippets/visualbasic/System.IO/DirectoryInfo/GetDirectories/dirinfo getdirs2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DirInfo GetDirs2/VB/dirinfo getdirs2.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/GetDirectories/dirinfo getdirs2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DirInfo GetFileSysInfos2/VB/dirinfo getfilesysinfos2.vb b/snippets/visualbasic/System.IO/DirectoryInfo/GetFileSystemInfos/dirinfo getfilesysinfos2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DirInfo GetFileSysInfos2/VB/dirinfo getfilesysinfos2.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/GetFileSystemInfos/dirinfo getfilesysinfos2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FSizeSort/VB/fsizesort.vb b/snippets/visualbasic/System.IO/DirectoryInfo/GetFileSystemInfos/fsizesort.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FSizeSort/VB/fsizesort.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/GetFileSystemInfos/fsizesort.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/directoryinfogetfiles/VB/directoryinfogetfiles2.vb b/snippets/visualbasic/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/directoryinfogetfiles/VB/directoryinfogetfiles2.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/directoryinfomoveto/VB/directoryinfomoveto.vb b/snippets/visualbasic/System.IO/DirectoryInfo/MoveTo/directoryinfomoveto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/directoryinfomoveto/VB/directoryinfomoveto.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/MoveTo/directoryinfomoveto.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.DirectoryInfo-CopyDir/vb/CopyDir.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Overview/CopyDir.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.DirectoryInfo-CopyDir/vb/CopyDir.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Overview/CopyDir.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DirInfo Class Example/VB/dirinfo class example.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Overview/dirinfo class example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DirInfo Class Example/VB/dirinfo class example.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Overview/dirinfo class example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/directoryinfoparent/VB/directoryinfoparent.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Parent/directoryinfoparent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/directoryinfoparent/VB/directoryinfoparent.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Parent/directoryinfoparent.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/directoryinforoot/VB/directoryinforoot2.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Root/directoryinforoot2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/directoryinforoot/VB/directoryinforoot2.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Root/directoryinforoot2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DirectoryNotFoundException/VB/DirectoryNotFoundexception.vb b/snippets/visualbasic/System.IO/DirectoryNotFoundException/Overview/DirectoryNotFoundexception.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DirectoryNotFoundException/VB/DirectoryNotFoundexception.vb
rename to snippets/visualbasic/System.IO/DirectoryNotFoundException/Overview/DirectoryNotFoundexception.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb b/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb
rename to snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File_AppendText/VB/file_appendtext.vb b/snippets/visualbasic/System.IO/File/AppendText/file_appendtext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File_AppendText/VB/file_appendtext.vb
rename to snippets/visualbasic/System.IO/File/AppendText/file_appendtext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/filecopydelete/vb/program.vb b/snippets/visualbasic/System.IO/File/Copy/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/filecopydelete/vb/program.vb
rename to snippets/visualbasic/System.IO/File/Copy/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File Create1/VB/file create1.vb b/snippets/visualbasic/System.IO/File/Create/file create1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File Create1/VB/file create1.vb
rename to snippets/visualbasic/System.IO/File/Create/file create1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File Create2/VB/file create2.vb b/snippets/visualbasic/System.IO/File/Create/file create2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File Create2/VB/file create2.vb
rename to snippets/visualbasic/System.IO/File/Create/file create2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File CreateText/VB/file createtext.vb b/snippets/visualbasic/System.IO/File/CreateText/file createtext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File CreateText/VB/file createtext.vb
rename to snippets/visualbasic/System.IO/File/CreateText/file createtext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.File.Encrypt-Decrypt/VB/sample.vb b/snippets/visualbasic/System.IO/File/Decrypt/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.File.Encrypt-Decrypt/VB/sample.vb
rename to snippets/visualbasic/System.IO/File/Decrypt/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File Exists/VB/program.vb b/snippets/visualbasic/System.IO/File/Exists/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File Exists/VB/program.vb
rename to snippets/visualbasic/System.IO/File/Exists/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File GetAttributes/VB/file getattributes.vb b/snippets/visualbasic/System.IO/File/GetAttributes/file getattributes.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File GetAttributes/VB/file getattributes.vb
rename to snippets/visualbasic/System.IO/File/GetAttributes/file getattributes.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File GetLastAccess/VB/file getlastaccess.vb b/snippets/visualbasic/System.IO/File/GetLastAccessTime/file getlastaccess.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File GetLastAccess/VB/file getlastaccess.vb
rename to snippets/visualbasic/System.IO/File/GetLastAccessTime/file getlastaccess.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File GetLastWrite/VB/file getlastwrite.vb b/snippets/visualbasic/System.IO/File/GetLastWriteTime/file getlastwrite.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File GetLastWrite/VB/file getlastwrite.vb
rename to snippets/visualbasic/System.IO/File/GetLastWriteTime/file getlastwrite.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File Move/VB/file move.vb b/snippets/visualbasic/System.IO/File/Move/file move.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File Move/VB/file move.vb
rename to snippets/visualbasic/System.IO/File/Move/file move.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File Open1/VB/file open1.vb b/snippets/visualbasic/System.IO/File/Open/file open1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File Open1/VB/file open1.vb
rename to snippets/visualbasic/System.IO/File/Open/file open1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File Open2/VB/file open2.vb b/snippets/visualbasic/System.IO/File/Open/file open2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File Open2/VB/file open2.vb
rename to snippets/visualbasic/System.IO/File/Open/file open2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File Open3/VB/file open3.vb b/snippets/visualbasic/System.IO/File/Open/file open3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File Open3/VB/file open3.vb
rename to snippets/visualbasic/System.IO/File/Open/file open3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File OpenRead/VB/file openread.vb b/snippets/visualbasic/System.IO/File/OpenRead/file openread.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File OpenRead/VB/file openread.vb
rename to snippets/visualbasic/System.IO/File/OpenRead/file openread.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File OpenText/VB/file opentext.vb b/snippets/visualbasic/System.IO/File/OpenText/file opentext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File OpenText/VB/file opentext.vb
rename to snippets/visualbasic/System.IO/File/OpenText/file opentext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File OpenWrite/VB/file openwrite.vb b/snippets/visualbasic/System.IO/File/OpenWrite/file openwrite.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File OpenWrite/VB/file openwrite.vb
rename to snippets/visualbasic/System.IO/File/OpenWrite/file openwrite.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File Class Example/VB/file class example.vb b/snippets/visualbasic/System.IO/File/Overview/file class example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File Class Example/VB/file class example.vb
rename to snippets/visualbasic/System.IO/File/Overview/file class example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.File.Replace/VB/sample.vb b/snippets/visualbasic/System.IO/File/Replace/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.File.Replace/VB/sample.vb
rename to snippets/visualbasic/System.IO/File/Replace/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File SetLastAccess/VB/file setlastaccess.vb b/snippets/visualbasic/System.IO/File/SetLastAccessTime/file setlastaccess.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File SetLastAccess/VB/file setlastaccess.vb
rename to snippets/visualbasic/System.IO/File/SetLastAccessTime/file setlastaccess.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/File SetLastWrite/VB/file setlastwrite.vb b/snippets/visualbasic/System.IO/File/SetLastWriteTime/file setlastwrite.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/File SetLastWrite/VB/file setlastwrite.vb
rename to snippets/visualbasic/System.IO/File/SetLastWriteTime/file setlastwrite.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/fileinfomain/VB/fileinfomain.vb b/snippets/visualbasic/System.IO/FileInfo/.ctor/fileinfomain.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/fileinfomain/VB/fileinfomain.vb
rename to snippets/visualbasic/System.IO/FileInfo/.ctor/fileinfomain.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo Ctor/VB/finfo ctor.vb b/snippets/visualbasic/System.IO/FileInfo/.ctor/finfo ctor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo Ctor/VB/finfo ctor.vb
rename to snippets/visualbasic/System.IO/FileInfo/.ctor/finfo ctor.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/fileinfoappendtext/VB/fileinfoappendtext.vb b/snippets/visualbasic/System.IO/FileInfo/AppendText/fileinfoappendtext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/fileinfoappendtext/VB/fileinfoappendtext.vb
rename to snippets/visualbasic/System.IO/FileInfo/AppendText/fileinfoappendtext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo AppendText/VB/finfo appendtext.vb b/snippets/visualbasic/System.IO/FileInfo/AppendText/finfo appendtext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo AppendText/VB/finfo appendtext.vb
rename to snippets/visualbasic/System.IO/FileInfo/AppendText/finfo appendtext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/fileinfocopyto/VB/fileinfocopyto.vb b/snippets/visualbasic/System.IO/FileInfo/CopyTo/fileinfocopyto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/fileinfocopyto/VB/fileinfocopyto.vb
rename to snippets/visualbasic/System.IO/FileInfo/CopyTo/fileinfocopyto.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FileInfoCopyTo1/VB/fileinfocopyto1.vb b/snippets/visualbasic/System.IO/FileInfo/CopyTo/fileinfocopyto1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FileInfoCopyTo1/VB/fileinfocopyto1.vb
rename to snippets/visualbasic/System.IO/FileInfo/CopyTo/fileinfocopyto1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo CopyTo2/VB/program.vb b/snippets/visualbasic/System.IO/FileInfo/CopyTo/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo CopyTo2/VB/program.vb
rename to snippets/visualbasic/System.IO/FileInfo/CopyTo/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/fileinfodelete/VB/fileinfodelete.vb b/snippets/visualbasic/System.IO/FileInfo/Create/fileinfodelete.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/fileinfodelete/VB/fileinfodelete.vb
rename to snippets/visualbasic/System.IO/FileInfo/Create/fileinfodelete.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo Create/VB/finfo create.vb b/snippets/visualbasic/System.IO/FileInfo/Create/finfo create.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo Create/VB/finfo create.vb
rename to snippets/visualbasic/System.IO/FileInfo/Create/finfo create.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo CreateText/VB/finfo createtext.vb b/snippets/visualbasic/System.IO/FileInfo/CreateText/finfo createtext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo CreateText/VB/finfo createtext.vb
rename to snippets/visualbasic/System.IO/FileInfo/CreateText/finfo createtext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Encrypt-Decrypt/VB/sample.vb b/snippets/visualbasic/System.IO/FileInfo/Decrypt/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Encrypt-Decrypt/VB/sample.vb
rename to snippets/visualbasic/System.IO/FileInfo/Decrypt/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo Delete/VB/finfo delete.vb b/snippets/visualbasic/System.IO/FileInfo/Delete/finfo delete.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo Delete/VB/finfo delete.vb
rename to snippets/visualbasic/System.IO/FileInfo/Delete/finfo delete.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/fileinfodirectory/VB/fileinfodirectory.vb b/snippets/visualbasic/System.IO/FileInfo/Directory/fileinfodirectory.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/fileinfodirectory/VB/fileinfodirectory.vb
rename to snippets/visualbasic/System.IO/FileInfo/Directory/fileinfodirectory.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Exists/vb/sample.vb b/snippets/visualbasic/System.IO/FileInfo/Exists/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Exists/vb/sample.vb
rename to snippets/visualbasic/System.IO/FileInfo/Exists/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.GetAccessControl-SetAccessControl/VB/sample.vb b/snippets/visualbasic/System.IO/FileInfo/GetAccessControl/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.GetAccessControl-SetAccessControl/VB/sample.vb
rename to snippets/visualbasic/System.IO/FileInfo/GetAccessControl/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.isReadOnly/VB/sample.vb b/snippets/visualbasic/System.IO/FileInfo/IsReadOnly/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.isReadOnly/VB/sample.vb
rename to snippets/visualbasic/System.IO/FileInfo/IsReadOnly/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FileLength/VB/filelength.vb b/snippets/visualbasic/System.IO/FileInfo/Length/filelength.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FileLength/VB/filelength.vb
rename to snippets/visualbasic/System.IO/FileInfo/Length/filelength.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/fileinfoname/VB/fileinfoname.vb b/snippets/visualbasic/System.IO/FileInfo/Name/fileinfoname.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/fileinfoname/VB/fileinfoname.vb
rename to snippets/visualbasic/System.IO/FileInfo/Name/fileinfoname.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/fileinfoopen/VB/fileinfoopen.vb b/snippets/visualbasic/System.IO/FileInfo/Open/fileinfoopen.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/fileinfoopen/VB/fileinfoopen.vb
rename to snippets/visualbasic/System.IO/FileInfo/Open/fileinfoopen.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo Open1/VB/finfo open1.vb b/snippets/visualbasic/System.IO/FileInfo/Open/finfo open1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo Open1/VB/finfo open1.vb
rename to snippets/visualbasic/System.IO/FileInfo/Open/finfo open1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo Open2/VB/finfo open2.vb b/snippets/visualbasic/System.IO/FileInfo/Open/finfo open2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo Open2/VB/finfo open2.vb
rename to snippets/visualbasic/System.IO/FileInfo/Open/finfo open2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo OpenRead/VB/finfo openread.vb b/snippets/visualbasic/System.IO/FileInfo/OpenRead/finfo openread.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo OpenRead/VB/finfo openread.vb
rename to snippets/visualbasic/System.IO/FileInfo/OpenRead/finfo openread.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo OpenText/VB/file opentext.vb b/snippets/visualbasic/System.IO/FileInfo/OpenText/file opentext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo OpenText/VB/file opentext.vb
rename to snippets/visualbasic/System.IO/FileInfo/OpenText/file opentext.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo OpenWrite/VB/file openwrite.vb b/snippets/visualbasic/System.IO/FileInfo/OpenWrite/file openwrite.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo OpenWrite/VB/file openwrite.vb
rename to snippets/visualbasic/System.IO/FileInfo/OpenWrite/file openwrite.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FInfo Class/VB/finfo class.vb b/snippets/visualbasic/System.IO/FileInfo/Overview/finfo class.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FInfo Class/VB/finfo class.vb
rename to snippets/visualbasic/System.IO/FileInfo/Overview/finfo class.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Replace/VB/sample.vb b/snippets/visualbasic/System.IO/FileInfo/Replace/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Replace/VB/sample.vb
rename to snippets/visualbasic/System.IO/FileInfo/Replace/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor2/VB/example.vb b/snippets/visualbasic/System.IO/FileOptions/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor2/VB/example.vb
rename to snippets/visualbasic/System.IO/FileOptions/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor2/VB/example2.vb b/snippets/visualbasic/System.IO/FileOptions/Overview/example2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor2/VB/example2.vb
rename to snippets/visualbasic/System.IO/FileOptions/Overview/example2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor1/VB/example.vb b/snippets/visualbasic/System.IO/FileStream/.ctor/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor1/VB/example.vb
rename to snippets/visualbasic/System.IO/FileStream/.ctor/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FStream CanSeek/VB/fstream canseek.vb b/snippets/visualbasic/System.IO/FileStream/CanSeek/fstream canseek.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FStream CanSeek/VB/fstream canseek.vb
rename to snippets/visualbasic/System.IO/FileStream/CanSeek/fstream canseek.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FStream CanWrite/VB/fstream canwrite.vb b/snippets/visualbasic/System.IO/FileStream/CanWrite/fstream canwrite.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FStream CanWrite/VB/fstream canwrite.vb
rename to snippets/visualbasic/System.IO/FileStream/CanWrite/fstream canwrite.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example.vb b/snippets/visualbasic/System.IO/FileStream/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example.vb
rename to snippets/visualbasic/System.IO/FileStream/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example3.vb b/snippets/visualbasic/System.IO/FileStream/Overview/example3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example3.vb
rename to snippets/visualbasic/System.IO/FileStream/Overview/example3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example4.vb b/snippets/visualbasic/System.IO/FileStream/Overview/example4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example4.vb
rename to snippets/visualbasic/System.IO/FileStream/Overview/example4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FStream Class/VB/fstream class.vb b/snippets/visualbasic/System.IO/FileStream/Overview/fstream class.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FStream Class/VB/fstream class.vb
rename to snippets/visualbasic/System.IO/FileStream/Overview/fstream class.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FSRead/VB/fsread.vb b/snippets/visualbasic/System.IO/FileStream/Read/fsread.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FSRead/VB/fsread.vb
rename to snippets/visualbasic/System.IO/FileStream/Read/fsread.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FileSystemInfo/VB/FileSystemInfo.vb b/snippets/visualbasic/System.IO/FileSystemInfo/Overview/FileSystemInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FileSystemInfo/VB/FileSystemInfo.vb
rename to snippets/visualbasic/System.IO/FileSystemInfo/Overview/FileSystemInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/pathcombine/VB/pathcombine.vb b/snippets/visualbasic/System.IO/Path/Combine/pathcombine.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/pathcombine/VB/pathcombine.vb
rename to snippets/visualbasic/System.IO/Path/Combine/pathcombine.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IO.Path.GetInvalidFile-PathChars/VB/example.vb b/snippets/visualbasic/System.IO/Path/GetInvalidFileNameChars/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IO.Path.GetInvalidFile-PathChars/VB/example.vb
rename to snippets/visualbasic/System.IO/Path/GetInvalidFileNameChars/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Path Class/VB/path class.vb b/snippets/visualbasic/System.IO/Path/Overview/path class.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Path Class/VB/path class.vb
rename to snippets/visualbasic/System.IO/Path/Overview/path class.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmReader Ctor1/VB/strmreader ctor1.vb b/snippets/visualbasic/System.IO/StreamReader/.ctor/strmreader ctor1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmReader Ctor1/VB/strmreader ctor1.vb
rename to snippets/visualbasic/System.IO/StreamReader/.ctor/strmreader ctor1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmReader Ctor2/VB/strmreader ctor2.vb b/snippets/visualbasic/System.IO/StreamReader/.ctor/strmreader ctor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmReader Ctor2/VB/strmreader ctor2.vb
rename to snippets/visualbasic/System.IO/StreamReader/.ctor/strmreader ctor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmReader CurrentEncoding/VB/strmreader currentencoding.vb b/snippets/visualbasic/System.IO/StreamReader/CurrentEncoding/strmreader currentencoding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmReader CurrentEncoding/VB/strmreader currentencoding.vb
rename to snippets/visualbasic/System.IO/StreamReader/CurrentEncoding/strmreader currentencoding.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ReadTextFile/VB/readtextfile.vb b/snippets/visualbasic/System.IO/StreamReader/Overview/readtextfile.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ReadTextFile/VB/readtextfile.vb
rename to snippets/visualbasic/System.IO/StreamReader/Overview/readtextfile.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmReader Peek/VB/strmreader peek.vb b/snippets/visualbasic/System.IO/StreamReader/Peek/strmreader peek.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmReader Peek/VB/strmreader peek.vb
rename to snippets/visualbasic/System.IO/StreamReader/Peek/strmreader peek.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmRdrRead/VB/strmrdrread.vb b/snippets/visualbasic/System.IO/StreamReader/Read/strmrdrread.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmRdrRead/VB/strmrdrread.vb
rename to snippets/visualbasic/System.IO/StreamReader/Read/strmrdrread.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmReader Read1/VB/strmreader read1.vb b/snippets/visualbasic/System.IO/StreamReader/Read/strmreader read1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmReader Read1/VB/strmreader read1.vb
rename to snippets/visualbasic/System.IO/StreamReader/Read/strmreader read1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmReader Read2/VB/strmreader read2.vb b/snippets/visualbasic/System.IO/StreamReader/Read/strmreader read2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmReader Read2/VB/strmreader read2.vb
rename to snippets/visualbasic/System.IO/StreamReader/Read/strmreader read2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmReader ReadLine/VB/strmreader readline.vb b/snippets/visualbasic/System.IO/StreamReader/ReadLine/strmreader readline.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmReader ReadLine/VB/strmreader readline.vb
rename to snippets/visualbasic/System.IO/StreamReader/ReadLine/strmreader readline.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrmReader ReadToEnd/VB/strmreader readtoend.vb b/snippets/visualbasic/System.IO/StreamReader/ReadToEnd/strmreader readtoend.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrmReader ReadToEnd/VB/strmreader readtoend.vb
rename to snippets/visualbasic/System.IO/StreamReader/ReadToEnd/strmreader readtoend.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/streamreadwrite/vb/module1.vb b/snippets/visualbasic/System.IO/StreamWriter/Overview/module1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/streamreadwrite/vb/module1.vb
rename to snippets/visualbasic/System.IO/StreamWriter/Overview/module1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/streamreadwrite/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.IO/StreamWriter/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/streamreadwrite/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.IO/StreamWriter/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/streamreadwrite/vb/readwrite.vbproj b/snippets/visualbasic/System.IO/StreamWriter/Overview/readwrite.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/streamreadwrite/vb/readwrite.vbproj
rename to snippets/visualbasic/System.IO/StreamWriter/Overview/readwrite.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/WaitForChangedResult/VB/WaitforChangedResult.vb b/snippets/visualbasic/System.IO/WaitForChangedResult/Overview/WaitforChangedResult.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/WaitForChangedResult/VB/WaitforChangedResult.vb
rename to snippets/visualbasic/System.IO/WaitForChangedResult/Overview/WaitforChangedResult.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder.DefineResource Example 2/VB/assemblybuilder_defineresource.vb b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineResource/assemblybuilder_defineresource.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder.DefineResource Example 2/VB/assemblybuilder_defineresource.vb
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineResource/assemblybuilder_defineresource.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource/VB/assemblybuilder_defineunmanagedresource.vb b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/assemblybuilder_defineunmanagedresource.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource/VB/assemblybuilder_defineunmanagedresource.vb
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/assemblybuilder_defineunmanagedresource.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource2/VB/assemblybuilder_defineunmanagedresource2.vb b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/assemblybuilder_defineunmanagedresource2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource2/VB/assemblybuilder_defineunmanagedresource2.vb
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/assemblybuilder_defineunmanagedresource2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource/VB/makefile b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource/VB/makefile
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource2/VB/makefile b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/makefile1
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource2/VB/makefile
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/makefile1
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilderClass/vb/24895.vb b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/Overview/24895.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilderClass/vb/24895.vb
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/Overview/24895.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilderClass/vb/AssemblyBuilderClass.vbproj b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/Overview/AssemblyBuilderClass.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilderClass/vb/AssemblyBuilderClass.vbproj
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/Overview/AssemblyBuilderClass.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_SetCustomAttribute1/VB/assemblybuilder_setcustomattribute1.vb b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/SetCustomAttribute/assemblybuilder_setcustomattribute1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_SetCustomAttribute1/VB/assemblybuilder_setcustomattribute1.vb
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/SetCustomAttribute/assemblybuilder_setcustomattribute1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_SetCustomAttribute2/VB/assemblybuilder_setcustomattribute2.vb b/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/SetCustomAttribute/assemblybuilder_setcustomattribute2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_SetCustomAttribute2/VB/assemblybuilder_setcustomattribute2.vb
rename to snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/SetCustomAttribute/assemblybuilder_setcustomattribute2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_Attributes_4/VB/constructorbuilder_attributes_4.vb b/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/AddDeclarativeSecurity/constructorbuilder_attributes_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_Attributes_4/VB/constructorbuilder_attributes_4.vb
rename to snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/AddDeclarativeSecurity/constructorbuilder_attributes_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_Name_5/VB/constructorbuilder_name_5.vb b/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/Name/constructorbuilder_name_5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_Name_5/VB/constructorbuilder_name_5.vb
rename to snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/Name/constructorbuilder_name_5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetCustomAttribute1/VB/constructorbuilder_setcustomattribute1.vb b/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetCustomAttribute/constructorbuilder_setcustomattribute1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetCustomAttribute1/VB/constructorbuilder_setcustomattribute1.vb
rename to snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetCustomAttribute/constructorbuilder_setcustomattribute1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetCustomAttribute2/VB/constructorbuilder_setcustomattribute2.vb b/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetCustomAttribute/constructorbuilder_setcustomattribute2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetCustomAttribute2/VB/constructorbuilder_setcustomattribute2.vb
rename to snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetCustomAttribute/constructorbuilder_setcustomattribute2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetImplementationFlags/VB/constructorbuilder_setimplementationflags.vb b/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetImplementationFlags/constructorbuilder_setimplementationflags.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetImplementationFlags/VB/constructorbuilder_setimplementationflags.vb
rename to snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetImplementationFlags/constructorbuilder_setimplementationflags.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetSymCustomAttribute/VB/constructorbuilder_setsymcustomattribute.vb b/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetSymCustomAttribute/constructorbuilder_setsymcustomattribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetSymCustomAttribute/VB/constructorbuilder_setsymcustomattribute.vb
rename to snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetSymCustomAttribute/constructorbuilder_setsymcustomattribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ClosedOver/vb/source.vb b/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ClosedOver/vb/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ctor1/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ctor1/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_5/VB/enumbuilder_properties_5.vb b/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_5/VB/enumbuilder_properties_5.vb
rename to snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_4.cs/VB/enumbuilder_properties_4.vb b/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GUID/enumbuilder_properties_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_4.cs/VB/enumbuilder_properties_4.vb
rename to snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GUID/enumbuilder_properties_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_SetCustomAttribute1/VB/enumbuilder_setcustomattribute1.vb b/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_SetCustomAttribute1/VB/enumbuilder_setcustomattribute1.vb
rename to snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_SetCustomAttribute2/VB/enumbuilder_setcustomattribute2.vb b/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_SetCustomAttribute2/VB/enumbuilder_setcustomattribute2.vb
rename to snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineEnum/VB/modulebuilder_defineenum.vb b/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Overview/modulebuilder_defineenum.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineEnum/VB/modulebuilder_defineenum.vb
rename to snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Overview/modulebuilder_defineenum.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_ReflectedType/VB/fieldbuilder_reflectedtype.vb b/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Attributes/fieldbuilder_reflectedtype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_ReflectedType/VB/fieldbuilder_reflectedtype.vb
rename to snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Attributes/fieldbuilder_reflectedtype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_Class_Name/FieldBuilder.vb b/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Overview/FieldBuilder.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_Class_Name/FieldBuilder.vb
rename to snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Overview/FieldBuilder.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_Class_Name/FieldBuilder.vbproj b/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Overview/FieldBuilder.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_Class_Name/FieldBuilder.vbproj
rename to snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Overview/FieldBuilder.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_SetCustomAttributes/VB/fieldbuilder_setcustomattributes.vb b/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/SetCustomAttribute/fieldbuilder_setcustomattributes.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_SetCustomAttributes/VB/fieldbuilder_setcustomattributes.vb
rename to snippets/visualbasic/System.Reflection.Emit/FieldBuilder/SetCustomAttribute/fieldbuilder_setcustomattributes.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_SetOffset/VB/fieldbuilder_setoffset.vb b/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/SetMarshal/fieldbuilder_setoffset.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_SetOffset/VB/fieldbuilder_setoffset.vb
rename to snippets/visualbasic/System.Reflection.Emit/FieldBuilder/SetMarshal/fieldbuilder_setoffset.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MakeXxxGenericTypeParameterBuilder/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MakeXxxGenericTypeParameterBuilder/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EmitGenericType/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EmitGenericType/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ILGenerator_BeginFaultBlock/VB/ilgenerator_beginfaultblock.vb b/snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginFaultBlock/ilgenerator_beginfaultblock.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ILGenerator_BeginFaultBlock/VB/ilgenerator_beginfaultblock.vb
rename to snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginFaultBlock/ilgenerator_beginfaultblock.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ILGenerator_BeginFinallyBlock_2/VB/ilgenerator_beginfinallyblock_2.vb b/snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginFinallyBlock/ilgenerator_beginfinallyblock_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ILGenerator_BeginFinallyBlock_2/VB/ilgenerator_beginfinallyblock_2.vb
rename to snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginFinallyBlock/ilgenerator_beginfinallyblock_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ILGenerator_Begin_EndScope/VB/ilgenerator_begin_endscope.vb b/snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginScope/ilgenerator_begin_endscope.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ILGenerator_Begin_EndScope/VB/ilgenerator_begin_endscope.vb
rename to snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginScope/ilgenerator_begin_endscope.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/LocalBuilder_Sample_SetLocalSymInfo/VB/localbuilder_sample_4.vb b/snippets/visualbasic/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/LocalBuilder_Sample_SetLocalSymInfo/VB/localbuilder_sample_4.vb
rename to snippets/visualbasic/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MethodBuilderClass_TypeSample/VB/methodbuilderclass.vb b/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DeclaringType/methodbuilderclass.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MethodBuilderClass_TypeSample/VB/methodbuilderclass.vb
rename to snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DeclaringType/methodbuilderclass.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MethodBuilder.MakeGenericMethod/vb/source.vb b/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/MakeGenericMethod/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MethodBuilder.MakeGenericMethod/vb/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/MethodBuilder/MakeGenericMethod/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.GetField_Generic/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/SetSignature/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.GetField_Generic/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/MethodBuilder/SetSignature/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_CreateGlobalFunctions/VB/modulebuilder_createglobalfunctions.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/CreateGlobalFunctions/modulebuilder_createglobalfunctions.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_CreateGlobalFunctions/VB/modulebuilder_createglobalfunctions.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/CreateGlobalFunctions/modulebuilder_createglobalfunctions.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineInitializedData/VB/modulebuilder_defineinitializeddata.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineInitializedData/modulebuilder_defineinitializeddata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineInitializedData/VB/modulebuilder_defineinitializeddata.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineInitializedData/modulebuilder_defineinitializeddata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DefineManifestResource/vb/source.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineManifestResource/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DefineManifestResource/vb/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineManifestResource/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefinePInvokeMethod1/VB/modulebuilder_definepinvokemethod1.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefinePInvokeMethod/modulebuilder_definepinvokemethod1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefinePInvokeMethod1/VB/modulebuilder_definepinvokemethod1.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefinePInvokeMethod/modulebuilder_definepinvokemethod1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineResource1/VB/modulebuilder_defineresource1.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineResource/modulebuilder_defineresource1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineResource1/VB/modulebuilder_defineresource1.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineResource/modulebuilder_defineresource1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineResource2/VB/modulebuilder_defineresource2.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineResource/modulebuilder_defineresource2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineResource2/VB/modulebuilder_defineresource2.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineResource/modulebuilder_defineresource2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_GetArrayMethod/VB/modulebuilder_getarraymethod.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/GetArrayMethod/modulebuilder_getarraymethod.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_GetArrayMethod/VB/modulebuilder_getarraymethod.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/GetArrayMethod/modulebuilder_getarraymethod.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_Class/VB/modulebuilder.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/Overview/modulebuilder.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_Class/VB/modulebuilder.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/Overview/modulebuilder.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PropertyBuilder_SetGetMethod_4/VB/propertybuilder_setgetmethod_4.vb b/snippets/visualbasic/System.Reflection.Emit/PropertyBuilder/SetGetMethod/propertybuilder_setgetmethod_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PropertyBuilder_SetGetMethod_4/VB/propertybuilder_setgetmethod_4.vb
rename to snippets/visualbasic/System.Reflection.Emit/PropertyBuilder/SetGetMethod/propertybuilder_setgetmethod_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_AddDeclarativeSecurity/VB/typebuilder_adddeclarativesecurity.vb b/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/AddDeclarativeSecurity/typebuilder_adddeclarativesecurity.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_AddDeclarativeSecurity/VB/typebuilder_adddeclarativesecurity.vb
rename to snippets/visualbasic/System.Reflection.Emit/TypeBuilder/AddDeclarativeSecurity/typebuilder_adddeclarativesecurity.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_Sample_4/VB/typebuilder_sample_4.vb b/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/AddInterfaceImplementation/typebuilder_sample_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_Sample_4/VB/typebuilder_sample_4.vb
rename to snippets/visualbasic/System.Reflection.Emit/TypeBuilder/AddInterfaceImplementation/typebuilder_sample_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefineNestedType1/VB/typebuilder_definenestedtype1.vb b/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineMethod/typebuilder_definenestedtype1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefineNestedType1/VB/typebuilder_definenestedtype1.vb
rename to snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineMethod/typebuilder_definenestedtype1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.DefineMethodOverride/vb/source.vb b/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineMethodOverride/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.DefineMethodOverride/vb/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineMethodOverride/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefinePInvokeMethod_Fix/VB/100656_fix.vb b/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefinePInvokeMethod/100656_fix.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefinePInvokeMethod_Fix/VB/100656_fix.vb
rename to snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefinePInvokeMethod/100656_fix.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_Properties1/VB/typebuilder_properties.vb b/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineTypeInitializer/typebuilder_properties.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_Properties1/VB/typebuilder_properties.vb
rename to snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineTypeInitializer/typebuilder_properties.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefineUninitializedData/VB/typebuilder_defineuninitializeddata.vb b/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineUninitializedData/typebuilder_defineuninitializeddata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefineUninitializedData/VB/typebuilder_defineuninitializeddata.vb
rename to snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineUninitializedData/typebuilder_defineuninitializeddata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MakeXxxTypeBuilder/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MakeXxxTypeBuilder/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Assembly.FullName/VB/Example.vb b/snippets/visualbasic/System.Reflection/Assembly/FullName/Example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Assembly.FullName/VB/Example.vb
rename to snippets/visualbasic/System.Reflection/Assembly/FullName/Example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Assembly.GetExportedTypes/VB/source.vb b/snippets/visualbasic/System.Reflection/Assembly/GetExportedTypes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Assembly.GetExportedTypes/VB/source.vb
rename to snippets/visualbasic/System.Reflection/Assembly/GetExportedTypes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Reflection/VB/Reflection.vb b/snippets/visualbasic/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Reflection/VB/Reflection.vb
rename to snippets/visualbasic/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Assembly.Load1/VB/load1.vb b/snippets/visualbasic/System.Reflection/Assembly/Load/load1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Assembly.Load1/VB/load1.vb
rename to snippets/visualbasic/System.Reflection/Assembly/Load/load1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyClass/vb/source.vb b/snippets/visualbasic/System.Reflection/Assembly/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyClass/vb/source.vb
rename to snippets/visualbasic/System.Reflection/Assembly/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineVersionInfoResource/VB/assemblybuilder_defineversioninforesource.vb b/snippets/visualbasic/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineVersionInfoResource/VB/assemblybuilder_defineversioninforesource.vb
rename to snippets/visualbasic/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyDelaySignAttribute/vb/makefile b/snippets/visualbasic/System.Reflection/AssemblyDelaySignAttribute/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyDelaySignAttribute/vb/makefile
rename to snippets/visualbasic/System.Reflection/AssemblyDelaySignAttribute/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyDelaySignAttribute/vb/source.vb b/snippets/visualbasic/System.Reflection/AssemblyDelaySignAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyDelaySignAttribute/vb/source.vb
rename to snippets/visualbasic/System.Reflection/AssemblyDelaySignAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyFlagsAttribute/VB/source.vb b/snippets/visualbasic/System.Reflection/AssemblyFlagsAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyFlagsAttribute/VB/source.vb
rename to snippets/visualbasic/System.Reflection/AssemblyFlagsAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_Constructor/VB/assemblyname_constructor.vb b/snippets/visualbasic/System.Reflection/AssemblyName/.ctor/assemblyname_constructor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyName_Constructor/VB/assemblyname_constructor.vb
rename to snippets/visualbasic/System.Reflection/AssemblyName/.ctor/assemblyname_constructor.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_Constructor_2/VB/source.vb b/snippets/visualbasic/System.Reflection/AssemblyName/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyName_Constructor_2/VB/source.vb
rename to snippets/visualbasic/System.Reflection/AssemblyName/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_CodeBase/VB/assemblyname_codebase.vb b/snippets/visualbasic/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyName_CodeBase/VB/assemblyname_codebase.vb
rename to snippets/visualbasic/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_KeyPair/VB/assemblyname_keypair.vb b/snippets/visualbasic/System.Reflection/AssemblyName/Flags/assemblyname_keypair.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyName_KeyPair/VB/assemblyname_keypair.vb
rename to snippets/visualbasic/System.Reflection/AssemblyName/Flags/assemblyname_keypair.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_KeyPair/VB/makefile b/snippets/visualbasic/System.Reflection/AssemblyName/Flags/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyName_KeyPair/VB/makefile
rename to snippets/visualbasic/System.Reflection/AssemblyName/Flags/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_GetAssemblyName/VB/assemblyname_getassemblyname.vb b/snippets/visualbasic/System.Reflection/AssemblyName/GetAssemblyName/assemblyname_getassemblyname.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyName_GetAssemblyName/VB/assemblyname_getassemblyname.vb
rename to snippets/visualbasic/System.Reflection/AssemblyName/GetAssemblyName/assemblyname_getassemblyname.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_SetPublicKey/VB/assemblyname_setpublickey.vb b/snippets/visualbasic/System.Reflection/AssemblyName/SetPublicKey/assemblyname_setpublickey.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyName_SetPublicKey/VB/assemblyname_setpublickey.vb
rename to snippets/visualbasic/System.Reflection/AssemblyName/SetPublicKey/assemblyname_setpublickey.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyName.Version/vb/Example.vb b/snippets/visualbasic/System.Reflection/AssemblyName/Version/Example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyName.Version/vb/Example.vb
rename to snippets/visualbasic/System.Reflection/AssemblyName/Version/Example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Binder_1/VB/binder.vb b/snippets/visualbasic/System.Reflection/Binder/Overview/binder.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Binder_1/VB/binder.vb
rename to snippets/visualbasic/System.Reflection/Binder/Overview/binder.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/BindingFlags/VB/bindingflagssample.vb b/snippets/visualbasic/System.Reflection/BindingFlags/Overview/bindingflagssample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/BindingFlags/VB/bindingflagssample.vb
rename to snippets/visualbasic/System.Reflection/BindingFlags/Overview/bindingflagssample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb b/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb
rename to snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_GetEvents1/VB/typebuilder_getevents1.vb b/snippets/visualbasic/System.Reflection/EventAttributes/Overview/typebuilder_getevents1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_GetEvents1/VB/typebuilder_getevents1.vb
rename to snippets/visualbasic/System.Reflection/EventAttributes/Overview/typebuilder_getevents1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddEventHandler/vb/source.vb b/snippets/visualbasic/System.Reflection/EventInfo/AddEventHandler/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddEventHandler/vb/source.vb
rename to snippets/visualbasic/System.Reflection/EventInfo/AddEventHandler/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AddEventHandler/vb/vb.vbproj b/snippets/visualbasic/System.Reflection/EventInfo/AddEventHandler/vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AddEventHandler/vb/vb.vbproj
rename to snippets/visualbasic/System.Reflection/EventInfo/AddEventHandler/vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/EventArg/VB/eventarg.vb b/snippets/visualbasic/System.Reflection/EventInfo/EventHandlerType/eventarg.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/EventArg/VB/eventarg.vb
rename to snippets/visualbasic/System.Reflection/EventInfo/EventHandlerType/eventarg.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb b/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb
rename to snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_FieldHandle/VB/fieldinfo_fieldhandle.vb b/snippets/visualbasic/System.Reflection/FieldInfo/FieldHandle/fieldinfo_fieldhandle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_FieldHandle/VB/fieldinfo_fieldhandle.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/FieldHandle/fieldinfo_fieldhandle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetFieldFromHandle/VB/fieldinfo_getfieldfromhandle.vb b/snippets/visualbasic/System.Reflection/FieldInfo/GetFieldFromHandle/fieldinfo_getfieldfromhandle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetFieldFromHandle/VB/fieldinfo_getfieldfromhandle.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/GetFieldFromHandle/fieldinfo_getfieldfromhandle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetFieldFromHandle2/vb/source.vb b/snippets/visualbasic/System.Reflection/FieldInfo/GetFieldFromHandle/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetFieldFromHandle2/vb/source.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/GetFieldFromHandle/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetValue/VB/fieldinfo_getvalue.vb b/snippets/visualbasic/System.Reflection/FieldInfo/GetValue/fieldinfo_getvalue.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetValue/VB/fieldinfo_getvalue.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/GetValue/fieldinfo_getvalue.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/GetFldVal/VB/getfldval.vb b/snippets/visualbasic/System.Reflection/FieldInfo/GetValue/getfldval.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/GetFldVal/VB/getfldval.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/GetValue/getfldval.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsNotSerialized/VB/fieldinfo_isnotserialized.vb b/snippets/visualbasic/System.Reflection/FieldInfo/IsNotSerialized/fieldinfo_isnotserialized.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsNotSerialized/VB/fieldinfo_isnotserialized.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/IsNotSerialized/fieldinfo_isnotserialized.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsPInvokeImpl/VB/fieldinfo_ispinvokeimpl.vb b/snippets/visualbasic/System.Reflection/FieldInfo/IsPinvokeImpl/fieldinfo_ispinvokeimpl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsPInvokeImpl/VB/fieldinfo_ispinvokeimpl.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/IsPinvokeImpl/fieldinfo_ispinvokeimpl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsPrivate/VB/fieldinfo_isprivate.vb b/snippets/visualbasic/System.Reflection/FieldInfo/IsPrivate/fieldinfo_isprivate.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsPrivate/VB/fieldinfo_isprivate.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/IsPrivate/fieldinfo_isprivate.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo/VB/fieldinfo.vb b/snippets/visualbasic/System.Reflection/FieldInfo/Overview/fieldinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo/VB/fieldinfo.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/Overview/fieldinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_SetValue/VB/fieldinfo_setvalue.vb b/snippets/visualbasic/System.Reflection/FieldInfo/SetValue/fieldinfo_setvalue.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_SetValue/VB/fieldinfo_setvalue.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/SetValue/fieldinfo_setvalue.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MemberInfo_GetCustomAttributes1/VB/memberinfo_getcustomattributes1.vb b/snippets/visualbasic/System.Reflection/MemberInfo/GetCustomAttributes/memberinfo_getcustomattributes1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MemberInfo_GetCustomAttributes1/VB/memberinfo_getcustomattributes1.vb
rename to snippets/visualbasic/System.Reflection/MemberInfo/GetCustomAttributes/memberinfo_getcustomattributes1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MemberInfo_GetCustomAttribute_IsDefined/VB/memberinfo_getcustomattribute_isdefined.vb b/snippets/visualbasic/System.Reflection/MemberInfo/IsDefined/memberinfo_getcustomattribute_isdefined.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MemberInfo_GetCustomAttribute_IsDefined/VB/memberinfo_getcustomattribute_isdefined.vb
rename to snippets/visualbasic/System.Reflection/MemberInfo/IsDefined/memberinfo_getcustomattribute_isdefined.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_GetModule_4/VB/constructorbuilder_getmodule_4.vb b/snippets/visualbasic/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_GetModule_4/VB/constructorbuilder_getmodule_4.vb
rename to snippets/visualbasic/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Module.MethodResolve/vb/source.vb b/snippets/visualbasic/System.Reflection/Module/ResolveMethod/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Module.MethodResolve/vb/source.vb
rename to snippets/visualbasic/System.Reflection/Module/ResolveMethod/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ObfuscateAssemblyAttribute/vb/source.vb b/snippets/visualbasic/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ObfuscateAssemblyAttribute/vb/source.vb
rename to snippets/visualbasic/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ObfuscationAttribute/vb/source.vb b/snippets/visualbasic/System.Reflection/ObfuscationAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ObfuscationAttribute/vb/source.vb
rename to snippets/visualbasic/System.Reflection/ObfuscationAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_Attributes1/VB/parameterinfo_attributes1.vb b/snippets/visualbasic/System.Reflection/ParameterInfo/Attributes/parameterinfo_attributes1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_Attributes1/VB/parameterinfo_attributes1.vb
rename to snippets/visualbasic/System.Reflection/ParameterInfo/Attributes/parameterinfo_attributes1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_GetCustomAttributes/VB/source.vb b/snippets/visualbasic/System.Reflection/ParameterInfo/GetCustomAttributes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_GetCustomAttributes/VB/source.vb
rename to snippets/visualbasic/System.Reflection/ParameterInfo/GetCustomAttributes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_GetCustomAttribute_IsDefined/VB/parameterinfo_getcustomattribute_isdefined.vb b/snippets/visualbasic/System.Reflection/ParameterInfo/IsDefined/parameterinfo_getcustomattribute_isdefined.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_GetCustomAttribute_IsDefined/VB/parameterinfo_getcustomattribute_isdefined.vb
rename to snippets/visualbasic/System.Reflection/ParameterInfo/IsDefined/parameterinfo_getcustomattribute_isdefined.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_IsIn_IsOut_IsOptional/VB/parameterinfo_isin_isout_isoptional.vb b/snippets/visualbasic/System.Reflection/ParameterInfo/IsIn/parameterinfo_isin_isout_isoptional.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_IsIn_IsOut_IsOptional/VB/parameterinfo_isin_isout_isoptional.vb
rename to snippets/visualbasic/System.Reflection/ParameterInfo/IsIn/parameterinfo_isin_isout_isoptional.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PropertyInfo.SetValue/vb/Example.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/Example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PropertyInfo.SetValue/vb/Example.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/Example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/PropertyInfo.SetValue/vb/example2.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/example2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/PropertyInfo.SetValue/vb/example2.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/example2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StrongNameKeyPairX/VB/StrongNameKeyPairX.vb b/snippets/visualbasic/System.Reflection/StrongNameKeyPair/Overview/StrongNameKeyPairX.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StrongNameKeyPairX/VB/StrongNameKeyPairX.vb
rename to snippets/visualbasic/System.Reflection/StrongNameKeyPair/Overview/StrongNameKeyPairX.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeFilter/VB/Typefilter.vb b/snippets/visualbasic/System.Reflection/TypeFilter/Overview/Typefilter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeFilter/VB/Typefilter.vb
rename to snippets/visualbasic/System.Reflection/TypeFilter/Overview/Typefilter.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.resx/vb/create1.vb b/snippets/visualbasic/System.Resources/ResXResourceWriter/Overview/create1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.resx/vb/create1.vb
rename to snippets/visualbasic/System.Resources/ResXResourceWriter/Overview/create1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.retrieving/vb/createresources.vb b/snippets/visualbasic/System.Resources/ResourceManager/GetStream/createresources.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.retrieving/vb/createresources.vb
rename to snippets/visualbasic/System.Resources/ResourceManager/GetStream/createresources.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.retrieving/vb/getstream.vb b/snippets/visualbasic/System.Resources/ResourceManager/GetStream/getstream.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.retrieving/vb/getstream.vb
rename to snippets/visualbasic/System.Resources/ResourceManager/GetStream/getstream.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/runtime.compilerservices.asyncstatemachineattribute/vb/module1.vb b/snippets/visualbasic/System.Runtime.CompilerServices/AsyncStateMachineAttribute/Overview/module1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/runtime.compilerservices.asyncstatemachineattribute/vb/module1.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/AsyncStateMachineAttribute/Overview/module1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/runtime.compilerservices.asyncstatemachineattribute/vb/module2.vb b/snippets/visualbasic/System.Runtime.CompilerServices/AsyncStateMachineAttribute/Overview/module2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/runtime.compilerservices.asyncstatemachineattribute/vb/module2.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/AsyncStateMachineAttribute/Overview/module2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.CompilationRelaxationsAttribute/vb/example.vb b/snippets/visualbasic/System.Runtime.CompilerServices/CompilationRelaxationsAttribute/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.CompilationRelaxationsAttribute/vb/example.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/CompilationRelaxationsAttribute/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.CompilerGlobalScopeAttribute/vb/example.vb b/snippets/visualbasic/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.CompilerGlobalScopeAttribute/vb/example.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DefaultDependencyAttribute/vb/example.vb b/snippets/visualbasic/System.Runtime.CompilerServices/DefaultDependencyAttribute/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DefaultDependencyAttribute/vb/example.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/DefaultDependencyAttribute/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DependencyAttribute/vb/example.vb b/snippets/visualbasic/System.Runtime.CompilerServices/DependencyAttribute/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DependencyAttribute/vb/example.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/DependencyAttribute/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DiscardableAttribute/vb/example.vb b/snippets/visualbasic/System.Runtime.CompilerServices/DiscardableAttribute/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DiscardableAttribute/vb/example.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/DiscardableAttribute/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.RuntimeHelpers.Equals/vb/example.vb b/snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/Equals/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.RuntimeHelpers.Equals/vb/example.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/Equals/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.RuntimeHelpers.GetObjectValue/vb/example.vb b/snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/GetObjectValue/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.RuntimeHelpers.GetObjectValue/vb/example.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/GetObjectValue/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/SafeHandle-RuntimeHelpers.PrepareConstrainedRegions/vb/sample.vb b/snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/SafeHandle-RuntimeHelpers.PrepareConstrainedRegions/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.StringFreezingAttribute/vb/example.vb b/snippets/visualbasic/System.Runtime.CompilerServices/StringFreezingAttribute/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.StringFreezingAttribute/vb/example.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/StringFreezingAttribute/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.SuppressIldasmAttribute/vb/sample.vb b/snippets/visualbasic/System.Runtime.CompilerServices/SuppressIldasmAttribute/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.SuppressIldasmAttribute/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.CompilerServices/SuppressIldasmAttribute/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/SafeHandle.SafeFileHandle/vb/program.vb b/snippets/visualbasic/System.Runtime.ConstrainedExecution/CriticalFinalizerObject/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/SafeHandle.SafeFileHandle/vb/program.vb
rename to snippets/visualbasic/System.Runtime.ConstrainedExecution/CriticalFinalizerObject/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Interop CallingConvention/VB/callingconv.vb b/snippets/visualbasic/System.Runtime.InteropServices/CallingConvention/Overview/callingconv.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Interop CallingConvention/VB/callingconv.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/CallingConvention/Overview/callingconv.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ClassInterfaceType/VB/ClassInterfaceType.vb b/snippets/visualbasic/System.Runtime.InteropServices/ClassInterfaceType/Overview/ClassInterfaceType.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ClassInterfaceType/VB/ClassInterfaceType.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ClassInterfaceType/Overview/ClassInterfaceType.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile2.vb b/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile2.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile3.vb b/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile3.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile4.vb b/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile4.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile5.vb b/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile5.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.PreserveSigAttribute/vb/example.vb b/snippets/visualbasic/System.Runtime.InteropServices/DllImportAttribute/PreserveSig/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.PreserveSigAttribute/vb/example.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/DllImportAttribute/PreserveSig/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Interop InOutParameters/VB/inout.vb b/snippets/visualbasic/System.Runtime.InteropServices/InAttribute/Overview/inout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Interop InOutParameters/VB/inout.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/InAttribute/Overview/inout.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/LCIDConversionAttributeSample2/VB/lcidattrsample.vb b/snippets/visualbasic/System.Runtime.InteropServices/LCIDConversionAttribute/Overview/lcidattrsample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/LCIDConversionAttributeSample2/VB/lcidattrsample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/LCIDConversionAttribute/Overview/lcidattrsample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/LayoutKind/VB/layoutkind.vb b/snippets/visualbasic/System.Runtime.InteropServices/LayoutKind/Overview/layoutkind.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/LayoutKind/VB/layoutkind.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/LayoutKind/Overview/layoutkind.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-byte/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-byte/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-char/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-char/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-double/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-double/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int16/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int16/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int64/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int64/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetHRForLastWin32Error/vb/example.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetHRForLastWin32Error/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetHRForLastWin32Error/vb/example.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetHRForLastWin32Error/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetITypeInfoForType/vb/example.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetITypeInfoForType/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetITypeInfoForType/vb/example.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetITypeInfoForType/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetIUnknownForObject-release/vb/example.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetIUnknownForObject/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetIUnknownForObject-release/vb/example.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetIUnknownForObject/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetIUnknownForObjectInContext-release/vb/example.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetIUnknownForObjectInContext/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetIUnknownForObjectInContext-release/vb/example.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetIUnknownForObjectInContext/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetLastWin32Error/vb/example.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetLastWin32Error/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetLastWin32Error/vb/example.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetLastWin32Error/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Marshal/VB/Marshal.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Overview/Marshal.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Marshal/VB/Marshal.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/Overview/Marshal.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.PtrToStructure-SizeOf/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/PtrToStructure/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.PtrToStructure-SizeOf/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/PtrToStructure/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.ReadByte - WriteByte/vb/example.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/ReadByte/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.ReadByte - WriteByte/vb/example.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/ReadByte/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToCoTaskMemAnsi/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemAnsi/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToCoTaskMemAnsi/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemAnsi/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToCoTaskMemUnicode/vb/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemUnicode/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToCoTaskMemUnicode/vb/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemUnicode/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToHGlobalAnsi/VB/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocAnsi/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToHGlobalAnsi/VB/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocAnsi/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToHGlobalUni/VB/sample.vb b/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocUnicode/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToHGlobalUni/VB/sample.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocUnicode/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ProgIdAttribute_Value/VB/progidattribute_value.vb b/snippets/visualbasic/System.Runtime.InteropServices/ProgIdAttribute/Overview/progidattribute_value.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ProgIdAttribute_Value/VB/progidattribute_value.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ProgIdAttribute/Overview/progidattribute_value.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RuntimeEnvironment/VB/RuntimeEnvironment.vb b/snippets/visualbasic/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RuntimeEnvironment/VB/RuntimeEnvironment.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StructLayoutAttribute/VB/structlayoutattribute.vb b/snippets/visualbasic/System.Runtime.InteropServices/StructLayoutAttribute/Overview/structlayoutattribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StructLayoutAttribute/VB/structlayoutattribute.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/StructLayoutAttribute/Overview/structlayoutattribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeLibVar/VB/codefile6.vb b/snippets/visualbasic/System.Runtime.InteropServices/TypeLibVarAttribute/Overview/codefile6.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeLibVar/VB/codefile6.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/TypeLibVarAttribute/Overview/codefile6.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AsyncResult.NewExamples/VB/ad.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/IsTransparentProxy/ad.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AsyncResult.NewExamples/VB/ad.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/IsTransparentProxy/ad.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/environment.IsServerGC/VB/isg.vb b/snippets/visualbasic/System.Runtime/GCSettings/IsServerGC/isg.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/environment.IsServerGC/VB/isg.vb
rename to snippets/visualbasic/System.Runtime/GCSettings/IsServerGC/isg.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AccessControl.FileSystemAuditRule/vb/sample.vb b/snippets/visualbasic/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AccessControl.FileSystemAuditRule/vb/sample.vb
rename to snippets/visualbasic/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/storenames1.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/storenames1.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/Project.csproj b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/Project.csproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/Project.csproj
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/Project.csproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/program.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/program.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/x509storename/vb/program.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/StoreName/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/x509storename/vb/program.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/StoreName/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/Project.vbproj b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/Project.vbproj
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate.Import-Export/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/.ctor/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate.Import-Export/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/.ctor/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.ToString Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/CreateFromCertFile/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.ToString Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/CreateFromCertFile/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.Equals Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Equals/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.Equals Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Equals/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetCertHash Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetCertHash/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetCertHash Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetCertHash/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetCertHashString Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetCertHashString/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetCertHashString Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetCertHashString/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetEffectiveDateString Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetEffectiveDateString/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetEffectiveDateString Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetEffectiveDateString/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetExpirationDateString Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetExpirationDateString/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetExpirationDateString Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetExpirationDateString/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetFormat Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetFormat/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetFormat Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetFormat/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetHashCode Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetHashCode/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetHashCode Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetHashCode/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetIssuerName Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetIssuerName/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetIssuerName Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetIssuerName/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithm Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithm/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithm Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithm/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithmParameters Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithmParameters/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithmParameters Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithmParameters/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithmParametersString/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithmParametersString/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithmParametersString/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithmParametersString/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetName Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetName/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetName Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetName/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetPublicKey Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetPublicKey/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetPublicKey Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetPublicKey/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetPublicKeyString Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetPublicKeyString/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetPublicKeyString Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetPublicKeyString/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetRawCertData Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetRawCertData/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetRawCertData Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetRawCertData/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetRawCertDataString Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetRawCertDataString/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetRawCertDataString Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetRawCertDataString/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetSerialNumber Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetSerialNumber/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetSerialNumber Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetSerialNumber/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetSerialNumberString Method/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetSerialNumberString/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetSerialNumberString Method/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetSerialNumberString/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate.Import/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Import/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate.Import/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Import/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/remarks.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/remarks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/remarks.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/remarks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb b/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb
rename to snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.EncryptedData2/VB/encrypteddata.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/encrypteddata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.EncryptedData2/VB/encrypteddata.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/encrypteddata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.CipherReference/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.CipherReference/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/cryptgraphy.Xml.EncryptedData/VB/encrypteddata.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/Overview/encrypteddata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/cryptgraphy.Xml.EncryptedData/VB/encrypteddata.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/Overview/encrypteddata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CipherReference2/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/CipherReference/GetXml/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CipherReference2/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/CipherReference/GetXml/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Signing/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Signing/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Verification/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Verification/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.DataReference/vb/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/DataReference/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.DataReference/vb/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/DataReference/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedKey/vb/example.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedKey/vb/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML-EncryptedData - EncryptedType/vb/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML-EncryptedData - EncryptedType/vb/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecrypt/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/AddKeyNameMapping/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecrypt/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/AddKeyNameMapping/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.MainXMLEncDecryptDataOOP/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.MainXMLEncDecryptDataOOP/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKeyX509/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKeyX509/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlLicenseTransform/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/IRelDecryptor/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlLicenseTransform/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/IRelDecryptor/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Security.Cryptography.Xml.SignedXml.CheckSignature/vb/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/CheckSignature/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Security.Cryptography.Xml.SignedXml.CheckSignature/vb/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/CheckSignature/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.SignVerifyEnvelope - Specify Element/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.SignVerifyEnvelope - Specify Element/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NTransform/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NTransformUrl/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NTransform/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NTransformUrl/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NWithCommentsTransform/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NWithCommentsTransformUrl/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NWithCommentsTransform/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NWithCommentsTransformUrl/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXPathTransform/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXPathTransform/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXPathTransform/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXPathTransform/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXsltTransform/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXsltTransform/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXsltTransform/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXsltTransform/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/aessample/vb/program.vb b/snippets/visualbasic/System.Security.Cryptography/Aes/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/aessample/vb/program.vb
rename to snippets/visualbasic/System.Security.Cryptography/Aes/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/aescryptoservprovider/vb/program.vb b/snippets/visualbasic/System.Security.Cryptography/AesCryptoServiceProvider/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/aescryptoservprovider/vb/program.vb
rename to snippets/visualbasic/System.Security.Cryptography/AesCryptoServiceProvider/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/aesmanaged/vb/program.vb b/snippets/visualbasic/System.Security.Cryptography/AesManaged/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/aesmanaged/vb/program.vb
rename to snippets/visualbasic/System.Security.Cryptography/AesManaged/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb b/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb
rename to snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.KeyNumber/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography/CspParameters/KeyNumber/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.KeyNumber/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography/CspParameters/KeyNumber/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/capikey/VB/capikey.vb b/snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/capikey.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/capikey/VB/capikey.vb
rename to snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/capikey.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.SmartCardCSP/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.SmartCardCSP/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DES.Create.File/VB/fileexample.vb b/snippets/visualbasic/System.Security.Cryptography/DES/Create/fileexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.DES.Create.File/VB/fileexample.vb
rename to snippets/visualbasic/System.Security.Cryptography/DES/Create/fileexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DES.Create.Memory/VB/memoryexample.vb b/snippets/visualbasic/System.Security.Cryptography/DES/Create/memoryexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.DES.Create.Memory/VB/memoryexample.vb
rename to snippets/visualbasic/System.Security.Cryptography/DES/Create/memoryexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DES.Create.File/VB/project.csproj b/snippets/visualbasic/System.Security.Cryptography/DES/Create/project.csproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.DES.Create.File/VB/project.csproj
rename to snippets/visualbasic/System.Security.Cryptography/DES/Create/project.csproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DESCSP.CreateEncryptor.File/VB/fileexample.vb b/snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/CreateEncryptor/fileexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.DESCSP.CreateEncryptor.File/VB/fileexample.vb
rename to snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/CreateEncryptor/fileexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DESCSP.CreateEncryptor.Memory/VB/memoryexample.vb b/snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/CreateEncryptor/memoryexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.DESCSP.CreateEncryptor.Memory/VB/memoryexample.vb
rename to snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/CreateEncryptor/memoryexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DataProtectionSample/vb/dataprotectionsample.vb b/snippets/visualbasic/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.DataProtectionSample/vb/dataprotectionsample.vb
rename to snippets/visualbasic/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/cryptography.dataprotector/vb/class1.vb b/snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/cryptography.dataprotector/vb/class1.vb
rename to snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/cryptography.memoryprotector/vb/class1.vb b/snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class11.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/cryptography.memoryprotector/vb/class1.vb
rename to snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class11.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ecdiffiehellmancng/vb/program.vb b/snippets/visualbasic/System.Security.Cryptography/ECDiffieHellmanCng/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ecdiffiehellmancng/vb/program.vb
rename to snippets/visualbasic/System.Security.Cryptography/ECDiffieHellmanCng/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ecdsacng/vb/program.vb b/snippets/visualbasic/System.Security.Cryptography/ECDsaCng/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ecdsacng/vb/program.vb
rename to snippets/visualbasic/System.Security.Cryptography/ECDsaCng/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HMACRIPEMD160/vb/hmacripemd160.vb b/snippets/visualbasic/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/HMACRIPEMD160/vb/hmacripemd160.vb
rename to snippets/visualbasic/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA256/vb/hmacsha256.vb b/snippets/visualbasic/System.Security.Cryptography/HMACSHA256/Overview/hmacsha256.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/HMACSHA256/vb/hmacsha256.vb
rename to snippets/visualbasic/System.Security.Cryptography/HMACSHA256/Overview/hmacsha256.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA384/vb/hmacsha384.vb b/snippets/visualbasic/System.Security.Cryptography/HMACSHA384/Overview/hmacsha384.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/HMACSHA384/vb/hmacsha384.vb
rename to snippets/visualbasic/System.Security.Cryptography/HMACSHA384/Overview/hmacsha384.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HMACSHA512/vb/hmacsha512.vb b/snippets/visualbasic/System.Security.Cryptography/HMACSHA512/Overview/hmacsha512.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/HMACSHA512/vb/hmacsha512.vb
rename to snippets/visualbasic/System.Security.Cryptography/HMACSHA512/Overview/hmacsha512.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.HashAlgorithm.TransformFinalBlock/vb/sample.vb b/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/TransformBlock/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.HashAlgorithm.TransformFinalBlock/vb/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/TransformBlock/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/keyedhashalgorithm/vb/program.vb b/snippets/visualbasic/System.Security.Cryptography/KeyedHashAlgorithm/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/keyedhashalgorithm/vb/program.vb
rename to snippets/visualbasic/System.Security.Cryptography/KeyedHashAlgorithm/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MAC3DES/VB/program.vb b/snippets/visualbasic/System.Security.Cryptography/MACTripleDES/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MAC3DES/VB/program.vb
rename to snippets/visualbasic/System.Security.Cryptography/MACTripleDES/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/vb/memoryprotectionsample.vb b/snippets/visualbasic/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/vb/memoryprotectionsample.vb
rename to snippets/visualbasic/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb b/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb
rename to snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb b/snippets/visualbasic/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb
rename to snippets/visualbasic/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2.Create.File/VB/fileexample.vb b/snippets/visualbasic/System.Security.Cryptography/RC2/Create/fileexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2.Create.File/VB/fileexample.vb
rename to snippets/visualbasic/System.Security.Cryptography/RC2/Create/fileexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2.Create.Memory/VB/memoryexample.vb b/snippets/visualbasic/System.Security.Cryptography/RC2/Create/memoryexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2.Create.Memory/VB/memoryexample.vb
rename to snippets/visualbasic/System.Security.Cryptography/RC2/Create/memoryexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2.Create.File/VB/project.csproj b/snippets/visualbasic/System.Security.Cryptography/RC2/Create/project.csproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2.Create.File/VB/project.csproj
rename to snippets/visualbasic/System.Security.Cryptography/RC2/Create/project.csproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2CryptoServiceProvider/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RC2CryptoServiceProvider/UseSalt/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2CryptoServiceProvider/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RC2CryptoServiceProvider/UseSalt/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RIPEMD160/vb/ripemd160.vb b/snippets/visualbasic/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RIPEMD160/vb/ripemd160.vb
rename to snippets/visualbasic/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RNGCSP/VB/rngcsp.vb b/snippets/visualbasic/System.Security.Cryptography/RNGCryptoServiceProvider/Overview/rngcsp.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RNGCSP/VB/rngcsp.vb
rename to snippets/visualbasic/System.Security.Cryptography/RNGCryptoServiceProvider/Overview/rngcsp.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-csp/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-csp/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-int32-2/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-int32-2/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-int32-csp/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-int32-csp/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.Decrypt/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/Decrypt/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.Decrypt/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/Decrypt/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.PersistKey/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/PersistKeyInCsp/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.PersistKey/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/PersistKeyInCsp/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData1/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData1/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData2/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData2/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData3/VB/example.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData3/VB/example.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.UseMachineKey/VB/example2.vb b/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/UseMachineKeyStore/example2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.UseMachineKey/VB/example2.vb
rename to snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/UseMachineKeyStore/example2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb b/snippets/visualbasic/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb
rename to snippets/visualbasic/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RijndaelManaged Example/VB/class1.vb b/snippets/visualbasic/System.Security.Cryptography/RijndaelManaged/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RijndaelManaged Example/VB/class1.vb
rename to snippets/visualbasic/System.Security.Cryptography/RijndaelManaged/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.File/VB/fileexample.vb b/snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/fileexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.File/VB/fileexample.vb
rename to snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/fileexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.Memory/VB/memoryexample.vb b/snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/memoryexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.Memory/VB/memoryexample.vb
rename to snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/memoryexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.File/VB/project.vbproj b/snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.File/VB/project.vbproj
rename to snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/WindowsIdentity Impersonation/VB/source.vb b/snippets/visualbasic/System.Security.Principal/WindowsIdentity/Impersonate/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/WindowsIdentity Impersonation/VB/source.vb
rename to snippets/visualbasic/System.Security.Principal/WindowsIdentity/Impersonate/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/windowsidentity impersonation2/vb/source.vb b/snippets/visualbasic/System.Security.Principal/WindowsIdentity/Impersonate/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/windowsidentity impersonation2/vb/source.vb
rename to snippets/visualbasic/System.Security.Principal/WindowsIdentity/Impersonate/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Permission/vb/permission.vb b/snippets/visualbasic/System.Security/ISecurityEncodable/Overview/permission.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Permission/vb/permission.vb
rename to snippets/visualbasic/System.Security/ISecurityEncodable/Overview/permission.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/Project.vbproj b/snippets/visualbasic/System.Security/SecureString/AppendChar/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/Project.vbproj
rename to snippets/visualbasic/System.Security/SecureString/AppendChar/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/xat.vb b/snippets/visualbasic/System.Security/SecureString/AppendChar/xat.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/xat.vb
rename to snippets/visualbasic/System.Security/SecureString/AppendChar/xat.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/SecureString.xChar/VB/xchar.vb b/snippets/visualbasic/System.Security/SecureString/AppendChar/xchar.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/SecureString.xChar/VB/xchar.vb
rename to snippets/visualbasic/System.Security/SecureString/AppendChar/xchar.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb b/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb
rename to snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb b/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb
rename to snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ServiceContoller_ExecuteCommand/VB/module1.vb b/snippets/visualbasic/System.ServiceProcess/ServiceController/ExecuteCommand/module1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ServiceContoller_ExecuteCommand/VB/module1.vb
rename to snippets/visualbasic/System.ServiceProcess/ServiceController/ExecuteCommand/module1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb b/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb
rename to snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ServiceProcess_serviceinstaller/VB/service1.vb b/snippets/visualbasic/System.ServiceProcess/ServiceInstaller/Description/service1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ServiceProcess_serviceinstaller/VB/service1.vb
rename to snippets/visualbasic/System.ServiceProcess/ServiceInstaller/Description/service1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ServiceBase_Commands/VB/simpleservice.vb b/snippets/visualbasic/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ServiceBase_Commands/VB/simpleservice.vb
rename to snippets/visualbasic/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/regex match, nextmatch, groups, captures/vb/snippet8.vb b/snippets/visualbasic/System.Text.RegularExpressions/Match/Groups/snippet8.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/regex match, nextmatch, groups, captures/vb/snippet8.vb
rename to snippets/visualbasic/System.Text.RegularExpressions/Match/Groups/snippet8.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Regex_Words/VB/words.vb b/snippets/visualbasic/System.Text.RegularExpressions/MatchCollection/Overview/words.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Regex_Words/VB/words.vb
rename to snippets/visualbasic/System.Text.RegularExpressions/MatchCollection/Overview/words.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Regex.Replace-Instance/vb/sample.vb b/snippets/visualbasic/System.Text.RegularExpressions/Regex/Replace/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Regex.Replace-Instance/vb/sample.vb
rename to snippets/visualbasic/System.Text.RegularExpressions/Regex/Replace/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.txt.rgxCompInfo/vb/genFishRegex.vb b/snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/genFishRegex.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.txt.rgxCompInfo/vb/genFishRegex.vb
rename to snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/genFishRegex.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.txt.rgxCompInfo/vb/makefile b/snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.txt.rgxCompInfo/vb/makefile
rename to snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.txt.rgxCompInfo/vb/useFishRegex.vb b/snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/useFishRegex.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.txt.rgxCompInfo/vb/useFishRegex.vb
rename to snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/useFishRegex.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.txt.EncoderDecoder.convert/vb/edCvt.vb b/snippets/visualbasic/System.Text/Decoder/Convert/edCvt.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.txt.EncoderDecoder.convert/vb/edCvt.vb
rename to snippets/visualbasic/System.Text/Decoder/Convert/edCvt.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackDecExc/vb/fallDecExc.vb b/snippets/visualbasic/System.Text/DecoderExceptionFallback/Overview/fallDecExc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackDecExc/vb/fallDecExc.vb
rename to snippets/visualbasic/System.Text/DecoderExceptionFallback/Overview/fallDecExc.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackDecRpl/vb/fallDecRpl.vb b/snippets/visualbasic/System.Text/DecoderReplacementFallback/Overview/fallDecRpl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackDecRpl/vb/fallDecRpl.vb
rename to snippets/visualbasic/System.Text/DecoderReplacementFallback/Overview/fallDecRpl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncExc/vb/fallEncExc.vb b/snippets/visualbasic/System.Text/EncoderExceptionFallback/Overview/fallEncExc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncExc/vb/fallEncExc.vb
rename to snippets/visualbasic/System.Text/EncoderExceptionFallback/Overview/fallEncExc.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncRpl/vb/fallEncRpl.vb b/snippets/visualbasic/System.Text/EncoderReplacementFallback/Overview/fallEncRpl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncRpl/vb/fallEncRpl.vb
rename to snippets/visualbasic/System.Text/EncoderReplacementFallback/Overview/fallEncRpl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendformat/VB/appfmt.vb b/snippets/visualbasic/System.Text/StringBuilder/AppendFormat/appfmt.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendformat/VB/appfmt.vb
rename to snippets/visualbasic/System.Text/StringBuilder/AppendFormat/appfmt.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendline/VB/al.vb b/snippets/visualbasic/System.Text/StringBuilder/AppendLine/al.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendline/VB/al.vb
rename to snippets/visualbasic/System.Text/StringBuilder/AppendLine/al.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.ensurecapacity/VB/cap.vb b/snippets/visualbasic/System.Text/StringBuilder/Capacity/cap.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringbuilder.ensurecapacity/VB/cap.vb
rename to snippets/visualbasic/System.Text/StringBuilder/Capacity/cap.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.copyto2/VB/ct2.vb b/snippets/visualbasic/System.Text/StringBuilder/CopyTo/ct2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringbuilder.copyto2/VB/ct2.vb
rename to snippets/visualbasic/System.Text/StringBuilder/CopyTo/ct2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.insert/VB/insert.vb b/snippets/visualbasic/System.Text/StringBuilder/Insert/insert.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringbuilder.insert/VB/insert.vb
rename to snippets/visualbasic/System.Text/StringBuilder/Insert/insert.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StringBuilder/VB/StringBuilder.vb b/snippets/visualbasic/System.Text/StringBuilder/Overview/StringBuilder.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StringBuilder/VB/StringBuilder.vb
rename to snippets/visualbasic/System.Text/StringBuilder/Overview/StringBuilder.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.remove/VB/remove.vb b/snippets/visualbasic/System.Text/StringBuilder/Remove/remove.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringbuilder.remove/VB/remove.vb
rename to snippets/visualbasic/System.Text/StringBuilder/Remove/remove.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.replace/VB/replace.vb b/snippets/visualbasic/System.Text/StringBuilder/Replace/replace.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringbuilder.replace/VB/replace.vb
rename to snippets/visualbasic/System.Text/StringBuilder/Replace/replace.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MonitorExmpl2/VB/monitor2.vb b/snippets/visualbasic/System.Threading/Monitor/Enter/monitor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MonitorExmpl2/VB/monitor2.vb
rename to snippets/visualbasic/System.Threading/Monitor/Enter/monitor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Thread.GetSetTrySetApartmentState/vb/source.vb b/snippets/visualbasic/System.Threading/Thread/GetApartmentState/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Thread.GetSetTrySetApartmentState/vb/source.vb
rename to snippets/visualbasic/System.Threading/Thread/GetApartmentState/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/thread.sleep/vb/example.vb b/snippets/visualbasic/System.Threading/Thread/Sleep/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/thread.sleep/vb/example.vb
rename to snippets/visualbasic/System.Threading/Thread/Sleep/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/thread.sleep_timespan/vb/example.vb b/snippets/visualbasic/System.Threading/Thread/Sleep/example1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/thread.sleep_timespan/vb/example.vb
rename to snippets/visualbasic/System.Threading/Thread/Sleep/example1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ThreadStart/VB/threadstart.vb b/snippets/visualbasic/System.Threading/Thread/Start/threadstart.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ThreadStart/VB/threadstart.vb
rename to snippets/visualbasic/System.Threading/Thread/Start/threadstart.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ThreadAbEx/VB/threadabex.vb b/snippets/visualbasic/System.Threading/ThreadAbortException/Overview/threadabex.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ThreadAbEx/VB/threadabex.vb
rename to snippets/visualbasic/System.Threading/ThreadAbortException/Overview/threadabex.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ThreadStEx/VB/threadstex.vb b/snippets/visualbasic/System.Threading/ThreadStateException/Overview/threadstex.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ThreadStEx/VB/threadstex.vb
rename to snippets/visualbasic/System.Threading/ThreadStateException/Overview/threadstex.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/WaitHandle/VB/WaitHandle.vb b/snippets/visualbasic/System.Threading/WaitHandle/Overview/WaitHandle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/WaitHandle/VB/WaitHandle.vb
rename to snippets/visualbasic/System.Threading/WaitHandle/Overview/WaitHandle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Timer.Stop/VB/source.vb b/snippets/visualbasic/System.Timers/Timer/Stop/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Timer.Stop/VB/source.vb
rename to snippets/visualbasic/System.Timers/Timer/Stop/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DataBinding/VB/webcustomcontrol1.vb b/snippets/visualbasic/System.Web.UI/DataBindingCollection/Remove/webcustomcontrol1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DataBinding/VB/webcustomcontrol1.vb
rename to snippets/visualbasic/System.Web.UI/DataBindingCollection/Remove/webcustomcontrol1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/makefile b/snippets/visualbasic/System.Web/HttpParseException/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/makefile
rename to snippets/visualbasic/System.Web/HttpParseException/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/source.aspx b/snippets/visualbasic/System.Web/HttpParseException/Overview/source.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/source.aspx
rename to snippets/visualbasic/System.Web/HttpParseException/Overview/source.aspx
diff --git a/snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/source.vb b/snippets/visualbasic/System.Web/HttpParseException/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/source.vb
rename to snippets/visualbasic/System.Web/HttpParseException/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ActivatorX/VB/ActivatorX.vb b/snippets/visualbasic/System/Activator/Overview/ActivatorX.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ActivatorX/VB/ActivatorX.vb
rename to snippets/visualbasic/System/Activator/Overview/ActivatorX.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ActivatorX/VB/source2.vb b/snippets/visualbasic/System/Activator/Overview/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ActivatorX/VB/source2.vb
rename to snippets/visualbasic/System/Activator/Overview/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_AssemblyLoad/VB/assemblyload.vb b/snippets/visualbasic/System/AppDomain/AssemblyLoad/assemblyload.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_AssemblyLoad/VB/assemblyload.vb
rename to snippets/visualbasic/System/AppDomain/AssemblyLoad/assemblyload.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AssemblyResolve/VB/assemblyresolve.vb b/snippets/visualbasic/System/AppDomain/AssemblyResolve/assemblyresolve.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AssemblyResolve/VB/assemblyresolve.vb
rename to snippets/visualbasic/System/AppDomain/AssemblyResolve/assemblyresolve.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADSetup/VB/adsetup.vb b/snippets/visualbasic/System/AppDomain/BaseDirectory/adsetup.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADSetup/VB/adsetup.vb
rename to snippets/visualbasic/System/AppDomain/BaseDirectory/adsetup.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADClearPrivatePath/VB/adclearprivatepath.vb b/snippets/visualbasic/System/AppDomain/ClearPrivatePath/adclearprivatepath.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADClearPrivatePath/VB/adclearprivatepath.vb
rename to snippets/visualbasic/System/AppDomain/ClearPrivatePath/adclearprivatepath.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_CreateComInstanceFrom/VB/createcominstancefrom.vb b/snippets/visualbasic/System/AppDomain/CreateComInstanceFrom/createcominstancefrom.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_CreateComInstanceFrom/VB/createcominstancefrom.vb
rename to snippets/visualbasic/System/AppDomain/CreateComInstanceFrom/createcominstancefrom.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_Setup/VB/setup.vb b/snippets/visualbasic/System/AppDomain/CreateDomain/setup.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_Setup/VB/setup.vb
rename to snippets/visualbasic/System/AppDomain/CreateDomain/setup.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADDyno/VB/addyno.vb b/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/addyno.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADDyno/VB/addyno.vb
rename to snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/addyno.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_CreateInstance_IgnoreCase/VB/ignorecase.vb b/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/ignorecase.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_CreateInstance_IgnoreCase/VB/ignorecase.vb
rename to snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/ignorecase.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/CreateInstanceAndUnwrap2/VB/source.vb b/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/CreateInstanceAndUnwrap2/VB/source.vb
rename to snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADApplicationBase/VB/adapplicationbase.vb b/snippets/visualbasic/System/AppDomain/CurrentDomain/adapplicationbase.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADApplicationBase/VB/adapplicationbase.vb
rename to snippets/visualbasic/System/AppDomain/CurrentDomain/adapplicationbase.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb b/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb
rename to snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DefineDynamicAssemblyWithAttributes/vb/source.vb b/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DefineDynamicAssemblyWithAttributes/vb/source.vb
rename to snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_byref.vb b/snippets/visualbasic/System/AppDomain/DoCallBack/docallback_byref.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_byref.vb
rename to snippets/visualbasic/System/AppDomain/DoCallBack/docallback_byref.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_byval.vb b/snippets/visualbasic/System/AppDomain/DoCallBack/docallback_byval.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_byval.vb
rename to snippets/visualbasic/System/AppDomain/DoCallBack/docallback_byval.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_static.vb b/snippets/visualbasic/System/AppDomain/DoCallBack/docallback_static.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_static.vb
rename to snippets/visualbasic/System/AppDomain/DoCallBack/docallback_static.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADDynamicBase/VB/addynamicbase.vb b/snippets/visualbasic/System/AppDomain/DynamicDirectory/addynamicbase.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADDynamicBase/VB/addynamicbase.vb
rename to snippets/visualbasic/System/AppDomain/DynamicDirectory/addynamicbase.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_ExecuteAssembly/VB/executeassembly.vb b/snippets/visualbasic/System/AppDomain/ExecuteAssembly/executeassembly.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_ExecuteAssembly/VB/executeassembly.vb
rename to snippets/visualbasic/System/AppDomain/ExecuteAssembly/executeassembly.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADGetAssemblies/VB/adgetassemblies.vb b/snippets/visualbasic/System/AppDomain/GetAssemblies/adgetassemblies.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADGetAssemblies/VB/adgetassemblies.vb
rename to snippets/visualbasic/System/AppDomain/GetAssemblies/adgetassemblies.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADGetData/VB/adgetdata.vb b/snippets/visualbasic/System/AppDomain/GetData/adgetdata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADGetData/VB/adgetdata.vb
rename to snippets/visualbasic/System/AppDomain/GetData/adgetdata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_LoadRaw/VB/loadraw.vb b/snippets/visualbasic/System/AppDomain/Load/loadraw.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_LoadRaw/VB/loadraw.vb
rename to snippets/visualbasic/System/AppDomain/Load/loadraw.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomainX/VB/AppDomainX.vb b/snippets/visualbasic/System/AppDomain/Overview/AppDomainX.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomainX/VB/AppDomainX.vb
rename to snippets/visualbasic/System/AppDomain/Overview/AppDomainX.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain.ReflectionOnlyGetAssemblies/VB/reflectiononly.vb b/snippets/visualbasic/System/AppDomain/ReflectionOnlyGetAssemblies/reflectiononly.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain.ReflectionOnlyGetAssemblies/VB/reflectiononly.vb
rename to snippets/visualbasic/System/AppDomain/ReflectionOnlyGetAssemblies/reflectiononly.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADSetAppDomainPolicy/VB/adsetappdomainpolicy.vb b/snippets/visualbasic/System/AppDomain/SetAppDomainPolicy/adsetappdomainpolicy.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADSetAppDomainPolicy/VB/adsetappdomainpolicy.vb
rename to snippets/visualbasic/System/AppDomain/SetAppDomainPolicy/adsetappdomainpolicy.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADPrincipal/VB/adprincipal.vb b/snippets/visualbasic/System/AppDomain/SetPrincipalPolicy/adprincipal.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADPrincipal/VB/adprincipal.vb
rename to snippets/visualbasic/System/AppDomain/SetPrincipalPolicy/adprincipal.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/adproperties/VB/adproperties.vb b/snippets/visualbasic/System/AppDomain/SetShadowCopyFiles/adproperties.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/adproperties/VB/adproperties.vb
rename to snippets/visualbasic/System/AppDomain/SetShadowCopyFiles/adproperties.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADShadowCopy/VB/adshadowcopy.vb b/snippets/visualbasic/System/AppDomain/SetShadowCopyPath/adshadowcopy.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADShadowCopy/VB/adshadowcopy.vb
rename to snippets/visualbasic/System/AppDomain/SetShadowCopyPath/adshadowcopy.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADToString/VB/adtostring.vb b/snippets/visualbasic/System/AppDomain/ToString/adtostring.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADToString/VB/adtostring.vb
rename to snippets/visualbasic/System/AppDomain/ToString/adtostring.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_TypeResolve/VB/typeresolve.vb b/snippets/visualbasic/System/AppDomain/TypeResolve/typeresolve.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_TypeResolve/VB/typeresolve.vb
rename to snippets/visualbasic/System/AppDomain/TypeResolve/typeresolve.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADUnload/VB/adunload.vb b/snippets/visualbasic/System/AppDomain/Unload/adunload.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADUnload/VB/adunload.vb
rename to snippets/visualbasic/System/AppDomain/Unload/adunload.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomainInitializer/VB/source.vb b/snippets/visualbasic/System/AppDomainSetup/AppDomainInitializer/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomainInitializer/VB/source.vb
rename to snippets/visualbasic/System/AppDomainSetup/AppDomainInitializer/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ADMultiDomain/VB/admultidomain.vb b/snippets/visualbasic/System/AppDomainSetup/ApplicationName/admultidomain.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ADMultiDomain/VB/admultidomain.vb
rename to snippets/visualbasic/System/AppDomainSetup/ApplicationName/admultidomain.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomainUnloadedException/vb/Sample.vb b/snippets/visualbasic/System/AppDomainUnloadedException/Overview/Sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomainUnloadedException/vb/Sample.vb
rename to snippets/visualbasic/System/AppDomainUnloadedException/Overview/Sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ArgumentException/vb/program2.vb b/snippets/visualbasic/System/ArgumentException/Overview/program2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ArgumentException/vb/program2.vb
rename to snippets/visualbasic/System/ArgumentException/Overview/program2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ArgumentOutOfRangeException/VB/program.vb b/snippets/visualbasic/System/ArgumentOutOfRangeException/Overview/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ArgumentOutOfRangeException/VB/program.vb
rename to snippets/visualbasic/System/ArgumentOutOfRangeException/Overview/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_SortSearch/vb/source.vb b/snippets/visualbasic/System/Array/BinarySearchT/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_SortSearch/vb/source.vb
rename to snippets/visualbasic/System/Array/BinarySearchT/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_SortSearchComparer/vb/source.vb b/snippets/visualbasic/System/Array/BinarySearchT/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_SortSearchComparer/vb/source.vb
rename to snippets/visualbasic/System/Array/BinarySearchT/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_ConvertAll/vb/source.vb b/snippets/visualbasic/System/Array/ConvertAllTInput,TOutput/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_ConvertAll/vb/source.vb
rename to snippets/visualbasic/System/Array/ConvertAllTInput,TOutput/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_FindEtAl/vb/source.vb b/snippets/visualbasic/System/Array/FindAllT/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_FindEtAl/vb/source.vb
rename to snippets/visualbasic/System/Array/FindAllT/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_FindIndex/vb/source.vb b/snippets/visualbasic/System/Array/FindIndexT/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_FindIndex/vb/source.vb
rename to snippets/visualbasic/System/Array/FindIndexT/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_FindLastIndex/vb/source.vb b/snippets/visualbasic/System/Array/FindLastIndexT/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_FindLastIndex/vb/source.vb
rename to snippets/visualbasic/System/Array/FindLastIndexT/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_IndexOf/vb/source.vb b/snippets/visualbasic/System/Array/IndexOfT/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_IndexOf/vb/source.vb
rename to snippets/visualbasic/System/Array/IndexOfT/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_LastIndexOf/vb/source.vb b/snippets/visualbasic/System/Array/LastIndexOfT/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_LastIndexOf/vb/source.vb
rename to snippets/visualbasic/System/Array/LastIndexOfT/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_SortComparison/vb/source.vb b/snippets/visualbasic/System/Array/SortT/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_SortComparison/vb/source.vb
rename to snippets/visualbasic/System/Array/SortT/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_SortIntIntIComparer/vb/source.vb b/snippets/visualbasic/System/Array/SortT/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_SortIntIntIComparer/vb/source.vb
rename to snippets/visualbasic/System/Array/SortT/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Array_Sort2IntIntIComparer/vb/source.vb b/snippets/visualbasic/System/Array/SortTKey,TValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Array_Sort2IntIntIComparer/vb/source.vb
rename to snippets/visualbasic/System/Array/SortTKey,TValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor1/VB/arraytypemismatch_constructor1.vb b/snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor1/VB/arraytypemismatch_constructor1.vb
rename to snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor2/VB/arraytypemismatch_constructor2.vb b/snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor2/VB/arraytypemismatch_constructor2.vb
rename to snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor3/VB/arraytypemismatch_constructor3.vb b/snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor3/VB/arraytypemismatch_constructor3.vb
rename to snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AsyncDesignPattern/VB/AsyncDelegateNoState.vb b/snippets/visualbasic/System/AsyncCallback/Overview/AsyncDelegateNoState.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AsyncDesignPattern/VB/AsyncDelegateNoState.vb
rename to snippets/visualbasic/System/AsyncCallback/Overview/AsyncDelegateNoState.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AsyncDesignPattern/VB/makefile b/snippets/visualbasic/System/AsyncCallback/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AsyncDesignPattern/VB/makefile
rename to snippets/visualbasic/System/AsyncCallback/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id1.vb b/snippets/visualbasic/System/Attribute/GetCustomAttribute/id1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id1.vb
rename to snippets/visualbasic/System/Attribute/GetCustomAttribute/id1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id2.vb b/snippets/visualbasic/System/Attribute/GetCustomAttribute/id2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id2.vb
rename to snippets/visualbasic/System/Attribute/GetCustomAttribute/id2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id4.vb b/snippets/visualbasic/System/Attribute/GetCustomAttribute/id4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id4.vb
rename to snippets/visualbasic/System/Attribute/GetCustomAttribute/id4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id5.vb b/snippets/visualbasic/System/Attribute/GetCustomAttribute/id5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id5.vb
rename to snippets/visualbasic/System/Attribute/GetCustomAttribute/id5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca1.vb b/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca1.vb
rename to snippets/visualbasic/System/Attribute/GetCustomAttributes/ca1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca2.vb b/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca2.vb
rename to snippets/visualbasic/System/Attribute/GetCustomAttributes/ca2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca4.vb b/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca4.vb
rename to snippets/visualbasic/System/Attribute/GetCustomAttributes/ca4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca5.vb b/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca5.vb
rename to snippets/visualbasic/System/Attribute/GetCustomAttributes/ca5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/GetHashCode/VB/hashcode.vb b/snippets/visualbasic/System/Attribute/GetHashCode/hashcode.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/GetHashCode/VB/hashcode.vb
rename to snippets/visualbasic/System/Attribute/GetHashCode/hashcode.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IsDefaultAttribute/VB/defattr.vb b/snippets/visualbasic/System/Attribute/IsDefaultAttribute/defattr.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IsDefaultAttribute/VB/defattr.vb
rename to snippets/visualbasic/System/Attribute/IsDefaultAttribute/defattr.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Match/VB/match.vb b/snippets/visualbasic/System/Attribute/Match/match.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Match/VB/match.vb
rename to snippets/visualbasic/System/Attribute/Match/match.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AnimalAttributes/VB/customattribute.vb b/snippets/visualbasic/System/Attribute/Overview/customattribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AnimalAttributes/VB/customattribute.vb
rename to snippets/visualbasic/System/Attribute/Overview/customattribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AttrTargs/VB/AttrTargs.vb b/snippets/visualbasic/System/AttributeTargets/Overview/AttrTargs.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AttrTargs/VB/AttrTargs.vb
rename to snippets/visualbasic/System/AttributeTargets/Overview/AttrTargs.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb b/snippets/visualbasic/System/Boolean/CompareTo/cat.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb
rename to snippets/visualbasic/System/Boolean/CompareTo/cat.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/char.cvtutf32/VB/utf.vb b/snippets/visualbasic/System/Char/ConvertFromUtf32/utf.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/char.cvtutf32/VB/utf.vb
rename to snippets/visualbasic/System/Char/ConvertFromUtf32/utf.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/char.surrogate/VB/sur.vb b/snippets/visualbasic/System/Char/IsHighSurrogate/sur.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/char.surrogate/VB/sur.vb
rename to snippets/visualbasic/System/Char/IsHighSurrogate/sur.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/T.TryParse/VB/tp.vb b/snippets/visualbasic/System/Char/TryParse/tp.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/T.TryParse/VB/tp.vb
rename to snippets/visualbasic/System/Char/TryParse/tp.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_SortComparison/vb/source.vb b/snippets/visualbasic/System/ComparisonT/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_SortComparison/vb/source.vb
rename to snippets/visualbasic/System/ComparisonT/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.beep2/VB/b2.vb b/snippets/visualbasic/System/Console/Beep/b2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.beep2/VB/b2.vb
rename to snippets/visualbasic/System/Console/Beep/b2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.beep/VB/beep.vb b/snippets/visualbasic/System/Console/Beep/beep.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.beep/VB/beep.vb
rename to snippets/visualbasic/System/Console/Beep/beep.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.bufferHW/VB/hw.vb b/snippets/visualbasic/System/Console/BufferHeight/hw.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.bufferHW/VB/hw.vb
rename to snippets/visualbasic/System/Console/BufferHeight/hw.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.cancelkeypress/vb/ckp.vb b/snippets/visualbasic/System/Console/CancelKeyPress/ckp.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.cancelkeypress/vb/ckp.vb
rename to snippets/visualbasic/System/Console/CancelKeyPress/ckp.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.cursorLTS/VB/lts.vb b/snippets/visualbasic/System/Console/Clear/lts.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.cursorLTS/VB/lts.vb
rename to snippets/visualbasic/System/Console/Clear/lts.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.cursorsize/VB/csize.vb b/snippets/visualbasic/System/Console/CursorSize/csize.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.cursorsize/VB/csize.vb
rename to snippets/visualbasic/System/Console/CursorSize/csize.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.cursorvis/VB/vis.vb b/snippets/visualbasic/System/Console/CursorVisible/vis.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.cursorvis/VB/vis.vb
rename to snippets/visualbasic/System/Console/CursorVisible/vis.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Console-EXPANDTABSEX/VB/expandtabsex.vb b/snippets/visualbasic/System/Console/Error/expandtabsex.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Console-EXPANDTABSEX/VB/expandtabsex.vb
rename to snippets/visualbasic/System/Console/Error/expandtabsex.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/consolein/VB/consolein.vb b/snippets/visualbasic/System/Console/In/consolein.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/consolein/VB/consolein.vb
rename to snippets/visualbasic/System/Console/In/consolein.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.keyavailable/VB/ka.vb b/snippets/visualbasic/System/Console/KeyAvailable/ka.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.keyavailable/VB/ka.vb
rename to snippets/visualbasic/System/Console/KeyAvailable/ka.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.read/VB/read.vb b/snippets/visualbasic/System/Console/Read/read.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.read/VB/read.vb
rename to snippets/visualbasic/System/Console/Read/read.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.readkey1/VB/rk.vb b/snippets/visualbasic/System/Console/ReadKey/rk.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.readkey1/VB/rk.vb
rename to snippets/visualbasic/System/Console/ReadKey/rk.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.readkey2/VB/rkbool.vb b/snippets/visualbasic/System/Console/ReadKey/rkbool.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.readkey2/VB/rkbool.vb
rename to snippets/visualbasic/System/Console/ReadKey/rkbool.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.windowLT/VB/wlt.vb b/snippets/visualbasic/System/Console/SetBufferSize/wlt.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.windowLT/VB/wlt.vb
rename to snippets/visualbasic/System/Console/SetBufferSize/wlt.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.setwindowsize/VB/sws.vb b/snippets/visualbasic/System/Console/SetWindowSize/sws.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.setwindowsize/VB/sws.vb
rename to snippets/visualbasic/System/Console/SetWindowSize/sws.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.title/VB/mytitle.vb b/snippets/visualbasic/System/Console/Title/mytitle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.title/VB/mytitle.vb
rename to snippets/visualbasic/System/Console/Title/mytitle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/console.writelineFmt1/vb/wl.vb b/snippets/visualbasic/System/Console/Write/wl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/console.writelineFmt1/vb/wl.vb
rename to snippets/visualbasic/System/Console/Write/wl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/convertchangetype/VB/convertchangetype.vb b/snippets/visualbasic/System/Convert/ChangeType/convertchangetype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/convertchangetype/VB/convertchangetype.vb
rename to snippets/visualbasic/System/Convert/ChangeType/convertchangetype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/convert.tobase64chararray/VB/tb64ca.vb b/snippets/visualbasic/System/Convert/FromBase64CharArray/tb64ca.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/convert.tobase64chararray/VB/tb64ca.vb
rename to snippets/visualbasic/System/Convert/FromBase64CharArray/tb64ca.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/convert.tobase64string/VB/tb64s.vb b/snippets/visualbasic/System/Convert/ToBase64String/tb64s.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/convert.tobase64string/VB/tb64s.vb
rename to snippets/visualbasic/System/Convert/ToBase64String/tb64s.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/List`1_ConvertAll/vb/source.vb b/snippets/visualbasic/System/ConverterTInput,TOutput/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/List`1_ConvertAll/vb/source.vb
rename to snippets/visualbasic/System/ConverterTInput,TOutput/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/datetime.ctor_Int64/VB/ticks.vb b/snippets/visualbasic/System/DateTime/.ctor/ticks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/datetime.ctor_Int64/VB/ticks.vb
rename to snippets/visualbasic/System/DateTime/.ctor/ticks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.Add/VB/class1.vb b/snippets/visualbasic/System/DateTime/Add/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.Add/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/Add/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.AddDays/VB/class1.vb b/snippets/visualbasic/System/DateTime/AddDays/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.AddDays/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/AddDays/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.CompareTo.2/VB/CompareTo_VB1_24564.vb b/snippets/visualbasic/System/DateTime/CompareTo/CompareTo_VB1_24564.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.CompareTo.2/VB/CompareTo_VB1_24564.vb
rename to snippets/visualbasic/System/DateTime/CompareTo/CompareTo_VB1_24564.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.CompareTo/VB/class1.vb b/snippets/visualbasic/System/DateTime/CompareTo/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.CompareTo/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/CompareTo/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.DayOfWeek/VB/dow.vb b/snippets/visualbasic/System/DateTime/DayOfWeek/dow.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.DayOfWeek/VB/dow.vb
rename to snippets/visualbasic/System/DateTime/DayOfWeek/dow.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.DaysInMonth/VB/class1.vb b/snippets/visualbasic/System/DateTime/DaysInMonth/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.DaysInMonth/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/DaysInMonth/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.Equals/VB/class1.vb b/snippets/visualbasic/System/DateTime/Equals/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.Equals/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/Equals/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.FromFileTime/VB/class1.vb b/snippets/visualbasic/System/DateTime/FromFileTime/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.FromFileTime/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/FromFileTime/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.GetDateTimeFormats/VB/class1.vb b/snippets/visualbasic/System/DateTime/GetDateTimeFormats/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.GetDateTimeFormats/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/GetDateTimeFormats/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.Kind_Suite/vb/ks.vb b/snippets/visualbasic/System/DateTime/Kind/ks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.Kind_Suite/vb/ks.vb
rename to snippets/visualbasic/System/DateTime/Kind/ks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.ToFileTime/VB/class1.vb b/snippets/visualbasic/System/DateTime/ToFileTime/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.ToFileTime/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/ToFileTime/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.ToLocalTime ToUniversalTime/VB/class1.vb b/snippets/visualbasic/System/DateTime/ToLocalTime/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.ToLocalTime ToUniversalTime/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/ToLocalTime/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.ToShortLongString/vb/sls.vb b/snippets/visualbasic/System/DateTime/ToLongDateString/sls.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.ToShortLongString/vb/sls.vb
rename to snippets/visualbasic/System/DateTime/ToLongDateString/sls.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime Operators/VB/class1.vb b/snippets/visualbasic/System/DateTime/op_Addition/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime Operators/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/op_Addition/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/DateTime.Subtraction/VB/class1.vb b/snippets/visualbasic/System/DateTime/op_Subtraction/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/DateTime.Subtraction/VB/class1.vb
rename to snippets/visualbasic/System/DateTime/op_Subtraction/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Decimal Example/VB/source.vb b/snippets/visualbasic/System/Decimal/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Decimal Example/VB/source.vb
rename to snippets/visualbasic/System/Decimal/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb b/snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb
rename to snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/parsemethod.vbproj b/snippets/visualbasic/System/Decimal/Parse/parsemethod.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/parsemethod.vbproj
rename to snippets/visualbasic/System/Decimal/Parse/parsemethod.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Double Example/VB/source.vb b/snippets/visualbasic/System/Double/MaxValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Double Example/VB/source.vb
rename to snippets/visualbasic/System/Double/MaxValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/enumcompareto/VB/EnumCompareTo.vb b/snippets/visualbasic/System/Enum/CompareTo/EnumCompareTo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/enumcompareto/VB/EnumCompareTo.vb
rename to snippets/visualbasic/System/Enum/CompareTo/EnumCompareTo.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/enumequals/VB/EnumEquals.vb b/snippets/visualbasic/System/Enum/Equals/EnumEquals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/enumequals/VB/EnumEquals.vb
rename to snippets/visualbasic/System/Enum/Equals/EnumEquals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/enumformat/VB/EnumFormat.vb b/snippets/visualbasic/System/Enum/Format/EnumFormat.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/enumformat/VB/EnumFormat.vb
rename to snippets/visualbasic/System/Enum/Format/EnumFormat.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/enumgetname/VB/EnumGetName.vb b/snippets/visualbasic/System/Enum/GetName/EnumGetName.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/enumgetname/VB/EnumGetName.vb
rename to snippets/visualbasic/System/Enum/GetName/EnumGetName.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/enumgetnames/VB/EnumGetNames.vb b/snippets/visualbasic/System/Enum/GetNames/EnumGetNames.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/enumgetnames/VB/EnumGetNames.vb
rename to snippets/visualbasic/System/Enum/GetNames/EnumGetNames.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/enumgetvalues/VB/EnumGetValues.vb b/snippets/visualbasic/System/Enum/GetValues/EnumGetValues.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/enumgetvalues/VB/EnumGetValues.vb
rename to snippets/visualbasic/System/Enum/GetValues/EnumGetValues.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/enumparse/VB/EnumParse.vb b/snippets/visualbasic/System/Enum/Parse/EnumParse.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/enumparse/VB/EnumParse.vb
rename to snippets/visualbasic/System/Enum/Parse/EnumParse.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/enum.tostring/VB/tostr.vb b/snippets/visualbasic/System/Enum/ToString/tostr.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/enum.tostring/VB/tostr.vb
rename to snippets/visualbasic/System/Enum/ToString/tostr.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.GetFolderPath/VB/getfolderpath.vb b/snippets/visualbasic/System/Environment+SpecialFolder/Overview/getfolderpath.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.GetFolderPath/VB/getfolderpath.vb
rename to snippets/visualbasic/System/Environment+SpecialFolder/Overview/getfolderpath.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/environment.CommandLine/VB/commandline.vb b/snippets/visualbasic/System/Environment/CommandLine/commandline.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/environment.CommandLine/VB/commandline.vb
rename to snippets/visualbasic/System/Environment/CommandLine/commandline.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/environment.ExpandEnvironmentVariables/VB/expandenvironmentvariables.vb b/snippets/visualbasic/System/Environment/ExpandEnvironmentVariables/expandenvironmentvariables.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/environment.ExpandEnvironmentVariables/VB/expandenvironmentvariables.vb
rename to snippets/visualbasic/System/Environment/ExpandEnvironmentVariables/expandenvironmentvariables.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/environment.FailFast/vb/ff.vb b/snippets/visualbasic/System/Environment/FailFast/ff.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/environment.FailFast/vb/ff.vb
rename to snippets/visualbasic/System/Environment/FailFast/ff.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.GetCommandLineArgs/VB/getcommandlineargs.vb b/snippets/visualbasic/System/Environment/GetCommandLineArgs/getcommandlineargs.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.GetCommandLineArgs/VB/getcommandlineargs.vb
rename to snippets/visualbasic/System/Environment/GetCommandLineArgs/getcommandlineargs.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.GetEnvironmentVariables/VB/getenvironmentvariables.vb b/snippets/visualbasic/System/Environment/GetEnvironmentVariables/getenvironmentvariables.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.GetEnvironmentVariables/VB/getenvironmentvariables.vb
rename to snippets/visualbasic/System/Environment/GetEnvironmentVariables/getenvironmentvariables.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/environment.getsetenvar/VB/gsev.vb b/snippets/visualbasic/System/Environment/GetEnvironmentVariables/gsev.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/environment.getsetenvar/VB/gsev.vb
rename to snippets/visualbasic/System/Environment/GetEnvironmentVariables/gsev.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.GetLogicalDrives/VB/getlogicaldrives.vb b/snippets/visualbasic/System/Environment/GetLogicalDrives/getlogicaldrives.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.GetLogicalDrives/VB/getlogicaldrives.vb
rename to snippets/visualbasic/System/Environment/GetLogicalDrives/getlogicaldrives.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.MachineName/VB/machinename.vb b/snippets/visualbasic/System/Environment/MachineName/machinename.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.MachineName/VB/machinename.vb
rename to snippets/visualbasic/System/Environment/MachineName/machinename.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.NewLine/VB/newline.vb b/snippets/visualbasic/System/Environment/NewLine/newline.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.NewLine/VB/newline.vb
rename to snippets/visualbasic/System/Environment/NewLine/newline.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/environment.class/VB/env0.vb b/snippets/visualbasic/System/Environment/Overview/env0.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/environment.class/VB/env0.vb
rename to snippets/visualbasic/System/Environment/Overview/env0.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/environment.processorcount/VB/pc.vb b/snippets/visualbasic/System/Environment/ProcessorCount/pc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/environment.processorcount/VB/pc.vb
rename to snippets/visualbasic/System/Environment/ProcessorCount/pc.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.StackTrace/VB/stacktrace.vb b/snippets/visualbasic/System/Environment/StackTrace/stacktrace.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.StackTrace/VB/stacktrace.vb
rename to snippets/visualbasic/System/Environment/StackTrace/stacktrace.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.SystemDirectory/VB/systemdirectory.vb b/snippets/visualbasic/System/Environment/SystemDirectory/systemdirectory.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.SystemDirectory/VB/systemdirectory.vb
rename to snippets/visualbasic/System/Environment/SystemDirectory/systemdirectory.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.TickCount/VB/tickcount.vb b/snippets/visualbasic/System/Environment/TickCount/tickcount.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.TickCount/VB/tickcount.vb
rename to snippets/visualbasic/System/Environment/TickCount/tickcount.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.UserInteractive/VB/userinteractive.vb b/snippets/visualbasic/System/Environment/UserInteractive/userinteractive.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.UserInteractive/VB/userinteractive.vb
rename to snippets/visualbasic/System/Environment/UserInteractive/userinteractive.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.UserName/VB/username.vb b/snippets/visualbasic/System/Environment/UserName/username.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.UserName/VB/username.vb
rename to snippets/visualbasic/System/Environment/UserName/username.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.Version/VB/version.vb b/snippets/visualbasic/System/Environment/Version/version.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.Version/VB/version.vb
rename to snippets/visualbasic/System/Environment/Version/version.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Environment.WorkingSet/VB/workingset.vb b/snippets/visualbasic/System/Environment/WorkingSet/workingset.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Environment.WorkingSet/VB/workingset.vb
rename to snippets/visualbasic/System/Environment/WorkingSet/workingset.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/eventsoverview/vb/module1nodata.vb b/snippets/visualbasic/System/EventArgs/Overview/module1nodata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/eventsoverview/vb/module1nodata.vb
rename to snippets/visualbasic/System/EventArgs/Overview/module1nodata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/eventsoverview/vb/module1withdata.vb b/snippets/visualbasic/System/EventArgs/Overview/module1withdata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/eventsoverview/vb/module1withdata.vb
rename to snippets/visualbasic/System/EventArgs/Overview/module1withdata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InnerEx/VB/innerex.vb b/snippets/visualbasic/System/Exception/InnerException/innerex.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InnerEx/VB/innerex.vb
rename to snippets/visualbasic/System/Exception/InnerException/innerex.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Formatting.Composite/vb/Composite1.vb b/snippets/visualbasic/System/FormattableString/Format/Composite1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Formatting.Composite/vb/Composite1.vb
rename to snippets/visualbasic/System/FormattableString/Format/Composite1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/GCNotification/vb/program.vb b/snippets/visualbasic/System/GC/CancelFullGCNotification/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/GCNotification/vb/program.vb
rename to snippets/visualbasic/System/GC/CancelFullGCNotification/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb b/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb
rename to snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/WaitHandle.vb b/snippets/visualbasic/System/IAsyncResult/Overview/WaitHandle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/WaitHandle.vb
rename to snippets/visualbasic/System/IAsyncResult/Overview/WaitHandle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/callback.vb b/snippets/visualbasic/System/IAsyncResult/Overview/callback.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/callback.vb
rename to snippets/visualbasic/System/IAsyncResult/Overview/callback.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/makefile b/snippets/visualbasic/System/IAsyncResult/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/makefile
rename to snippets/visualbasic/System/IAsyncResult/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/polling.vb b/snippets/visualbasic/System/IAsyncResult/Overview/polling.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/polling.vb
rename to snippets/visualbasic/System/IAsyncResult/Overview/polling.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IComparable Example/VB/source.vb b/snippets/visualbasic/System/IComparable/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IComparable Example/VB/source.vb
rename to snippets/visualbasic/System/IComparable/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/IComparable`1 Example/VB/source.vb b/snippets/visualbasic/System/IComparableT/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/IComparable`1 Example/VB/source.vb
rename to snippets/visualbasic/System/IComparableT/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Int16_Equals/VB/int16_equals.vb b/snippets/visualbasic/System/Int16/Equals/int16_equals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Int16_Equals/VB/int16_equals.vb
rename to snippets/visualbasic/System/Int16/Equals/int16_equals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Int32_Equals/VB/int32_equals.vb b/snippets/visualbasic/System/Int32/Equals/int32_equals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Int32_Equals/VB/int32_equals.vb
rename to snippets/visualbasic/System/Int32/Equals/int32_equals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Int64_Equals/VB/int64_equals.vb b/snippets/visualbasic/System/Int64/Equals/int64_equals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Int64_Equals/VB/int64_equals.vb
rename to snippets/visualbasic/System/Int64/Equals/int64_equals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/RemotingServices.SetObjectUriForMarshal/VB/source.vb b/snippets/visualbasic/System/MarshalByRefObject/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/RemotingServices.SetObjectUriForMarshal/VB/source.vb
rename to snippets/visualbasic/System/MarshalByRefObject/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/math.atanx/VB/atan.vb b/snippets/visualbasic/System/Math/Atan/atan.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/math.atanx/VB/atan.vb
rename to snippets/visualbasic/System/Math/Atan/atan.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/math.bigmul/VB/bigmul.vb b/snippets/visualbasic/System/Math/BigMul/bigmul.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/math.bigmul/VB/bigmul.vb
rename to snippets/visualbasic/System/Math/BigMul/bigmul.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/math.max/VB/max.vb b/snippets/visualbasic/System/Math/Max/max.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/math.max/VB/max.vb
rename to snippets/visualbasic/System/Math/Max/max.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/math.min/VB/min.vb b/snippets/visualbasic/System/Math/Min/min.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/math.min/VB/min.vb
rename to snippets/visualbasic/System/Math/Min/min.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/Project.vbproj b/snippets/visualbasic/System/Math/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/Project.vbproj
rename to snippets/visualbasic/System/Math/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb b/snippets/visualbasic/System/Math/Overview/mathsample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb
rename to snippets/visualbasic/System/Math/Overview/mathsample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb b/snippets/visualbasic/System/Math/Sign/sign.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb
rename to snippets/visualbasic/System/Math/Sign/sign.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MissingMethodException/vb/missingmethodexception.vb b/snippets/visualbasic/System/MissingFieldException/Overview/missingmethodexception.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MissingMethodException/vb/missingmethodexception.vb
rename to snippets/visualbasic/System/MissingFieldException/Overview/missingmethodexception.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Multicast Delegate Introduction/VB/delegatestring.vb b/snippets/visualbasic/System/MulticastDelegate/Overview/delegatestring.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Multicast Delegate Introduction/VB/delegatestring.vb
rename to snippets/visualbasic/System/MulticastDelegate/Overview/delegatestring.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ECMA-System.Object.GetType/VB/gettype.vb b/snippets/visualbasic/System/Object/GetType/gettype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ECMA-System.Object.GetType/VB/gettype.vb
rename to snippets/visualbasic/System/Object/GetType/gettype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ObjectX/vb/objectX.vb b/snippets/visualbasic/System/Object/Overview/objectX.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ObjectX/vb/objectX.vb
rename to snippets/visualbasic/System/Object/Overview/objectX.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ECMA-System.Object.ReferenceEquals/vb/referenceequals.vb b/snippets/visualbasic/System/Object/ReferenceEquals/referenceequals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ECMA-System.Object.ReferenceEquals/vb/referenceequals.vb
rename to snippets/visualbasic/System/Object/ReferenceEquals/referenceequals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ObjDispEx/VB/objdispexc.vb b/snippets/visualbasic/System/ObjectDisposedException/Overview/objdispexc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ObjDispEx/VB/objdispexc.vb
rename to snippets/visualbasic/System/ObjectDisposedException/Overview/objdispexc.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ObsoleteAttribute/vb/obsoleteattributeex1.vb b/snippets/visualbasic/System/ObsoleteAttribute/Overview/obsoleteattributeex1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ObsoleteAttribute/vb/obsoleteattributeex1.vb
rename to snippets/visualbasic/System/ObsoleteAttribute/Overview/obsoleteattributeex1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/OperatingSystem.ServicePack/VB/sp.vb b/snippets/visualbasic/System/OperatingSystem/ServicePack/sp.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/OperatingSystem.ServicePack/VB/sp.vb
rename to snippets/visualbasic/System/OperatingSystem/ServicePack/sp.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/OperatingSystem.VersionString/VB/osvs.vb b/snippets/visualbasic/System/OperatingSystem/VersionString/osvs.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/OperatingSystem.VersionString/VB/osvs.vb
rename to snippets/visualbasic/System/OperatingSystem/VersionString/osvs.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/platformID.class/VB/pid.vb b/snippets/visualbasic/System/PlatformID/Overview/pid.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/platformID.class/VB/pid.vb
rename to snippets/visualbasic/System/PlatformID/Overview/pid.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeHandle/VB/type_gettypehandle.vb b/snippets/visualbasic/System/RuntimeTypeHandle/Overview/type_gettypehandle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeHandle/VB/type_gettypehandle.vb
rename to snippets/visualbasic/System/RuntimeTypeHandle/Overview/type_gettypehandle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Uri_IsHexDigit/VB/uri_ishexdigit.vb b/snippets/visualbasic/System/String/Chars/uri_ishexdigit.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Uri_IsHexDigit/VB/uri_ishexdigit.vb
rename to snippets/visualbasic/System/String/Chars/uri_ishexdigit.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ArrayList/VB/ArrayListSample.vb b/snippets/visualbasic/System/String/Compare/ArrayListSample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ArrayList/VB/ArrayListSample.vb
rename to snippets/visualbasic/System/String/Compare/ArrayListSample.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.compare3/VB/comp3.vb b/snippets/visualbasic/System/String/Compare/comp3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.compare3/VB/comp3.vb
rename to snippets/visualbasic/System/String/Compare/comp3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.compare4/VB/comp4.vb b/snippets/visualbasic/System/String/Compare/comp4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.compare4/VB/comp4.vb
rename to snippets/visualbasic/System/String/Compare/comp4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.compare5/VB/comp5.vb b/snippets/visualbasic/System/String/Compare/comp5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.compare5/VB/comp5.vb
rename to snippets/visualbasic/System/String/Compare/comp5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.comp4/VB/string.comp4.vb b/snippets/visualbasic/System/String/Compare/string.comp4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.comp4/VB/string.comp4.vb
rename to snippets/visualbasic/System/String/Compare/string.comp4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.compareordinal/VB/comp0.vb b/snippets/visualbasic/System/String/CompareOrdinal/comp0.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.compareordinal/VB/comp0.vb
rename to snippets/visualbasic/System/String/CompareOrdinal/comp0.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StringCompareOrdinal/VB/stringcompareordinal.vb b/snippets/visualbasic/System/String/CompareOrdinal/stringcompareordinal.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StringCompareOrdinal/VB/stringcompareordinal.vb
rename to snippets/visualbasic/System/String/CompareOrdinal/stringcompareordinal.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/ExToString/VB/extostring.vb b/snippets/visualbasic/System/String/CompareTo/extostring.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/ExToString/VB/extostring.vb
rename to snippets/visualbasic/System/String/CompareTo/extostring.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/StringCompareTo/VB/stringcompareto.vb b/snippets/visualbasic/System/String/CompareTo/stringcompareto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/StringCompareTo/VB/stringcompareto.vb
rename to snippets/visualbasic/System/String/CompareTo/stringcompareto.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.concat5/VB/string.concat5.vb b/snippets/visualbasic/System/String/Concat/string.concat5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.concat5/VB/string.concat5.vb
rename to snippets/visualbasic/System/String/Concat/string.concat5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringconcat1/VB/stringconcat1.vb b/snippets/visualbasic/System/String/Concat/stringconcat1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringconcat1/VB/stringconcat1.vb
rename to snippets/visualbasic/System/String/Concat/stringconcat1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringconcat3/VB/stringconcat3.vb b/snippets/visualbasic/System/String/Concat/stringconcat3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringconcat3/VB/stringconcat3.vb
rename to snippets/visualbasic/System/String/Concat/stringconcat3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringconcat4/VB/stringconcat4.vb b/snippets/visualbasic/System/String/Concat/stringconcat4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringconcat4/VB/stringconcat4.vb
rename to snippets/visualbasic/System/String/Concat/stringconcat4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.contains/VB/cont.vb b/snippets/visualbasic/System/String/Contains/cont.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.contains/VB/cont.vb
rename to snippets/visualbasic/System/String/Contains/cont.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringcopyto/VB/stringcopyto.vb b/snippets/visualbasic/System/String/CopyTo/stringcopyto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringcopyto/VB/stringcopyto.vb
rename to snippets/visualbasic/System/String/CopyTo/stringcopyto.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringendswith/VB/stringendswith.vb b/snippets/visualbasic/System/String/EndsWith/stringendswith.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringendswith/VB/stringendswith.vb
rename to snippets/visualbasic/System/String/EndsWith/stringendswith.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.equals/VB/equals.vb b/snippets/visualbasic/System/String/Equals/equals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.equals/VB/equals.vb
rename to snippets/visualbasic/System/String/Equals/equals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.gettypecode/VB/gtc.vb b/snippets/visualbasic/System/String/GetTypeCode/gtc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.gettypecode/VB/gtc.vb
rename to snippets/visualbasic/System/String/GetTypeCode/gtc.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.indexof1/VB/ixof1.vb b/snippets/visualbasic/System/String/IndexOf/ixof1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.indexof1/VB/ixof1.vb
rename to snippets/visualbasic/System/String/IndexOf/ixof1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.indexof8/VB/ixof8.vb b/snippets/visualbasic/System/String/IndexOf/ixof8.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.indexof8/VB/ixof8.vb
rename to snippets/visualbasic/System/String/IndexOf/ixof8.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringindexof4/VB/stringindexof4.vb b/snippets/visualbasic/System/String/IndexOf/stringindexof4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringindexof4/VB/stringindexof4.vb
rename to snippets/visualbasic/System/String/IndexOf/stringindexof4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringinsert/VB/stringinsert.vb b/snippets/visualbasic/System/String/IndexOf/stringinsert.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringinsert/VB/stringinsert.vb
rename to snippets/visualbasic/System/String/IndexOf/stringinsert.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.indexofany2/VB/ixany2.vb b/snippets/visualbasic/System/String/IndexOfAny/ixany2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.indexofany2/VB/ixany2.vb
rename to snippets/visualbasic/System/String/IndexOfAny/ixany2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.indexofany3/VB/ixany3.vb b/snippets/visualbasic/System/String/IndexOfAny/ixany3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.indexofany3/VB/ixany3.vb
rename to snippets/visualbasic/System/String/IndexOfAny/ixany3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.isinterned/VB/isin.vb b/snippets/visualbasic/System/String/IsInterned/isin.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.isinterned/VB/isin.vb
rename to snippets/visualbasic/System/String/IsInterned/isin.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.normalize/VB/norm.vb b/snippets/visualbasic/System/String/IsNormalized/norm.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.normalize/VB/norm.vb
rename to snippets/visualbasic/System/String/IsNormalized/norm.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.join2/VB/join2.vb b/snippets/visualbasic/System/String/Join/join2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.join2/VB/join2.vb
rename to snippets/visualbasic/System/String/Join/join2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringjoin/VB/stringjoin.vb b/snippets/visualbasic/System/String/Join/stringjoin.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringjoin/VB/stringjoin.vb
rename to snippets/visualbasic/System/String/Join/stringjoin.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.lastindexof1/VB/lastixof1.vb b/snippets/visualbasic/System/String/LastIndexOf/lastixof1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.lastindexof1/VB/lastixof1.vb
rename to snippets/visualbasic/System/String/LastIndexOf/lastixof1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.lastindexof2/VB/lastixof2.vb b/snippets/visualbasic/System/String/LastIndexOf/lastixof2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.lastindexof2/VB/lastixof2.vb
rename to snippets/visualbasic/System/String/LastIndexOf/lastixof2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOf7/VB/lastixof7.vb b/snippets/visualbasic/System/String/LastIndexOf/lastixof7.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOf7/VB/lastixof7.vb
rename to snippets/visualbasic/System/String/LastIndexOf/lastixof7.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOf8/VB/lastixof8.vb b/snippets/visualbasic/System/String/LastIndexOf/lastixof8.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOf8/VB/lastixof8.vb
rename to snippets/visualbasic/System/String/LastIndexOf/lastixof8.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny1/VB/lastixany1.vb b/snippets/visualbasic/System/String/LastIndexOfAny/lastixany1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny1/VB/lastixany1.vb
rename to snippets/visualbasic/System/String/LastIndexOfAny/lastixany1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny2/VB/lastixany2.vb b/snippets/visualbasic/System/String/LastIndexOfAny/lastixany2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny2/VB/lastixany2.vb
rename to snippets/visualbasic/System/String/LastIndexOfAny/lastixany2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny3/VB/lastixany3.vb b/snippets/visualbasic/System/String/LastIndexOfAny/lastixany3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny3/VB/lastixany3.vb
rename to snippets/visualbasic/System/String/LastIndexOfAny/lastixany3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.length/VB/length.vb b/snippets/visualbasic/System/String/Length/length.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.length/VB/length.vb
rename to snippets/visualbasic/System/String/Length/length.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.remove/VB/r.vb b/snippets/visualbasic/System/String/Remove/r.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.remove/VB/r.vb
rename to snippets/visualbasic/System/String/Remove/r.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringremove/VB/stringremove.vb b/snippets/visualbasic/System/String/Remove/stringremove.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringremove/VB/stringremove.vb
rename to snippets/visualbasic/System/String/Remove/stringremove.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.replace1/VB/string.replace1.vb b/snippets/visualbasic/System/String/Replace/string.replace1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.replace1/VB/string.replace1.vb
rename to snippets/visualbasic/System/String/Replace/string.replace1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringreplace/VB/stringreplace.vb b/snippets/visualbasic/System/String/Replace/stringreplace.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringreplace/VB/stringreplace.vb
rename to snippets/visualbasic/System/String/Replace/stringreplace.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/stringstartswith/VB/stringstartswith.vb b/snippets/visualbasic/System/String/StartsWith/stringstartswith.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/stringstartswith/VB/stringstartswith.vb
rename to snippets/visualbasic/System/String/StartsWith/stringstartswith.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.ToCharArray1/VB/tocharry1.vb b/snippets/visualbasic/System/String/ToCharArray/tocharry1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.ToCharArray1/VB/tocharry1.vb
rename to snippets/visualbasic/System/String/ToCharArray/tocharry1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/string.tostring/VB/string.tostring.vb b/snippets/visualbasic/System/String/ToString/string.tostring.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/string.tostring/VB/string.tostring.vb
rename to snippets/visualbasic/System/String/ToString/string.tostring.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TimeoutException.class/VB/to.vb b/snippets/visualbasic/System/TimeoutException/Overview/to.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TimeoutException.class/VB/to.vb
rename to snippets/visualbasic/System/TimeoutException/Overview/to.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_Assembly/VB/type_assembly.vb b/snippets/visualbasic/System/Type/Assembly/type_assembly.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_Assembly/VB/type_assembly.vb
rename to snippets/visualbasic/System/Type/Assembly/type_assembly.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TestBaseType/VB/testbasetype.vb b/snippets/visualbasic/System/Type/BaseType/testbasetype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TestBaseType/VB/testbasetype.vb
rename to snippets/visualbasic/System/Type/BaseType/testbasetype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/MethodInfo.Generics/VB/source.vb b/snippets/visualbasic/System/Type/DeclaringMethod/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/MethodInfo.Generics/VB/source.vb
rename to snippets/visualbasic/System/Type/DeclaringMethod/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_DefaultBinder/VB/type_defaultbinder.vb b/snippets/visualbasic/System/Type/DefaultBinder/type_defaultbinder.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_DefaultBinder/VB/type_defaultbinder.vb
rename to snippets/visualbasic/System/Type/DefaultBinder/type_defaultbinder.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_FilterAttribute/VB/type_filterattribute.vb b/snippets/visualbasic/System/Type/FilterAttribute/type_filterattribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_FilterAttribute/VB/type_filterattribute.vb
rename to snippets/visualbasic/System/Type/FilterAttribute/type_filterattribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_FilterNameIgnoreCase/VB/type_filternameignorecase.vb b/snippets/visualbasic/System/Type/FilterNameIgnoreCase/type_filternameignorecase.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_FilterNameIgnoreCase/VB/type_filternameignorecase.vb
rename to snippets/visualbasic/System/Type/FilterNameIgnoreCase/type_filternameignorecase.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_FindInterfaces/VB/type_findinterfaces.vb b/snippets/visualbasic/System/Type/FindInterfaces/type_findinterfaces.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_FindInterfaces/VB/type_findinterfaces.vb
rename to snippets/visualbasic/System/Type/FindInterfaces/type_findinterfaces.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_FindMembers/VB/type_findmembers.vb b/snippets/visualbasic/System/Type/FindMembers/type_findmembers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_FindMembers/VB/type_findmembers.vb
rename to snippets/visualbasic/System/Type/FindMembers/type_findmembers.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TestFullName/VB/testfullname.vb b/snippets/visualbasic/System/Type/FullName/testfullname.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TestFullName/VB/testfullname.vb
rename to snippets/visualbasic/System/Type/FullName/testfullname.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_Guid/VB/type_guid.vb b/snippets/visualbasic/System/Type/GUID/type_guid.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_Guid/VB/type_guid.vb
rename to snippets/visualbasic/System/Type/GUID/type_guid.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetArrayRank/VB/type_getarrayrank.vb b/snippets/visualbasic/System/Type/GetArrayRank/type_getarrayrank.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetArrayRank/VB/type_getarrayrank.vb
rename to snippets/visualbasic/System/Type/GetArrayRank/type_getarrayrank.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor/VB/type_getconstructor.vb b/snippets/visualbasic/System/Type/GetConstructor/type_getconstructor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor/VB/type_getconstructor.vb
rename to snippets/visualbasic/System/Type/GetConstructor/type_getconstructor.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor2/VB/type_getconstructor2.vb b/snippets/visualbasic/System/Type/GetConstructor/type_getconstructor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor2/VB/type_getconstructor2.vb
rename to snippets/visualbasic/System/Type/GetConstructor/type_getconstructor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor3/VB/type_getconstructor3.vb b/snippets/visualbasic/System/Type/GetConstructor/type_getconstructor3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor3/VB/type_getconstructor3.vb
rename to snippets/visualbasic/System/Type/GetConstructor/type_getconstructor3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetDefaultMembers/VB/type_getdefaultmembers.vb b/snippets/visualbasic/System/Type/GetDefaultMembers/type_getdefaultmembers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetDefaultMembers/VB/type_getdefaultmembers.vb
rename to snippets/visualbasic/System/Type/GetDefaultMembers/type_getdefaultmembers.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TestGetElementType/VB/testgetelementtype.vb b/snippets/visualbasic/System/Type/GetElementType/testgetelementtype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TestGetElementType/VB/testgetelementtype.vb
rename to snippets/visualbasic/System/Type/GetElementType/testgetelementtype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetEvent/VB/type_getevent.vb b/snippets/visualbasic/System/Type/GetEvent/type_getevent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetEvent/VB/type_getevent.vb
rename to snippets/visualbasic/System/Type/GetEvent/type_getevent.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/type_getevent1/VB/type_getevent1.vb b/snippets/visualbasic/System/Type/GetEvent/type_getevent1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/type_getevent1/VB/type_getevent1.vb
rename to snippets/visualbasic/System/Type/GetEvent/type_getevent1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/type_getevents1/VB/type_getevents1.vb b/snippets/visualbasic/System/Type/GetEvents/type_getevents1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/type_getevents1/VB/type_getevents1.vb
rename to snippets/visualbasic/System/Type/GetEvents/type_getevents1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/type_getevents2/VB/type_getevents2.vb b/snippets/visualbasic/System/Type/GetEvents/type_getevents2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/type_getevents2/VB/type_getevents2.vb
rename to snippets/visualbasic/System/Type/GetEvents/type_getevents2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetField/VB/type_getfield.vb b/snippets/visualbasic/System/Type/GetField/type_getfield.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetField/VB/type_getfield.vb
rename to snippets/visualbasic/System/Type/GetField/type_getfield.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsSpecialName/VB/fieldinfo_isspecialname.vb b/snippets/visualbasic/System/Type/GetFields/fieldinfo_isspecialname.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsSpecialName/VB/fieldinfo_isspecialname.vb
rename to snippets/visualbasic/System/Type/GetFields/fieldinfo_isspecialname.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetHashCode_GetFields/VB/type_gethashcode_getfields.vb b/snippets/visualbasic/System/Type/GetHashCode/type_gethashcode_getfields.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetHashCode_GetFields/VB/type_gethashcode_getfields.vb
rename to snippets/visualbasic/System/Type/GetHashCode/type_gethashcode_getfields.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetInterface/VB/type_getinterface.vb b/snippets/visualbasic/System/Type/GetInterface/type_getinterface.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetInterface/VB/type_getinterface.vb
rename to snippets/visualbasic/System/Type/GetInterface/type_getinterface.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetInterfaces1/VB/type_getinterfaces1.vb b/snippets/visualbasic/System/Type/GetInterfaces/type_getinterfaces1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetInterfaces1/VB/type_getinterfaces1.vb
rename to snippets/visualbasic/System/Type/GetInterfaces/type_getinterfaces1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMember/VB/type_getmember.vb b/snippets/visualbasic/System/Type/GetMember/type_getmember.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMember/VB/type_getmember.vb
rename to snippets/visualbasic/System/Type/GetMember/type_getmember.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMembers1/VB/type_getmembers1.vb b/snippets/visualbasic/System/Type/GetMembers/type_getmembers1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMembers1/VB/type_getmembers1.vb
rename to snippets/visualbasic/System/Type/GetMembers/type_getmembers1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMembers2/VB/type_getmembers2.vb b/snippets/visualbasic/System/Type/GetMembers/type_getmembers2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMembers2/VB/type_getmembers2.vb
rename to snippets/visualbasic/System/Type/GetMembers/type_getmembers2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod1/VB/type_getmethod1.vb b/snippets/visualbasic/System/Type/GetMethod/type_getmethod1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod1/VB/type_getmethod1.vb
rename to snippets/visualbasic/System/Type/GetMethod/type_getmethod1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod2/VB/type_getmethod2.vb b/snippets/visualbasic/System/Type/GetMethod/type_getmethod2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod2/VB/type_getmethod2.vb
rename to snippets/visualbasic/System/Type/GetMethod/type_getmethod2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod3/VB/type_getmethod3.vb b/snippets/visualbasic/System/Type/GetMethod/type_getmethod3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod3/VB/type_getmethod3.vb
rename to snippets/visualbasic/System/Type/GetMethod/type_getmethod3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod4/VB/type_getmethod4.vb b/snippets/visualbasic/System/Type/GetMethod/type_getmethod4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod4/VB/type_getmethod4.vb
rename to snippets/visualbasic/System/Type/GetMethod/type_getmethod4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod5/VB/type_getmethod5.vb b/snippets/visualbasic/System/Type/GetMethod/type_getmethod5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod5/VB/type_getmethod5.vb
rename to snippets/visualbasic/System/Type/GetMethod/type_getmethod5.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethods2/VB/type_getmethods2.vb b/snippets/visualbasic/System/Type/GetMethods/type_getmethods2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetMethods2/VB/type_getmethods2.vb
rename to snippets/visualbasic/System/Type/GetMethods/type_getmethods2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetNestedClassesAbs/VB/type_getnestedclassesabs.vb b/snippets/visualbasic/System/Type/GetNestedTypes/type_getnestedclassesabs.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetNestedClassesAbs/VB/type_getnestedclassesabs.vb
rename to snippets/visualbasic/System/Type/GetNestedTypes/type_getnestedclassesabs.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetNestedTypes/VB/type_getnestedtypes.vb b/snippets/visualbasic/System/Type/GetNestedTypes/type_getnestedtypes.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetNestedTypes/VB/type_getnestedtypes.vb
rename to snippets/visualbasic/System/Type/GetNestedTypes/type_getnestedtypes.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperties2/VB/type_getproperties2.vb b/snippets/visualbasic/System/Type/GetProperties/type_getproperties2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetProperties2/VB/type_getproperties2.vb
rename to snippets/visualbasic/System/Type/GetProperties/type_getproperties2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeCode/VB/type_gettypecode.vb b/snippets/visualbasic/System/Type/GetProperties/type_gettypecode.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeCode/VB/type_gettypecode.vb
rename to snippets/visualbasic/System/Type/GetProperties/type_gettypecode.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty2/VB/type_getproperty2.vb b/snippets/visualbasic/System/Type/GetProperty/type_getproperty2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty2/VB/type_getproperty2.vb
rename to snippets/visualbasic/System/Type/GetProperty/type_getproperty2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty5/VB/type_getproperty2.vb b/snippets/visualbasic/System/Type/GetProperty/type_getproperty21.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty5/VB/type_getproperty2.vb
rename to snippets/visualbasic/System/Type/GetProperty/type_getproperty21.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty3/VB/type_getproperty3.vb b/snippets/visualbasic/System/Type/GetProperty/type_getproperty3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty3/VB/type_getproperty3.vb
rename to snippets/visualbasic/System/Type/GetProperty/type_getproperty3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty_Types/VB/type_getproperty_types.vb b/snippets/visualbasic/System/Type/GetProperty/type_getproperty_types.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty_Types/VB/type_getproperty_types.vb
rename to snippets/visualbasic/System/Type/GetProperty/type_getproperty_types.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetType/VB/type_gettype.vb b/snippets/visualbasic/System/Type/GetType/type_gettype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetType/VB/type_gettype.vb
rename to snippets/visualbasic/System/Type/GetType/type_gettype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromHandle/VB/type_gettypefromhandle.vb b/snippets/visualbasic/System/Type/GetTypeFromHandle/type_gettypefromhandle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromHandle/VB/type_gettypefromhandle.vb
rename to snippets/visualbasic/System/Type/GetTypeFromHandle/type_gettypefromhandle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID2/VB/type_gettypefromprogid2.vb b/snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID2/VB/type_gettypefromprogid2.vb
rename to snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID3/VB/type_gettypefromprogid3.vb b/snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID3/VB/type_gettypefromprogid3.vb
rename to snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID4/VB/type_gettypefromprogid4.vb b/snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID4/VB/type_gettypefromprogid4.vb
rename to snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid4.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_HasElementType/VB/type_haselementtype.vb b/snippets/visualbasic/System/Type/HasElementType/type_haselementtype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_HasElementType/VB/type_haselementtype.vb
rename to snippets/visualbasic/System/Type/HasElementType/type_haselementtype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_HasElementTypeImpl/VB/type_haselementtypeimpl.vb b/snippets/visualbasic/System/Type/HasElementTypeImpl/type_haselementtypeimpl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_HasElementTypeImpl/VB/type_haselementtypeimpl.vb
rename to snippets/visualbasic/System/Type/HasElementTypeImpl/type_haselementtypeimpl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/InvokeMem/VB/invokemem.vb b/snippets/visualbasic/System/Type/InvokeMember/invokemem.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/InvokeMem/VB/invokemem.vb
rename to snippets/visualbasic/System/Type/InvokeMember/invokemem.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsAnsiClass/VB/type_isansiclass.vb b/snippets/visualbasic/System/Type/IsAnsiClass/type_isansiclass.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsAnsiClass/VB/type_isansiclass.vb
rename to snippets/visualbasic/System/Type/IsAnsiClass/type_isansiclass.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsArrayImpl/VB/type_isarrayimpl.vb b/snippets/visualbasic/System/Type/IsArrayImpl/type_isarrayimpl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsArrayImpl/VB/type_isarrayimpl.vb
rename to snippets/visualbasic/System/Type/IsArrayImpl/type_isarrayimpl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TestIsAssignableFrom/VB/testisassignablefrom.vb b/snippets/visualbasic/System/Type/IsAssignableFrom/testisassignablefrom.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TestIsAssignableFrom/VB/testisassignablefrom.vb
rename to snippets/visualbasic/System/Type/IsAssignableFrom/testisassignablefrom.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsAutoLayout/VB/type_isautolayout.vb b/snippets/visualbasic/System/Type/IsAutoLayout/type_isautolayout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsAutoLayout/VB/type_isautolayout.vb
rename to snippets/visualbasic/System/Type/IsAutoLayout/type_isautolayout.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsClass/VB/type_isclass.vb b/snippets/visualbasic/System/Type/IsClass/type_isclass.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsClass/VB/type_isclass.vb
rename to snippets/visualbasic/System/Type/IsClass/type_isclass.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsContextful/VB/type_iscontextful.vb b/snippets/visualbasic/System/Type/IsContextful/type_iscontextful.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsContextful/VB/type_iscontextful.vb
rename to snippets/visualbasic/System/Type/IsContextful/type_iscontextful.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsContextfulImpl/VB/type_iscontextfulimpl.vb b/snippets/visualbasic/System/Type/IsContextfulImpl/type_iscontextfulimpl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsContextfulImpl/VB/type_iscontextfulimpl.vb
rename to snippets/visualbasic/System/Type/IsContextfulImpl/type_iscontextfulimpl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TestIsEnum/VB/testisenum.vb b/snippets/visualbasic/System/Type/IsEnum/testisenum.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TestIsEnum/VB/testisenum.vb
rename to snippets/visualbasic/System/Type/IsEnum/testisenum.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsExplicitLayout/VB/type_isexplicitlayout.vb b/snippets/visualbasic/System/Type/IsExplicitLayout/type_isexplicitlayout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsExplicitLayout/VB/type_isexplicitlayout.vb
rename to snippets/visualbasic/System/Type/IsExplicitLayout/type_isexplicitlayout.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TestIsInstanceOfType/VB/testisinstanceoftype.vb b/snippets/visualbasic/System/Type/IsInstanceOfType/testisinstanceoftype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TestIsInstanceOfType/VB/testisinstanceoftype.vb
rename to snippets/visualbasic/System/Type/IsInstanceOfType/testisinstanceoftype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsInterface/VB/type_isinterface.vb b/snippets/visualbasic/System/Type/IsInterface/type_isinterface.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsInterface/VB/type_isinterface.vb
rename to snippets/visualbasic/System/Type/IsInterface/type_isinterface.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsLayoutSequential/VB/type_islayoutsequential.vb b/snippets/visualbasic/System/Type/IsLayoutSequential/type_islayoutsequential.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsLayoutSequential/VB/type_islayoutsequential.vb
rename to snippets/visualbasic/System/Type/IsLayoutSequential/type_islayoutsequential.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsMarshalByRefImpl/VB/type_ismarshalbyrefimpl.vb b/snippets/visualbasic/System/Type/IsMarshalByRefImpl/type_ismarshalbyrefimpl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsMarshalByRefImpl/VB/type_ismarshalbyrefimpl.vb
rename to snippets/visualbasic/System/Type/IsMarshalByRefImpl/type_ismarshalbyrefimpl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsPrimitiveImpl/VB/type_isprimitiveimpl.vb b/snippets/visualbasic/System/Type/IsPrimitiveImpl/type_isprimitiveimpl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsPrimitiveImpl/VB/type_isprimitiveimpl.vb
rename to snippets/visualbasic/System/Type/IsPrimitiveImpl/type_isprimitiveimpl.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type.IsPublic/VB/type_ispublic.vb b/snippets/visualbasic/System/Type/IsPublic/type_ispublic.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type.IsPublic/VB/type_ispublic.vb
rename to snippets/visualbasic/System/Type/IsPublic/type_ispublic.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsSealed/VB/type_issealed.vb b/snippets/visualbasic/System/Type/IsSealed/type_issealed.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsSealed/VB/type_issealed.vb
rename to snippets/visualbasic/System/Type/IsSealed/type_issealed.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsSerializable/VB/type_isserializable.vb b/snippets/visualbasic/System/Type/IsSerializable/type_isserializable.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsSerializable/VB/type_isserializable.vb
rename to snippets/visualbasic/System/Type/IsSerializable/type_isserializable.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TestIsSubclassOf/VB/testissubclassof.vb b/snippets/visualbasic/System/Type/IsSubclassOf/testissubclassof.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TestIsSubclassOf/VB/testissubclassof.vb
rename to snippets/visualbasic/System/Type/IsSubclassOf/testissubclassof.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_IsValueType/VB/type_isvaluetype.vb b/snippets/visualbasic/System/Type/IsValueType/type_isvaluetype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_IsValueType/VB/type_isvaluetype.vb
rename to snippets/visualbasic/System/Type/IsValueType/type_isvaluetype.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_ToString/VB/type_tostring.vb b/snippets/visualbasic/System/Type/Module/type_tostring.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_ToString/VB/type_tostring.vb
rename to snippets/visualbasic/System/Type/Module/type_tostring.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type.StructLayoutAttribute/VB/source.vb b/snippets/visualbasic/System/Type/StructLayoutAttribute/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type.StructLayoutAttribute/VB/source.vb
rename to snippets/visualbasic/System/Type/StructLayoutAttribute/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/Type_TypeHandle/VB/type_typehandle.vb b/snippets/visualbasic/System/Type/TypeHandle/type_typehandle.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/Type_TypeHandle/VB/type_typehandle.vb
rename to snippets/visualbasic/System/Type/TypeHandle/type_typehandle.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_Constructor2/VB/typeloadexception_constructor2.vb b/snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_constructor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_Constructor2/VB/typeloadexception_constructor2.vb
rename to snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_constructor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_Constructor3/VB/typeloadexception_constructor3.vb b/snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_constructor3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_Constructor3/VB/typeloadexception_constructor3.vb
rename to snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_constructor3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_GetObjectData/VB/typeloadexception_getobjectdata.vb b/snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_getobjectdata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_GetObjectData/VB/typeloadexception_getobjectdata.vb
rename to snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_getobjectdata.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_TypeName/VB/typeloadexception_typename.vb b/snippets/visualbasic/System/TypeLoadException/Message/typeloadexception_typename.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_TypeName/VB/typeloadexception_typename.vb
rename to snippets/visualbasic/System/TypeLoadException/Message/typeloadexception_typename.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/UInt16 Example/VB/source.vb b/snippets/visualbasic/System/UInt16/CompareTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/UInt16 Example/VB/source.vb
rename to snippets/visualbasic/System/UInt16/CompareTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/UInt16_Equals/VB/uint16_equals.vb b/snippets/visualbasic/System/UInt16/Equals/uint16_equals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/UInt16_Equals/VB/uint16_equals.vb
rename to snippets/visualbasic/System/UInt16/Equals/uint16_equals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/UInt32 Example/VB/source.vb b/snippets/visualbasic/System/UInt32/CompareTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/UInt32 Example/VB/source.vb
rename to snippets/visualbasic/System/UInt32/CompareTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/UInt32_Equals/VB/uint32_equals.vb b/snippets/visualbasic/System/UInt32/Equals/uint32_equals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/UInt32_Equals/VB/uint32_equals.vb
rename to snippets/visualbasic/System/UInt32/Equals/uint32_equals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/UInt64 Example/VB/source.vb b/snippets/visualbasic/System/UInt64/CompareTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/UInt64 Example/VB/source.vb
rename to snippets/visualbasic/System/UInt64/CompareTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/UInt64_Equals/VB/uint64_equals.vb b/snippets/visualbasic/System/UInt64/Equals/uint64_equals.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/UInt64_Equals/VB/uint64_equals.vb
rename to snippets/visualbasic/System/UInt64/Equals/uint64_equals.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/AppDomain_UnhandledException/VB/unhandledexception.vb b/snippets/visualbasic/System/UnhandledExceptionEventArgs/ExceptionObject/unhandledexception.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/AppDomain_UnhandledException/VB/unhandledexception.vb
rename to snippets/visualbasic/System/UnhandledExceptionEventArgs/ExceptionObject/unhandledexception.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR/WeakReference/vb/Module1.vb b/snippets/visualbasic/System/WeakReference/Overview/Module1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR/WeakReference/vb/Module1.vb
rename to snippets/visualbasic/System/WeakReference/Overview/Module1.vb
diff --git a/xml/Microsoft.CSharp/CSharpCodeProvider.xml b/xml/Microsoft.CSharp/CSharpCodeProvider.xml
index ebfe1a81a38..9c41a5164a2 100644
--- a/xml/Microsoft.CSharp/CSharpCodeProvider.xml
+++ b/xml/Microsoft.CSharp/CSharpCodeProvider.xml
@@ -49,7 +49,7 @@ This class provides methods that can be used to retrieve instances of the C# <xr
 > The `CompileAssemblyFrom*` methods aren't supported on .NET Core and .NET 5+. This example only runs on .NET Framework.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.CSharp/CSharpCodeProvider/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CodeProviders/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -357,7 +357,7 @@ In .NET Framework apps, you can obtain the value for `providerOptions` from the
  The following code example shows the use of the <xref:Microsoft.CSharp.CSharpCodeProvider.GenerateCodeFromMember%2A> method to create a code fragment to be used in a CodeDOM graph. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CodeDomProvider.GenerateCodeFromMember%2A> method of the <xref:System.CodeDom.Compiler.CodeDomProvider> class.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_GenerateCodeFromMember/vb/module1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/module1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.VisualBasic/VBCodeProvider.xml b/xml/Microsoft.VisualBasic/VBCodeProvider.xml
index a07c952b05e..2dbf6bc88bb 100644
--- a/xml/Microsoft.VisualBasic/VBCodeProvider.xml
+++ b/xml/Microsoft.VisualBasic/VBCodeProvider.xml
@@ -47,7 +47,7 @@
  The following example uses either the C# or Visual Basic code provider to compile a source file. The example checks the input file extension and uses the corresponding <xref:Microsoft.CSharp.CSharpCodeProvider> or <xref:Microsoft.VisualBasic.VBCodeProvider> for compilation.  The input file is compiled into an executable file, and any compilation errors are displayed to the console.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.CSharp/CSharpCodeProvider/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CodeProviders/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -159,7 +159,7 @@ In .NET Framework apps, you can obtain the value for `providerOptions` from the
 
  The following example shows how to specify the compiler version when creating a new instance of the <xref:Microsoft.VisualBasic.VBCodeProvider> class.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/vbprovider.provideroptions/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.VisualBasic/VBCodeProvider/.ctor/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -355,7 +355,7 @@ In .NET Framework apps, you can obtain the value for `providerOptions` from the
  The following code example shows the use of the <xref:Microsoft.VisualBasic.VBCodeProvider.GenerateCodeFromMember%2A> method to create a code fragment to be used in a CodeDOM graph. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CodeDomProvider.GenerateCodeFromMember%2A> method of the <xref:System.CodeDom.Compiler.CodeDomProvider> class.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_GenerateCodeFromMember/vb/module1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/module1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.Win32.SafeHandles/SafeFileHandle.xml b/xml/Microsoft.Win32.SafeHandles/SafeFileHandle.xml
index 5e47503b09b..38b5e93b012 100644
--- a/xml/Microsoft.Win32.SafeHandles/SafeFileHandle.xml
+++ b/xml/Microsoft.Win32.SafeHandles/SafeFileHandle.xml
@@ -95,7 +95,7 @@
  The following code example demonstrates how to open a file using the <xref:Microsoft.Win32.SafeHandles.SafeFileHandle> class and the unmanaged `CreateFile` function.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32.SafeHandles/SafeFileHandle/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeFileHandle/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeFileHandle/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -191,7 +191,7 @@
  The following example demonstrates how to open a file by using the <xref:Microsoft.Win32.SafeHandles.SafeFileHandle> class and the unmanaged `CreateFile` function.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32.SafeHandles/SafeFileHandle/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeFileHandle.ctor/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeFileHandle/.ctor/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.Win32.SafeHandles/SafeWaitHandle.xml b/xml/Microsoft.Win32.SafeHandles/SafeWaitHandle.xml
index 4687f4ea04a..ea7a0aca8d8 100644
--- a/xml/Microsoft.Win32.SafeHandles/SafeWaitHandle.xml
+++ b/xml/Microsoft.Win32.SafeHandles/SafeWaitHandle.xml
@@ -82,7 +82,7 @@ The <xref:Microsoft.Win32.SafeHandles.SafeWaitHandle> class is used by the <xref
 The following code example demonstrates how to use interop to create a mutex using the <xref:Microsoft.Win32.SafeHandles.SafeWaitHandle> class and the unmanaged `CreateMutex` function.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeWaitHandle/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -180,7 +180,7 @@ The following code example demonstrates how to use interop to create a mutex usi
  The following code example demonstrates how to use interop to create a mutex using the <xref:Microsoft.Win32.SafeHandles.SafeWaitHandle> class and the unmanaged `CreateMutex` function.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.SafeHandles.SafeWaitHandle-ctor/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32.SafeHandles/SafeWaitHandle/.ctor/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.Win32/Registry.xml b/xml/Microsoft.Win32/Registry.xml
index ce525707b02..67d9c6763a5 100644
--- a/xml/Microsoft.Win32/Registry.xml
+++ b/xml/Microsoft.Win32/Registry.xml
@@ -59,7 +59,7 @@ The following code example stores values of several data types in an example key
 
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/CPP/source.cpp" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/Overview/source1.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb" id="Snippet1":::
 
    ]]></format>
     </remarks>
@@ -333,7 +333,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -486,7 +486,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -576,7 +576,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -677,7 +677,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.Registry.GetSet/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.Win32/RegistryHive.xml b/xml/Microsoft.Win32/RegistryHive.xml
index a07c626b6a3..bb027d0184e 100644
--- a/xml/Microsoft.Win32/RegistryHive.xml
+++ b/xml/Microsoft.Win32/RegistryHive.xml
@@ -54,7 +54,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.OpenRemoteBaseKey/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryHive/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.OpenRemoteBaseKey/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryHive/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.Win32/RegistryKey.xml b/xml/Microsoft.Win32/RegistryKey.xml
index 06be1b59a9f..5ded39a252a 100644
--- a/xml/Microsoft.Win32/RegistryKey.xml
+++ b/xml/Microsoft.Win32/RegistryKey.xml
@@ -78,7 +78,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -132,7 +132,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -201,7 +201,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -720,7 +720,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source2.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source2.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source2.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source2.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -873,7 +873,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1007,7 +1007,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1521,7 +1521,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1611,7 +1611,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/GetValue/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1796,7 +1796,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RegistryValueOptions/CPP/RegistryValueOptions.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/GetValue/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RegistryValueOptions/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1878,7 +1878,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/GetValue/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1951,7 +1951,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2063,7 +2063,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2192,7 +2192,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.OpenRemoteBaseKey/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryHive/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.OpenRemoteBaseKey/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryHive/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2347,7 +2347,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RegistryKey.OpenSubKey/CPP/opensubkey.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/OpenSubKey/opensubkey.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RegistryKey.OpenSubKey/VB/opensubkey.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/OpenSubKey/opensubkey.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2433,7 +2433,7 @@
  The following code example creates a subkey containing 100 key/value pairs and closes it. The example opens the subkey with <xref:Microsoft.Win32.RegistryKeyPermissionCheck.Default>, records the time it takes to read all the values, and closes the subkey. The example opens the subkey with <xref:Microsoft.Win32.RegistryKeyPermissionCheck.ReadSubTree> and records the time it takes to read all the values. Finally, the example computes and displays the percentage improvement.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/OpenSubKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RegistryKey.OpenSubKey_PermCheck/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/OpenSubKey/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2521,7 +2521,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RegistryKey.OpenSubKey/CPP/opensubkey.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/OpenSubKey/opensubkey.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RegistryKey.OpenSubKey/VB/opensubkey.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/OpenSubKey/opensubkey.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2752,7 +2752,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RegistrySecurity101/cpp/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/SetAccessControl/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RegistrySecurity101/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/SetAccessControl/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2844,7 +2844,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.SetValue1/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/SetValue/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey.SetValue1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/SetValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2947,7 +2947,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/GetValue/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3016,7 +3016,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3115,7 +3115,7 @@ This method has the same effect as calling <xref:Microsoft.Win32.RegistryKey.Clo
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3175,7 +3175,7 @@ This method has the same effect as calling <xref:Microsoft.Win32.RegistryKey.Clo
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/CPP/source.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryKey2/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.Win32/RegistryKeyPermissionCheck.xml b/xml/Microsoft.Win32/RegistryKeyPermissionCheck.xml
index c271f9718f2..b00b50769dd 100644
--- a/xml/Microsoft.Win32/RegistryKeyPermissionCheck.xml
+++ b/xml/Microsoft.Win32/RegistryKeyPermissionCheck.xml
@@ -50,7 +50,7 @@
  The following code example creates a subkey containing 100 key/value pairs and closes it. The example opens the subkey with Default and records the time it takes to read all the values. Then the example opens the subkey with ReadSubTree and records the time it takes to read all the values. Finally, the example computes and displays the percentage improvement.  
   
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/OpenSubKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RegistryKey.OpenSubKey_PermCheck/vb/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/OpenSubKey/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.Win32/RegistryValueKind.xml b/xml/Microsoft.Win32/RegistryValueKind.xml
index beb6e4dceac..9ccb73f4402 100644
--- a/xml/Microsoft.Win32/RegistryValueKind.xml
+++ b/xml/Microsoft.Win32/RegistryValueKind.xml
@@ -50,7 +50,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/GetValue/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Microsoft.Win32.RegistryValueKind/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.Win32/RegistryValueOptions.xml b/xml/Microsoft.Win32/RegistryValueOptions.xml
index 7b42b35f583..5e642fa38e7 100644
--- a/xml/Microsoft.Win32/RegistryValueOptions.xml
+++ b/xml/Microsoft.Win32/RegistryValueOptions.xml
@@ -48,7 +48,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RegistryValueOptions/CPP/RegistryValueOptions.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/GetValue/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RegistryValueOptions/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source1.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.Win32/SystemEvents.xml b/xml/Microsoft.Win32/SystemEvents.xml
index dd1ecb539d7..8993a1f2697 100644
--- a/xml/Microsoft.Win32/SystemEvents.xml
+++ b/xml/Microsoft.Win32/SystemEvents.xml
@@ -94,7 +94,7 @@
 7.  Uninstall the service from the command line by using the `/u` option. For example, `InstallUtil /u example.exe`.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/SystemEvents/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ManagedWindowsService/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/SystemEvents/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Hosting/AddInController.xml b/xml/System.AddIn.Hosting/AddInController.xml
index 3cfe7e33056..e1721807b0c 100644
--- a/xml/System.AddIn.Hosting/AddInController.xml
+++ b/xml/System.AddIn.Hosting/AddInController.xml
@@ -38,7 +38,7 @@
  The following example activates an add-in within the same environment as a previously activated add-in by using an <xref:System.AddIn.Hosting.AddInController> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet8":::
 
  ]]></format>
     </remarks>
@@ -75,7 +75,7 @@
  The following example activates a second add-in within the same environment as the first add-in.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -112,7 +112,7 @@
  The following example activates a second add-in in the same application domain as the first add-in.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@
  The following example obtains the <xref:System.AddIn.Hosting.AddInController> object for a host view named `manager` and then shuts down the add-in.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Shutdown/Program.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHost/vb/Program.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Shutdown/Program.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.AddIn.Hosting/AddInProcess.xml b/xml/System.AddIn.Hosting/AddInProcess.xml
index 03d9777e427..b5d4e69d366 100644
--- a/xml/System.AddIn.Hosting/AddInProcess.xml
+++ b/xml/System.AddIn.Hosting/AddInProcess.xml
@@ -30,7 +30,7 @@
  The following example activates an add-in in an external process.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet10":::
 
  ]]></format>
     </remarks>
@@ -162,7 +162,7 @@
  The following example activates an add-in in an external process and uses the <xref:System.AddIn.Hosting.AddInProcess.IsCurrentProcess%2A> property to determine whether the add-in is in the same process as the host application process.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.AddIn.Hosting/AddInSecurityLevel.xml b/xml/System.AddIn.Hosting/AddInSecurityLevel.xml
index 21c211f2e04..b0542cd05e2 100644
--- a/xml/System.AddIn.Hosting/AddInSecurityLevel.xml
+++ b/xml/System.AddIn.Hosting/AddInSecurityLevel.xml
@@ -35,7 +35,7 @@
  The following example activates an add-in with a specified trust level.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet5":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Hosting/AddInSegmentType.xml b/xml/System.AddIn.Hosting/AddInSegmentType.xml
index d158124de49..72df054fab1 100644
--- a/xml/System.AddIn.Hosting/AddInSegmentType.xml
+++ b/xml/System.AddIn.Hosting/AddInSegmentType.xml
@@ -27,7 +27,7 @@
  The following example uses the <xref:System.AddIn.Hosting.AddInSegmentType> enumeration to evaluate an add-in's qualification data.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet11":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Hosting/AddInStore.xml b/xml/System.AddIn.Hosting/AddInStore.xml
index 9ed400cb1e7..16f808a1413 100644
--- a/xml/System.AddIn.Hosting/AddInStore.xml
+++ b/xml/System.AddIn.Hosting/AddInStore.xml
@@ -40,7 +40,7 @@
  The following example shows how to update cache files.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -92,7 +92,7 @@
  The following example finds a specific add-in.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
  The following example finds add-ins at the location specified by the <xref:System.AddIn.Hosting.PipelineStoreLocation> enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -556,7 +556,7 @@
  The following example shows how to update the cache files. This code example is part of a larger example provided for the <xref:System.AddIn.Hosting.AddInStore> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.AddIn.Hosting/AddInToken.xml b/xml/System.AddIn.Hosting/AddInToken.xml
index e1a3aadfa29..cc768658e06 100644
--- a/xml/System.AddIn.Hosting/AddInToken.xml
+++ b/xml/System.AddIn.Hosting/AddInToken.xml
@@ -53,14 +53,14 @@
  The following example shows how to activate an add-in with a token.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet5":::
 
  **Example 2**
 
  The following example shows the custom `ChooseAddIn` method, which enumerates an <xref:System.AddIn.Hosting.AddInToken> collection. The user selects a token from this collection to activate the corresponding add-in.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet13":::
 
  ]]></format>
     </remarks>
@@ -115,7 +115,7 @@
  The following example activates one add-in in an automatically generated application domain with a specified security level. It then activates a second add-in in the same application domain and process as the first by using the first add-in's <xref:System.AddIn.Hosting.AddInEnvironment> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -163,7 +163,7 @@
  The following example shows how to activate an add-in, identified by the chosen token, in an automatically generated application domain with a specified security level.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
  The following example activates an add-in in an application domain that is being used by another add-in. The code for the first add-in is provided in the <xref:System.AddIn.Hosting.AddInToken> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -302,7 +302,7 @@
  The following example creates a new process and activates an add-in in that process with a full trust security level.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -425,7 +425,7 @@
  The following example displays the value of the <xref:System.AddIn.Hosting.AddInToken.Name%2A>, <xref:System.AddIn.Hosting.AddInToken.AddInFullName%2A>, <xref:System.AddIn.Hosting.AddInToken.Description%2A>, <xref:System.AddIn.Hosting.AddInToken.AssemblyName%2A>, <xref:System.AddIn.Hosting.AddInToken.Publisher%2A>, and <xref:System.AddIn.Hosting.AddInToken.Version%2A> properties to the console. This code example is part of a larger example provided for the <xref:System.AddIn.Hosting.AddInToken> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -462,7 +462,7 @@
  The following example displays the value of the <xref:System.AddIn.Hosting.AddInToken.Name%2A>, <xref:System.AddIn.Hosting.AddInToken.AddInFullName%2A>, <xref:System.AddIn.Hosting.AddInToken.Description%2A>, <xref:System.AddIn.Hosting.AddInToken.AssemblyName%2A>, <xref:System.AddIn.Hosting.AddInToken.Publisher%2A>, and <xref:System.AddIn.Hosting.AddInToken.Version%2A> properties to the console. This code example is part of a larger example provided for the <xref:System.AddIn.Hosting.AddInToken> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -499,7 +499,7 @@
  The following example displays the value of the <xref:System.AddIn.Hosting.AddInToken.Name%2A>, <xref:System.AddIn.Hosting.AddInToken.AddInFullName%2A>, <xref:System.AddIn.Hosting.AddInToken.Description%2A>, <xref:System.AddIn.Hosting.AddInToken.AssemblyName%2A>, <xref:System.AddIn.Hosting.AddInToken.Publisher%2A>, and <xref:System.AddIn.Hosting.AddInToken.Version%2A> properties to the console. This code example is part of a larger example provided for the <xref:System.AddIn.Hosting.AddInToken> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -622,7 +622,7 @@
  The following example lists the qualification data for the pipeline segments associated with each <xref:System.AddIn.Hosting.AddInToken> in a collection of tokens.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -682,7 +682,7 @@
  The following example displays the value of the <xref:System.AddIn.Hosting.AddInToken.Name%2A>, <xref:System.AddIn.Hosting.AddInToken.AddInFullName%2A>, <xref:System.AddIn.Hosting.AddInToken.Description%2A>, <xref:System.AddIn.Hosting.AddInToken.AssemblyName%2A>, <xref:System.AddIn.Hosting.AddInToken.Publisher%2A>, and <xref:System.AddIn.Hosting.AddInToken.Version%2A> properties to the console. This code example is part of a larger example provided for the <xref:System.AddIn.Hosting.AddInToken> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -719,7 +719,7 @@
  The following example displays the value of the <xref:System.AddIn.Hosting.AddInToken.Name%2A>, <xref:System.AddIn.Hosting.AddInToken.AddInFullName%2A>, <xref:System.AddIn.Hosting.AddInToken.Description%2A>, <xref:System.AddIn.Hosting.AddInToken.AssemblyName%2A>, <xref:System.AddIn.Hosting.AddInToken.Publisher%2A>, and <xref:System.AddIn.Hosting.AddInToken.Version%2A> properties to the console. This code example is part of a larger example provided for the <xref:System.AddIn.Hosting.AddInToken> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -763,7 +763,7 @@
  The following example shows how to examine an add-in's qualification data.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -869,7 +869,7 @@
  The following example displays the value of the <xref:System.AddIn.Hosting.AddInToken.Name%2A>, <xref:System.AddIn.Hosting.AddInToken.AddInFullName%2A>, <xref:System.AddIn.Hosting.AddInToken.Description%2A>, <xref:System.AddIn.Hosting.AddInToken.AssemblyName%2A>, <xref:System.AddIn.Hosting.AddInToken.Publisher%2A>, and <xref:System.AddIn.Hosting.AddInToken.Version%2A> properties to the console. This code example is part of a larger example provided for the <xref:System.AddIn.Hosting.AddInToken> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.AddIn.Hosting/PipelineStoreLocation.xml b/xml/System.AddIn.Hosting/PipelineStoreLocation.xml
index d81696bcc14..b23a265eb86 100644
--- a/xml/System.AddIn.Hosting/PipelineStoreLocation.xml
+++ b/xml/System.AddIn.Hosting/PipelineStoreLocation.xml
@@ -37,7 +37,7 @@
  The following example uses the ApplicationBase value to activate an add-in from the pipeline store files, which are located in the host application's directory.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Hosting/QualificationDataItem.xml b/xml/System.AddIn.Hosting/QualificationDataItem.xml
index 7dbceb4a742..44537f86226 100644
--- a/xml/System.AddIn.Hosting/QualificationDataItem.xml
+++ b/xml/System.AddIn.Hosting/QualificationDataItem.xml
@@ -36,7 +36,7 @@
  The following example lists the qualification data for the pipeline segments associated with each <xref:System.AddIn.Hosting.AddInToken> in a collection of tokens.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet12":::
 
  ]]></format>
     </remarks>
@@ -129,7 +129,7 @@
  The following example lists the qualification data for the pipeline segments associated with each <xref:System.AddIn.Hosting.AddInToken> in a collection of tokens. The <xref:System.AddIn.Hosting.QualificationDataItem.Name%2A> property is used to display the name of each item.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -233,7 +233,7 @@
  The following example lists the qualification data for the pipeline segments associated with each <xref:System.AddIn.Hosting.AddInToken> in a collection of tokens. The <xref:System.AddIn.Hosting.QualificationDataItem.Segment%2A> property is used to display the kind of segment.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -276,7 +276,7 @@
  The following example lists the qualification data for the pipeline segments associated with each <xref:System.AddIn.Hosting.AddInToken> in a collection of tokens. The <xref:System.AddIn.Hosting.QualificationDataItem.Value%2A> property is used to display the value of the item.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Hosting/AddInController/Overview/P3Host.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/addinP3Host/vb/p3host.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Hosting/AddInController/Overview/p3host.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.AddIn.Pipeline/AddInAdapterAttribute.xml b/xml/System.AddIn.Pipeline/AddInAdapterAttribute.xml
index 074c0072f49..f64ec3e3e07 100644
--- a/xml/System.AddIn.Pipeline/AddInAdapterAttribute.xml
+++ b/xml/System.AddIn.Pipeline/AddInAdapterAttribute.xml
@@ -36,7 +36,7 @@
  The following example identifies an add-in-side adapter.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/Calc1ViewToContractAddInSideAdapter.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInSideAdapters/vb/Calc1ViewToContractAddInSideAdapter.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Pipeline/AddInAdapterAttribute/Overview/Calc1ViewToContractAddInSideAdapter.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Pipeline/AddInBaseAttribute.xml b/xml/System.AddIn.Pipeline/AddInBaseAttribute.xml
index 2a3eb8319fc..e5eafb69e8f 100644
--- a/xml/System.AddIn.Pipeline/AddInBaseAttribute.xml
+++ b/xml/System.AddIn.Pipeline/AddInBaseAttribute.xml
@@ -38,7 +38,7 @@
  The following example identifies the add-in base class for an add-in view pipeline segment.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Pipeline/AddInBaseAttribute/Overview/Calc1AddInView.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInP1AddInViews/vb/Calc1AddInView.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Pipeline/AddInBaseAttribute/Overview/Calc1AddInView.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Pipeline/AddInContractAttribute.xml b/xml/System.AddIn.Pipeline/AddInContractAttribute.xml
index ed6478a3147..cdea6f932c6 100644
--- a/xml/System.AddIn.Pipeline/AddInContractAttribute.xml
+++ b/xml/System.AddIn.Pipeline/AddInContractAttribute.xml
@@ -36,7 +36,7 @@
  The following example identifies a contract.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Pipeline/AddInContractAttribute/Overview/ICalc1Contract.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInP1Contract/vb/ICalc1Contract.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Pipeline/AddInContractAttribute/Overview/ICalc1Contract.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Pipeline/CollectionAdapters.xml b/xml/System.AddIn.Pipeline/CollectionAdapters.xml
index 466148d5f9f..4f7a4a6083d 100644
--- a/xml/System.AddIn.Pipeline/CollectionAdapters.xml
+++ b/xml/System.AddIn.Pipeline/CollectionAdapters.xml
@@ -70,7 +70,7 @@
  The following example implements a host-side adapter pipeline segment as described [Walkthrough: Passing Collections Between Hosts and Add-Ins](/previous-versions/dotnet/netframework-4.0/bb384207(v=vs.100)). The example adapts the custom `ProcessBooks` method by taking the <xref:System.AddIn.Contract.IListContract%601> collection passed from the add-in and converting it to an <xref:System.Collections.Generic.IList%601> collection, which the host application can then use.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Pipeline/CollectionAdapters/ToIListT/LibraryManagerViewToContractAddInAdapter.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineAddInSideAdapter/vb/LibraryManagerViewToContractAddInAdapter.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListT/LibraryManagerViewToContractAddInAdapter.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -160,7 +160,7 @@
  The following example implements the class that defines an add-in side adapter pipeline segment. It adapts the custom `ProcessBooks` method by taking the <xref:System.Collections.Generic.IList%601> collection passed from the add-in view segment and converting it to an <xref:System.AddIn.Contract.IListContract%601> collection that can be marshaled across the isolation boundary to the host.
 
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/LibraryManagerContractToViewHostAdapter.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInCollectionPipelineHostSideAdapter/vb/LibraryManagerContractToViewHostAdapter.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Pipeline/CollectionAdapters/ToIListContractT/LibraryManagerContractToViewHostAdapter.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.AddIn.Pipeline/ContractHandle.xml b/xml/System.AddIn.Pipeline/ContractHandle.xml
index 079829d71c6..5183a18363e 100644
--- a/xml/System.AddIn.Pipeline/ContractHandle.xml
+++ b/xml/System.AddIn.Pipeline/ContractHandle.xml
@@ -38,7 +38,7 @@
  The following example shows how to set the lifetime token handle in a contract-to-view adapter on the add-in side of a pipeline.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Pipeline/ContractHandle/Overview/Calc2ContractToViewHostSideAdapter.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInP2HostSideAdapters/vb/Calc2ContractToViewHostSideAdapter.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Pipeline/ContractHandle/Overview/Calc2ContractToViewHostSideAdapter.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Pipeline/HostAdapterAttribute.xml b/xml/System.AddIn.Pipeline/HostAdapterAttribute.xml
index f43ca69af2b..ba38ed9841a 100644
--- a/xml/System.AddIn.Pipeline/HostAdapterAttribute.xml
+++ b/xml/System.AddIn.Pipeline/HostAdapterAttribute.xml
@@ -36,7 +36,7 @@
  The following example identifies a host-side adapter.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn.Pipeline/HostAdapterAttribute/Overview/Calc1ContractToViewHostSideAdapter.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInP1HostSideAdapters/vb/Calc1ContractToViewHostSideAdapter.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn.Pipeline/HostAdapterAttribute/Overview/Calc1ContractToViewHostSideAdapter.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn.Pipeline/QualificationDataAttribute.xml b/xml/System.AddIn.Pipeline/QualificationDataAttribute.xml
index 685546564ea..3711a0b9b24 100644
--- a/xml/System.AddIn.Pipeline/QualificationDataAttribute.xml
+++ b/xml/System.AddIn.Pipeline/QualificationDataAttribute.xml
@@ -40,7 +40,7 @@
  The following example applies qualification data to an add-in.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn/AddInAttribute/Overview/addincalcv2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/AddInCalcV2.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/AddInCalcV2.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.AddIn/AddInAttribute.xml b/xml/System.AddIn/AddInAttribute.xml
index c61e8a6d95f..594ebdf4c06 100644
--- a/xml/System.AddIn/AddInAttribute.xml
+++ b/xml/System.AddIn/AddInAttribute.xml
@@ -48,7 +48,7 @@
  The following example identifies an add-in.  
   
  :::code language="csharp" source="~/snippets/csharp/System.AddIn/AddInAttribute/Overview/addincalcv2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddInP2AddInCalcV2/vb/AddInCalcV2.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.AddIn/AddInAttribute/Overview/AddInCalcV2.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom.Compiler/CodeDomProvider.xml b/xml/System.CodeDom.Compiler/CodeDomProvider.xml
index 5058c8bf930..2327e3068c1 100644
--- a/xml/System.CodeDom.Compiler/CodeDomProvider.xml
+++ b/xml/System.CodeDom.Compiler/CodeDomProvider.xml
@@ -66,7 +66,7 @@
  The following example program can generate and compile source code based on a CodeDOM model of a program that prints "Hello World" using the <xref:System.Console> class. A Windows Forms user interface is provided. The user can select the target programming language from several selections: C#, Visual Basic, and JScript.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCompileUnit/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCompileUnit/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -713,7 +713,7 @@
  The following code example determines the <xref:System.CodeDom.Compiler.CodeDomProvider> implementation for an input language and displays the configured settings for the language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -782,7 +782,7 @@
  The following example shows how to create an instance of a provider by using the `providerOptions` parameter.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/codedomprovider.provideroptions/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -888,7 +888,7 @@
  The following code example creates an instance of <xref:Microsoft.VisualBasic.VBCodeProvider?displayProperty=nameWithType>. The example displays the provider name, hash code and default file name extension for the new provider instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -945,7 +945,7 @@
  The following code example shows the use of the <xref:System.CodeDom.Compiler.CodeDomProvider.GenerateCodeFromCompileUnit%2A> method to generate code for a "Hello World" application from a <xref:System.CodeDom.CodeCompileUnit>. This example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CodeDomProvider> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCompileUnit/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomExample/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCompileUnit/Overview/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1063,7 +1063,7 @@
  The following code example shows the use of the <xref:System.CodeDom.Compiler.CodeDomProvider.GenerateCodeFromMember%2A> method as implemented by the <xref:Microsoft.CSharp.CSharpCodeProvider> and <xref:Microsoft.VisualBasic.VBCodeProvider> classes.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_GenerateCodeFromMember/vb/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/module1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1288,7 +1288,7 @@
  The following code example enumerates the language providers on the computer and displays the configuration and compiler settings for each language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -1355,7 +1355,7 @@
  The following code example determines the <xref:System.CodeDom.Compiler.CodeDomProvider> implementation for an input language and displays the configured settings for the language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1471,7 +1471,7 @@
  The following code example determines the <xref:System.CodeDom.Compiler.CodeDomProvider> implementation for an input file name extension and displays the configured settings for the language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1588,7 +1588,7 @@
  The following code example determines the <xref:System.CodeDom.Compiler.CodeDomProvider> implementation for an input file name extension and displays the configured settings for the language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1654,7 +1654,7 @@
  The following code example determines the <xref:System.CodeDom.Compiler.CodeDomProvider> implementation for an input language and displays the configured settings for the language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom.Compiler/CodeGeneratorOptions.xml b/xml/System.CodeDom.Compiler/CodeGeneratorOptions.xml
index 12a32053cfa..f1a2c5ad9b5 100644
--- a/xml/System.CodeDom.Compiler/CodeGeneratorOptions.xml
+++ b/xml/System.CodeDom.Compiler/CodeGeneratorOptions.xml
@@ -49,7 +49,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeGeneratorOptions/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeGeneratorOptionsExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeGeneratorOptions/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom.Compiler/CompilerErrorCollection.xml b/xml/System.CodeDom.Compiler/CompilerErrorCollection.xml
index ed2df886790..d4dc7019e80 100644
--- a/xml/System.CodeDom.Compiler/CompilerErrorCollection.xml
+++ b/xml/System.CodeDom.Compiler/CompilerErrorCollection.xml
@@ -54,7 +54,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.Compiler.CompilerErrorCollection> class. The example creates a new instance of the class and uses several methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -110,7 +110,7 @@
  The following example demonstrates how to create an empty instance of the <xref:System.CodeDom.Compiler.CompilerErrorCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -230,7 +230,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.Compiler.CompilerErrorCollection.Add%2A> method to add a <xref:System.CodeDom.Compiler.CompilerError> object to a <xref:System.CodeDom.Compiler.CompilerErrorCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -287,7 +287,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.Compiler.CompilerErrorCollection.AddRange%28System.CodeDom.Compiler.CompilerError%5B%5D%29> method overload to add an array of <xref:System.CodeDom.Compiler.CompilerError> objects to a <xref:System.CodeDom.Compiler.CompilerErrorCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.Compiler.CompilerErrorCollection.AddRange%28System.CodeDom.Compiler.CompilerErrorCollection%29> method overload to add <xref:System.CodeDom.Compiler.CompilerError> objects from one <xref:System.CodeDom.Compiler.CompilerErrorCollection> to another <xref:System.CodeDom.Compiler.CompilerErrorCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -389,7 +389,7 @@
  The following example uses the <xref:System.CodeDom.Compiler.CompilerErrorCollection.Contains%2A> method to locate a specific <xref:System.CodeDom.Compiler.CompilerError> object and determine the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -439,7 +439,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.Compiler.CompilerErrorCollection.CopyTo%2A> method to copy the contents of a <xref:System.CodeDom.Compiler.CompilerErrorCollection> to an array, starting at the specified index value.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -565,7 +565,7 @@
  The following example searches for a specific <xref:System.CodeDom.Compiler.CompilerError> object and uses the <xref:System.CodeDom.Compiler.CompilerErrorCollection.IndexOf%2A> method to determine the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -615,7 +615,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.Compiler.CompilerErrorCollection.Insert%2A> method to insert a <xref:System.CodeDom.Compiler.CompilerError> object into a <xref:System.CodeDom.Compiler.CompilerErrorCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -702,7 +702,7 @@
  The following example demonstrates how to remove a <xref:System.CodeDom.Compiler.CompilerError> item from a <xref:System.CodeDom.Compiler.CompilerErrorCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerErrorCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerErrorCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom.Compiler/CompilerInfo.xml b/xml/System.CodeDom.Compiler/CompilerInfo.xml
index e0c9ecb7e1e..a6b339ce9a1 100644
--- a/xml/System.CodeDom.Compiler/CompilerInfo.xml
+++ b/xml/System.CodeDom.Compiler/CompilerInfo.xml
@@ -54,7 +54,7 @@
  The following code example displays language provider configuration settings. Command-line arguments are used to specify a language, file name extension, or provider type. For the given input, the example determines the corresponding language provider and displays the configured language compiler settings.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -105,7 +105,7 @@
  The following code example determines whether the input language has a configured <xref:System.CodeDom.Compiler.CodeDomProvider> implementation on the computer. If there is a provider configured for the specified language, the example displays the language provider configuration settings. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -172,7 +172,7 @@
  The following code example determines whether the input language has a configured <xref:System.CodeDom.Compiler.CodeDomProvider> implementation on the computer. If there is a provider configured for the specified language, the example displays the language provider configuration settings. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
  The following code example enumerates the language providers on the computer and displays the configuration and compiler settings for each language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -393,7 +393,7 @@
  The following code example enumerates the language providers on the computer and displays the configuration and compiler settings for each language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -446,7 +446,7 @@
  The following code example creates an instance of the <xref:Microsoft.VisualBasic.VBCodeProvider?displayProperty=nameWithType> class. The example displays the provider name, hash code, and default file name extension for the new provider instance. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -504,7 +504,7 @@
  The following code example enumerates the language providers on the computer and displays the configuration and compiler settings for each language provider. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -555,7 +555,7 @@
  The following code example determines whether the input language has a configured <xref:System.CodeDom.Compiler.CodeDomProvider> implementation on the computer. If there is a provider configured for the specified language, the example displays the language provider configuration settings. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_CompilerInfo/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CodeDomProvider/CreateProvider/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom.Compiler/CompilerParameters.xml b/xml/System.CodeDom.Compiler/CompilerParameters.xml
index 94124788118..8bc30927d07 100644
--- a/xml/System.CodeDom.Compiler/CompilerParameters.xml
+++ b/xml/System.CodeDom.Compiler/CompilerParameters.xml
@@ -66,7 +66,7 @@
  The following example builds a CodeDOM source graph for a simple Hello World program.  The source is then saved to a file, compiled into an executable, and run. The `CompileCode` method illustrates how to use the <xref:System.CodeDom.Compiler.CompilerParameters> class to specify various compiler settings and options.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -121,7 +121,7 @@
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -300,7 +300,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -407,7 +407,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -503,7 +503,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -558,7 +558,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -665,7 +665,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -727,7 +727,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -781,7 +781,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -836,7 +836,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -895,7 +895,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -950,7 +950,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1038,7 +1038,7 @@ An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string o
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom.Compiler/CompilerResults.xml b/xml/System.CodeDom.Compiler/CompilerResults.xml
index 92651c70e40..e745c2d5639 100644
--- a/xml/System.CodeDom.Compiler/CompilerResults.xml
+++ b/xml/System.CodeDom.Compiler/CompilerResults.xml
@@ -66,7 +66,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerResults/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerResultsExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerResults/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom.Compiler/GeneratorSupport.xml b/xml/System.CodeDom.Compiler/GeneratorSupport.xml
index ebbd87a490e..302fb2e846e 100644
--- a/xml/System.CodeDom.Compiler/GeneratorSupport.xml
+++ b/xml/System.CodeDom.Compiler/GeneratorSupport.xml
@@ -54,7 +54,7 @@
  The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerParameters/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompilerParametersExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerParameters/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom.Compiler/IndentedTextWriter.xml b/xml/System.CodeDom.Compiler/IndentedTextWriter.xml
index ce0e9982cd9..f9ddffca07e 100644
--- a/xml/System.CodeDom.Compiler/IndentedTextWriter.xml
+++ b/xml/System.CodeDom.Compiler/IndentedTextWriter.xml
@@ -87,7 +87,7 @@
  The following code example demonstrates using an <xref:System.CodeDom.Compiler.IndentedTextWriter> to write text at different levels of indentation.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IndentedTextWriterExample/VB/form1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -210,7 +210,7 @@
  The following code example demonstrates creating an <xref:System.CodeDom.Compiler.IndentedTextWriter> using a specified tab string.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IndentedTextWriterExample/VB/form1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -582,7 +582,7 @@
  The following code example demonstrates setting the indentation level of an <xref:System.CodeDom.Compiler.IndentedTextWriter>. The indentation level is the number of tab strings to prefix each line with.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IndentedTextWriterExample/VB/form1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -2957,7 +2957,7 @@
  The following code example demonstrates writing a line without tab string indentations.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IndentedTextWriterExample/VB/form1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/IndentedTextWriter/Overview/form1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeArgumentReferenceExpression.xml b/xml/System.CodeDom/CodeArgumentReferenceExpression.xml
index 1933741505b..1bd90bb5280 100644
--- a/xml/System.CodeDom/CodeArgumentReferenceExpression.xml
+++ b/xml/System.CodeDom/CodeArgumentReferenceExpression.xml
@@ -61,7 +61,7 @@
  The following example code defines a method that invokes `Console.WriteLine` to output the string parameter passed to the method. A <xref:System.CodeDom.CodeArgumentReferenceExpression> references the argument passed to the method by method parameter name.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeArgumentReferenceExpression/Overview/codeargumentreferenceexpressionexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeArgumentReferenceExpressionExample/VB/codeargumentreferenceexpressionexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeArgumentReferenceExpression/Overview/codeargumentreferenceexpressionexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeArrayCreateExpression.xml b/xml/System.CodeDom/CodeArrayCreateExpression.xml
index 87bee63cc67..0544f71bc67 100644
--- a/xml/System.CodeDom/CodeArrayCreateExpression.xml
+++ b/xml/System.CodeDom/CodeArrayCreateExpression.xml
@@ -63,7 +63,7 @@
  The following code uses a <xref:System.CodeDom.CodeArrayCreateExpression> to create an array of integers with 10 indexes.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeArrayCreateExpression/Overview/codearraycreateexpressionsnippet.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeArrayCreateExpressionSnippet/VB/codearraycreateexpressionsnippet.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeArrayCreateExpression/Overview/codearraycreateexpressionsnippet.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeArrayIndexerExpression.xml b/xml/System.CodeDom/CodeArrayIndexerExpression.xml
index 36b4a5279e0..05c61d8acfe 100644
--- a/xml/System.CodeDom/CodeArrayIndexerExpression.xml
+++ b/xml/System.CodeDom/CodeArrayIndexerExpression.xml
@@ -59,7 +59,7 @@
  The following code creates a <xref:System.CodeDom.CodeArrayIndexerExpression> that references index 5 of an array of integers named `x` :
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeArrayIndexerExpression/Overview/codearrayindexerexpressionsnippet.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeArrayIndexerExpressionSnippet/VB/codearrayindexerexpressionsnippet.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeArrayIndexerExpression/Overview/codearrayindexerexpressionsnippet.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeAssignStatement.xml b/xml/System.CodeDom/CodeAssignStatement.xml
index e9e3ee373fa..7b895d1b179 100644
--- a/xml/System.CodeDom/CodeAssignStatement.xml
+++ b/xml/System.CodeDom/CodeAssignStatement.xml
@@ -59,7 +59,7 @@
  The following code creates a <xref:System.CodeDom.CodeAssignStatement> that assigns the value 10 to an integer variable named `i`:
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAssignStatement/Overview/codeassignstatementsnippet.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAssignStatement/VB/codeassignstatementsnippet.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAssignStatement/Overview/codeassignstatementsnippet.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeAttachEventStatement.xml b/xml/System.CodeDom/CodeAttachEventStatement.xml
index c09a3ae74a2..733a3d261aa 100644
--- a/xml/System.CodeDom/CodeAttachEventStatement.xml
+++ b/xml/System.CodeDom/CodeAttachEventStatement.xml
@@ -59,7 +59,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeAttachEventStatement> to attach an event handler with an event.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttachEventStatement/Overview/codeattacheventstatementexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttachEventStatementExample/VB/codeattacheventstatementexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttachEventStatement/Overview/codeattacheventstatementexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeAttributeArgumentCollection.xml b/xml/System.CodeDom/CodeAttributeArgumentCollection.xml
index d5ab6c38964..5c1da88355e 100644
--- a/xml/System.CodeDom/CodeAttributeArgumentCollection.xml
+++ b/xml/System.CodeDom/CodeAttributeArgumentCollection.xml
@@ -59,7 +59,7 @@
  The following example demonstrates the use of the <xref:System.CodeDom.CodeAttributeArgumentCollection> class methods. The example creates a new instance of the class and uses the methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -224,7 +224,7 @@
  The following example demonstrates how to add a <xref:System.CodeDom.CodeAttributeArgument> object to a <xref:System.CodeDom.CodeAttributeArgumentCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeAttributeArgumentCollection.AddRange%28System.CodeDom.CodeAttributeArgument%5B%5D%29> method overload to add the members of a <xref:System.CodeDom.CodeAttributeArgument> array to a <xref:System.CodeDom.CodeAttributeArgumentCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -331,7 +331,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeAttributeArgumentCollection.AddRange%28System.CodeDom.CodeAttributeArgumentCollection%29> method overload to add the members of one <xref:System.CodeDom.CodeAttributeArgumentCollection> object to another <xref:System.CodeDom.CodeAttributeArgumentCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@
  The following example uses the <xref:System.CodeDom.CodeAttributeArgumentCollection.Contains%2A> method to search for the presence of a specific <xref:System.CodeDom.CodeAttributeArgument> object in a <xref:System.CodeDom.CodeAttributeArgumentCollection> and gets the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -432,7 +432,7 @@
  The following example demonstrates how to copy the contents of a <xref:System.CodeDom.CodeAttributeArgumentCollection> object to a <xref:System.CodeDom.CodeAttributeArgument> array beginning at a specified index value.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -487,7 +487,7 @@
  The following example searches for the presence of a specific <xref:System.CodeDom.CodeAttributeArgument> object and uses the <xref:System.CodeDom.CodeAttributeArgumentCollection.IndexOf%2A> method to get the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -537,7 +537,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeAttributeArgumentCollection.Insert%2A> method to add a <xref:System.CodeDom.CodeAttributeArgument> object to a <xref:System.CodeDom.CodeAttributeArgumentCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -630,7 +630,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeAttributeArgumentCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeAttributeArgument> object from a <xref:System.CodeDom.CodeAttributeArgumentCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeArgumentCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeArgumentCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeAttributeDeclarationCollection.xml b/xml/System.CodeDom/CodeAttributeDeclarationCollection.xml
index f2338f081b1..07973b47a64 100644
--- a/xml/System.CodeDom/CodeAttributeDeclarationCollection.xml
+++ b/xml/System.CodeDom/CodeAttributeDeclarationCollection.xml
@@ -59,7 +59,7 @@
  The following example demonstrates the use of the <xref:System.CodeDom.CodeAttributeDeclarationCollection> class methods.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -224,7 +224,7 @@
  The following example demonstrates how to add a <xref:System.CodeDom.CodeAttributeDeclaration> object to a <xref:System.CodeDom.CodeAttributeDeclarationCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The following example demonstrates how to use <xref:System.CodeDom.CodeAttributeDeclarationCollection.AddRange%28System.CodeDom.CodeAttributeDeclaration%5B%5D%29> method overload to add an array of <xref:System.CodeDom.CodeAttributeDeclaration> objects to a <xref:System.CodeDom.CodeAttributeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -331,7 +331,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeAttributeDeclarationCollection.AddRange%28System.CodeDom.CodeAttributeDeclarationCollection%29> method overload to add the members of one <xref:System.CodeDom.CodeAttributeDeclarationCollection> to another.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@
  The following example uses the <xref:System.CodeDom.CodeAttributeDeclarationCollection.Contains%2A> method to search for the presence of a specific <xref:System.CodeDom.CodeAttributeDeclaration> instance and gets the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@
  The following example demonstrates how to copy the contents of a <xref:System.CodeDom.CodeAttributeDeclarationCollection> to an array beginning at index 0.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -489,7 +489,7 @@
  The following example searches for the presence of a specific <xref:System.CodeDom.CodeAttributeDeclaration> instance and uses the <xref:System.CodeDom.CodeAttributeDeclarationCollection.IndexOf%2A> method to get the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -539,7 +539,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeAttributeDeclarationCollection.Insert%2A> method to add a <xref:System.CodeDom.CodeAttributeDeclaration> object to the <xref:System.CodeDom.CodeAttributeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -634,7 +634,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeAttributeDeclarationCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeAttributeDeclaration> object from the <xref:System.CodeDom.CodeAttributeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttributeDeclarationCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttributeDeclarationCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeBaseReferenceExpression.xml b/xml/System.CodeDom/CodeBaseReferenceExpression.xml
index a695440dbe0..ebfb796bc17 100644
--- a/xml/System.CodeDom/CodeBaseReferenceExpression.xml
+++ b/xml/System.CodeDom/CodeBaseReferenceExpression.xml
@@ -59,7 +59,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeBaseReferenceExpression> to reference a base class method.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeBaseReferenceExpression/Overview/codebasereferenceexpressionexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeBaseReferenceExpressionExample/VB/codebasereferenceexpressionexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeBaseReferenceExpression/Overview/codebasereferenceexpressionexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeBinaryOperatorExpression.xml b/xml/System.CodeDom/CodeBinaryOperatorExpression.xml
index 08ca56d66d2..79ef4cb0bea 100644
--- a/xml/System.CodeDom/CodeBinaryOperatorExpression.xml
+++ b/xml/System.CodeDom/CodeBinaryOperatorExpression.xml
@@ -59,7 +59,7 @@
  This example demonstrates use of a <xref:System.CodeDom.CodeBinaryOperatorExpression> to add two numbers together.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeBinaryOperatorExpression/Overview/codebinaryoperatorexpressionexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeBinaryOperatorExpression/VB/codebinaryoperatorexpressionexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeBinaryOperatorExpression/Overview/codebinaryoperatorexpressionexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeCastExpression.xml b/xml/System.CodeDom/CodeCastExpression.xml
index 3b3d1c52015..10db23234bf 100644
--- a/xml/System.CodeDom/CodeCastExpression.xml
+++ b/xml/System.CodeDom/CodeCastExpression.xml
@@ -61,7 +61,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeCastExpression> to cast a `System.Int32` value to a `System.Int64` data type.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCastExpression/Overview/codecastexpressionexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCastExpressionExample/VB/codecastexpressionexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCastExpression/Overview/codecastexpressionexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeCatchClause.xml b/xml/System.CodeDom/CodeCatchClause.xml
index 62c56bb4027..5bd502e7bef 100644
--- a/xml/System.CodeDom/CodeCatchClause.xml
+++ b/xml/System.CodeDom/CodeCatchClause.xml
@@ -61,7 +61,7 @@
  The following example code demonstrates using <xref:System.CodeDom.CodeCatchClause> objects to define exception handling clauses of a try...catch block.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClause/Overview/codetrycatchfinallyexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTryCatchFinallyExample/VB/codetrycatchfinallyexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClause/Overview/codetrycatchfinallyexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeCatchClauseCollection.xml b/xml/System.CodeDom/CodeCatchClauseCollection.xml
index e2b21018071..8ea900736c3 100644
--- a/xml/System.CodeDom/CodeCatchClauseCollection.xml
+++ b/xml/System.CodeDom/CodeCatchClauseCollection.xml
@@ -59,7 +59,7 @@
  The following example demonstrates the use of the  <xref:System.CodeDom.CodeCatchClauseCollection> class methods. The example creates a new instance of the class and uses the methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -224,7 +224,7 @@
  The following example demonstrates how to add a <xref:System.CodeDom.CodeCatchClause> object to the <xref:System.CodeDom.CodeCatchClauseCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeCatchClauseCollection.AddRange%28System.CodeDom.CodeCatchClause%5B%5D%29> method overload to add the members of an array of <xref:System.CodeDom.CodeCatchClause> objects to the <xref:System.CodeDom.CodeCatchClauseCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -331,7 +331,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeCatchClauseCollection.AddRange%28System.CodeDom.CodeCatchClauseCollection%29> method overload to add the members of one <xref:System.CodeDom.CodeCatchClauseCollection> object to another <xref:System.CodeDom.CodeCatchClauseCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@
  The following example uses the <xref:System.CodeDom.CodeCatchClauseCollection.Contains%2A> method to search for the presence of a specific <xref:System.CodeDom.CodeCatchClause> instance and gets the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@
  The following example demonstrates how to copy the contents of a <xref:System.CodeDom.CodeCatchClauseCollection> to a <xref:System.CodeDom.CodeCatchClause> array beginning at index value 0.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -489,7 +489,7 @@
  The following example searches for the presence of a specific <xref:System.CodeDom.CodeCatchClause> object and uses the <xref:System.CodeDom.CodeCatchClauseCollection.IndexOf%2A> method to get the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -539,7 +539,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeCatchClauseCollection.Insert%2A> method to add a <xref:System.CodeDom.CodeCatchClause> object to a <xref:System.CodeDom.CodeCatchClauseCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -634,7 +634,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeCatchClauseCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeCatchClause> object from a <xref:System.CodeDom.CodeCatchClauseCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClauseCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCatchClauseCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClauseCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeComment.xml b/xml/System.CodeDom/CodeComment.xml
index 6775978166d..9239fa31423 100644
--- a/xml/System.CodeDom/CodeComment.xml
+++ b/xml/System.CodeDom/CodeComment.xml
@@ -63,7 +63,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeComment> to represent a comment in source code.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeComment/Overview/codecommentexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentExample/VB/codecommentexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeComment/Overview/codecommentexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeCommentStatement.xml b/xml/System.CodeDom/CodeCommentStatement.xml
index 8979a02378f..9a31649a729 100644
--- a/xml/System.CodeDom/CodeCommentStatement.xml
+++ b/xml/System.CodeDom/CodeCommentStatement.xml
@@ -59,7 +59,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeCommentStatement> to represent a comment in source code.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeComment/Overview/codecommentexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentExample/VB/codecommentexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeComment/Overview/codecommentexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -231,12 +231,12 @@
  The following code example demonstrates the use of the <xref:System.CodeDom.CodeCommentStatement.%23ctor%28System.String%2CSystem.Boolean%29> constructor to create a comment statement to be used as an XML comment field. This example is part of a larger example that follows.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatement/.ctor/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomHelloWorldSample/vb/program.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatement/.ctor/program.vb" id="Snippet3":::
 
  The following code example demonstrates the creation of a simple "Hello World" console application and the generation of an XML documentation file for the compiled application.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatement/.ctor/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomHelloWorldSample/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatement/.ctor/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeCommentStatementCollection.xml b/xml/System.CodeDom/CodeCommentStatementCollection.xml
index 27d9f5fc321..d290657fb91 100644
--- a/xml/System.CodeDom/CodeCommentStatementCollection.xml
+++ b/xml/System.CodeDom/CodeCommentStatementCollection.xml
@@ -59,7 +59,7 @@
  The following example demonstrates the use of the <xref:System.CodeDom.CodeCommentStatementCollection> class methods. The example creates a new instance of the class and uses the methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -224,7 +224,7 @@
  The following example demonstrates how to add a <xref:System.CodeDom.CodeCommentStatement> object to a <xref:System.CodeDom.CodeCommentStatementCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeCommentStatementCollection.AddRange%28System.CodeDom.CodeCommentStatement%5B%5D%29> method overload to add the members of a <xref:System.CodeDom.CodeCommentStatement> array to the <xref:System.CodeDom.CodeCommentStatementCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -331,7 +331,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeCommentStatementCollection.AddRange%28System.CodeDom.CodeCommentStatementCollection%29> method overload to add the members of one <xref:System.CodeDom.CodeCommentStatementCollection> to another.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@
  The following example uses the <xref:System.CodeDom.CodeCommentStatementCollection.Contains%2A> method to search for the presence of a specific <xref:System.CodeDom.CodeCommentStatement> object and gets the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@
  The following example demonstrates how to copy the contents of a <xref:System.CodeDom.CodeCommentStatementCollection> to an array beginning at the index value 0.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -489,7 +489,7 @@
  The following example searches for the presence of a specific <xref:System.CodeDom.CodeCommentStatement> object and uses the <xref:System.CodeDom.CodeCommentStatementCollection.IndexOf%2A> method to get the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -539,7 +539,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeCommentStatementCollection.Insert%2A> method to add a <xref:System.CodeDom.CodeCommentStatement> object to the <xref:System.CodeDom.CodeCommentStatementCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -633,7 +633,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeCommentStatementCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeCommentStatement> object from the <xref:System.CodeDom.CodeCommentStatementCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCommentStatementCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeCommentStatementCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCommentStatementCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeCompileUnit.xml b/xml/System.CodeDom/CodeCompileUnit.xml
index 4d2b5bfc313..60f44540bd6 100644
--- a/xml/System.CodeDom/CodeCompileUnit.xml
+++ b/xml/System.CodeDom/CodeCompileUnit.xml
@@ -66,7 +66,7 @@
  The following code example constructs a <xref:System.CodeDom.CodeCompileUnit> that models the program structure of a simple "Hello World" program. This code example is part of a larger example that also produces code from this model, and is provided for the <xref:System.CodeDom.Compiler.CodeDomProvider> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCompileUnit/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCompileUnit/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -238,7 +238,7 @@
  The following code example constructs a <xref:System.CodeDom.CodeCompileUnit> that models the program structure of a simple "Hello World" program. This example is part of a larger example that also produces code from this model, and is provided for the <xref:System.CodeDom.Compiler.CodeDomProvider> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCompileUnit/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCompileUnit/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeConditionStatement.xml b/xml/System.CodeDom/CodeConditionStatement.xml
index c77c92a4d3a..0651a18223c 100644
--- a/xml/System.CodeDom/CodeConditionStatement.xml
+++ b/xml/System.CodeDom/CodeConditionStatement.xml
@@ -61,7 +61,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeConditionStatement> to represent an `if` statement with an `else` block.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeConditionStatement/Overview/codeconditionstatementexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeConditionStatementExample/VB/codeconditionstatementexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeConditionStatement/Overview/codeconditionstatementexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeConstructor.xml b/xml/System.CodeDom/CodeConstructor.xml
index 23fb99e1a94..08cc067b2af 100644
--- a/xml/System.CodeDom/CodeConstructor.xml
+++ b/xml/System.CodeDom/CodeConstructor.xml
@@ -61,7 +61,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeConstructor> to declare several types of constructors.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeConstructor/Overview/codeconstructorexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeConstructorExample/VB/codeconstructorexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeConstructor/Overview/codeconstructorexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeDelegateCreateExpression.xml b/xml/System.CodeDom/CodeDelegateCreateExpression.xml
index 182b0bcb402..04974c540c8 100644
--- a/xml/System.CodeDom/CodeDelegateCreateExpression.xml
+++ b/xml/System.CodeDom/CodeDelegateCreateExpression.xml
@@ -63,7 +63,7 @@
  The following example code uses a <xref:System.CodeDom.CodeDelegateCreateExpression> to create a delegate.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeAttachEventStatement/Overview/codeattacheventstatementexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeAttachEventStatementExample/VB/codeattacheventstatementexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeAttachEventStatement/Overview/codeattacheventstatementexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeDelegateInvokeExpression.xml b/xml/System.CodeDom/CodeDelegateInvokeExpression.xml
index 5d2a225a156..d8895b5fbdc 100644
--- a/xml/System.CodeDom/CodeDelegateInvokeExpression.xml
+++ b/xml/System.CodeDom/CodeDelegateInvokeExpression.xml
@@ -61,7 +61,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeDelegateInvokeExpression> to invoke an event named `TestEvent`.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDelegateInvokeExpression/Overview/codedelegateinvokeexpressionexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDelegateInvokeExpressionExample/VB/codedelegateinvokeexpressionexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDelegateInvokeExpression/Overview/codedelegateinvokeexpressionexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeDirectionExpression.xml b/xml/System.CodeDom/CodeDirectionExpression.xml
index 4bf0f2f1bc2..3838f2ec7c0 100644
--- a/xml/System.CodeDom/CodeDirectionExpression.xml
+++ b/xml/System.CodeDom/CodeDirectionExpression.xml
@@ -64,7 +64,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeDirectionExpression> to specify a field direction modifier for an expression to pass as a method parameter.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMultiExample/VB/codemultiexample.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.vb" id="Snippet4":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeDirectiveCollection.xml b/xml/System.CodeDom/CodeDirectiveCollection.xml
index b7461725a74..81b9388b0f9 100644
--- a/xml/System.CodeDom/CodeDirectiveCollection.xml
+++ b/xml/System.CodeDom/CodeDirectiveCollection.xml
@@ -58,7 +58,7 @@
  The following code example shows the use of the members of the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -113,7 +113,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.%23ctor> constructor to create a new instance of the class. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -230,7 +230,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.Add%2A> method to add a <xref:System.CodeDom.CodeDirective> object to the collection. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -286,7 +286,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.AddRange%28System.CodeDom.CodeDirective%5B%5D%29> method to add an array of <xref:System.CodeDom.CodeDirective> objects to the collection. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -335,7 +335,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.AddRange%28System.CodeDom.CodeDirectiveCollection%29> method to add the contents of a <xref:System.CodeDom.CodeDirectiveCollection> object to the collection. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -385,7 +385,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.Contains%2A> method to determine whether the collection contains a specific <xref:System.CodeDom.CodeDirective> object. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.CopyTo%2A> method to copy the contents of the collection beginning at index 0 to the specified <xref:System.CodeDom.CodeDirective> array. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -489,7 +489,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.IndexOf%2A> method to get the index in the collection of the specified <xref:System.CodeDom.CodeDirective> object. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -537,7 +537,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.Insert%2A> method to insert a <xref:System.CodeDom.CodeDirective> object at index 0 of the collection. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -635,7 +635,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeDirectiveCollection.Remove%2A> method to remove the specified <xref:System.CodeDom.CodeDirectiveCollection> object from the collection. This example is part of a larger example provided for the <xref:System.CodeDom.CodeDirectiveCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectiveCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDirectiveCollectionExample/VB/class1.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectiveCollection/Overview/class1.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeEntryPointMethod.xml b/xml/System.CodeDom/CodeEntryPointMethod.xml
index ddc72a6f5ed..32869babb17 100644
--- a/xml/System.CodeDom/CodeEntryPointMethod.xml
+++ b/xml/System.CodeDom/CodeEntryPointMethod.xml
@@ -59,7 +59,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeEntryPointMethod> to indicate the method to start program execution at.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeEntryPointMethod/Overview/codeentrypointmethodexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeEntryPointMethod/VB/codeentrypointmethodexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeEntryPointMethod/Overview/codeentrypointmethodexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeEventReferenceExpression.xml b/xml/System.CodeDom/CodeEventReferenceExpression.xml
index d5707d7c1a0..50dc4cf646c 100644
--- a/xml/System.CodeDom/CodeEventReferenceExpression.xml
+++ b/xml/System.CodeDom/CodeEventReferenceExpression.xml
@@ -61,7 +61,7 @@
  The following example demonstrates use of <xref:System.CodeDom.CodeEventReferenceExpression> to reference an event named TestEvent.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMultiExample/VB/codemultiexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeExpressionCollection.xml b/xml/System.CodeDom/CodeExpressionCollection.xml
index dbf965554b8..01cedcfc54f 100644
--- a/xml/System.CodeDom/CodeExpressionCollection.xml
+++ b/xml/System.CodeDom/CodeExpressionCollection.xml
@@ -61,7 +61,7 @@
  The following example demonstrates the use of  the <xref:System.CodeDom.CodeExpressionCollection> class methods. The example creates a new instance of the class and uses the methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
   
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -226,7 +226,7 @@
  The following example demonstrates how to add a <xref:System.CodeDom.CodeExpression> object to a <xref:System.CodeDom.CodeExpressionCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -283,7 +283,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeExpressionCollection.AddRange%28System.CodeDom.CodeExpression%5B%5D%29> method overload to add the members of a <xref:System.CodeDom.CodeExpression> array to a <xref:System.CodeDom.CodeExpressionCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -333,7 +333,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeExpressionCollection.AddRange%28System.CodeDom.CodeExpressionCollection%29> method overload to add the members of one <xref:System.CodeDom.CodeExpressionCollection> object to another <xref:System.CodeDom.CodeExpressionCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -385,7 +385,7 @@
  The following example uses the <xref:System.CodeDom.CodeExpressionCollection.Contains%2A> method to search for the presence of a specific <xref:System.CodeDom.CodeExpression> object and gets the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -435,7 +435,7 @@
  The following example demonstrates how to copy the contents of a <xref:System.CodeDom.CodeExpressionCollection> to a <xref:System.CodeDom.CodeExpression> array beginning at the index value 0.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -491,7 +491,7 @@
  The following example searches for the presence of a specific <xref:System.CodeDom.CodeExpression> object and uses the <xref:System.CodeDom.CodeExpressionCollection.IndexOf%2A> method to get the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -541,7 +541,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeExpressionCollection.Insert%2A> method to add a <xref:System.CodeDom.CodeExpression> object to a <xref:System.CodeDom.CodeExpressionCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -635,7 +635,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeExpressionCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeExpression> object from a <xref:System.CodeDom.CodeExpressionCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeExpressionCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeExpressionStatement.xml b/xml/System.CodeDom/CodeExpressionStatement.xml
index 5be1fbc2c38..8d90e132bec 100644
--- a/xml/System.CodeDom/CodeExpressionStatement.xml
+++ b/xml/System.CodeDom/CodeExpressionStatement.xml
@@ -59,7 +59,7 @@
  The following example demonstrates how to create an instance of the <xref:System.CodeDom.CodeExpressionStatement> class by using a <xref:System.CodeDom.CodeExpression> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -154,7 +154,7 @@
  The following example creates a <xref:System.CodeDom.CodeExpression> object and uses it as a parameter to initialize an instance of the <xref:System.CodeDom.CodeExpressionStatement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeFieldReferenceExpression.xml b/xml/System.CodeDom/CodeFieldReferenceExpression.xml
index becd587bee1..cbe36fd07bb 100644
--- a/xml/System.CodeDom/CodeFieldReferenceExpression.xml
+++ b/xml/System.CodeDom/CodeFieldReferenceExpression.xml
@@ -61,7 +61,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeFieldReferenceExpression> to reference a field.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeFieldReferenceExpression/Overview/codereferenceexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeReferenceExample/VB/codereferenceexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeFieldReferenceExpression/Overview/codereferenceexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeGotoStatement.xml b/xml/System.CodeDom/CodeGotoStatement.xml
index b65f0329cf1..025b671f6c8 100644
--- a/xml/System.CodeDom/CodeGotoStatement.xml
+++ b/xml/System.CodeDom/CodeGotoStatement.xml
@@ -64,7 +64,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeGotoStatement> and a <xref:System.CodeDom.CodeLabeledStatement> to redirect program flow.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeGotoStatement/Overview/codegotostatementexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeGotoStatementExample/VB/codegotostatementexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeGotoStatement/Overview/codegotostatementexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeIndexerExpression.xml b/xml/System.CodeDom/CodeIndexerExpression.xml
index cb03e27fe0d..c6e5e4a9f38 100644
--- a/xml/System.CodeDom/CodeIndexerExpression.xml
+++ b/xml/System.CodeDom/CodeIndexerExpression.xml
@@ -59,7 +59,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeIndexerExpression> to reference a type indexer for the current object.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMultiExample/VB/codemultiexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeIterationStatement.xml b/xml/System.CodeDom/CodeIterationStatement.xml
index 6b1b2786207..b6722772f33 100644
--- a/xml/System.CodeDom/CodeIterationStatement.xml
+++ b/xml/System.CodeDom/CodeIterationStatement.xml
@@ -61,7 +61,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeIterationStatement> to represent a `for` loop.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeIterationStatement/Overview/codeiterationstatementexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeIterationStatementExample/VB/codeiterationstatementexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeIterationStatement/Overview/codeiterationstatementexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeLabeledStatement.xml b/xml/System.CodeDom/CodeLabeledStatement.xml
index ea932e5c0d4..30c2673f693 100644
--- a/xml/System.CodeDom/CodeLabeledStatement.xml
+++ b/xml/System.CodeDom/CodeLabeledStatement.xml
@@ -64,7 +64,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeGotoStatement> and a <xref:System.CodeDom.CodeLabeledStatement> to redirect program flow.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeGotoStatement/Overview/codegotostatementexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeGotoStatementExample/VB/codegotostatementexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeGotoStatement/Overview/codegotostatementexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeLinePragma.xml b/xml/System.CodeDom/CodeLinePragma.xml
index 176097e2a1e..57d4600d198 100644
--- a/xml/System.CodeDom/CodeLinePragma.xml
+++ b/xml/System.CodeDom/CodeLinePragma.xml
@@ -59,7 +59,7 @@
  The following code example demonstrates the use of the <xref:System.CodeDom.CodeLinePragma> class to reference a specific line of a source file.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -156,7 +156,7 @@
  The following code example demonstrates the use of the <xref:System.CodeDom.CodeLinePragma> class to reference a specific line of a source file.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeMemberEvent.xml b/xml/System.CodeDom/CodeMemberEvent.xml
index 75bb64e060a..f8276682801 100644
--- a/xml/System.CodeDom/CodeMemberEvent.xml
+++ b/xml/System.CodeDom/CodeMemberEvent.xml
@@ -59,7 +59,7 @@
  This example demonstrates use of a <xref:System.CodeDom.CodeMemberEvent> to declare an event that takes a `System.EventHandler` delegate:
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMemberEvent/Overview/codemembereventexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMemberEventSample/VB/codemembereventexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMemberEvent/Overview/codemembereventexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeMemberField.xml b/xml/System.CodeDom/CodeMemberField.xml
index 637e6026546..dc2020678ef 100644
--- a/xml/System.CodeDom/CodeMemberField.xml
+++ b/xml/System.CodeDom/CodeMemberField.xml
@@ -59,10 +59,10 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeMemberField> to declare a field of type `string` named `testStringField`.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMemberField/Overview/codememberfieldexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldExample/VB/codememberfieldexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMemberField/Overview/codememberfieldexample.vb" id="Snippet2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMemberField/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldPublicConstExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMemberField/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -281,7 +281,7 @@
  The following example demonstrates the use of the <xref:System.CodeDom.CodeMemberField.InitExpression%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMemberField/InitExpression/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMemberFieldInit/VB/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMemberField/InitExpression/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeMemberMethod.xml b/xml/System.CodeDom/CodeMemberMethod.xml
index 2e2c55e6abe..2e5328b3999 100644
--- a/xml/System.CodeDom/CodeMemberMethod.xml
+++ b/xml/System.CodeDom/CodeMemberMethod.xml
@@ -61,7 +61,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeMemberMethod> to declare a method that accepts a parameter and returns a value.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMemberMethod/Overview/codemembermethodexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMemberMethodExample/VB/codemembermethodexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMemberMethod/Overview/codemembermethodexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -106,7 +106,7 @@
  The following code example shows the use of the <xref:System.CodeDom.CodeMemberMethod.%23ctor%2A> constructor to create a <xref:System.CodeDom.CodeMemberMethod> instance. This example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CodeGenerator.GenerateCodeFromMember%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_GenerateCodeFromMember/vb/module1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/module1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeMemberProperty.xml b/xml/System.CodeDom/CodeMemberProperty.xml
index 83f30deff16..25b45fcbab0 100644
--- a/xml/System.CodeDom/CodeMemberProperty.xml
+++ b/xml/System.CodeDom/CodeMemberProperty.xml
@@ -61,7 +61,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeMemberProperty> to define a `string` property with `get` and `set` accessors.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMemberProperty/Overview/codememberpropertyexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMemberPropertyExample/VB/codememberpropertyexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMemberProperty/Overview/codememberpropertyexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeMethodInvokeExpression.xml b/xml/System.CodeDom/CodeMethodInvokeExpression.xml
index be54d09ddfc..5a5239f9b6b 100644
--- a/xml/System.CodeDom/CodeMethodInvokeExpression.xml
+++ b/xml/System.CodeDom/CodeMethodInvokeExpression.xml
@@ -61,7 +61,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeMethodInvokeExpression> to invoke a method.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMethodInvokeExpression/Overview/codemethodinvokeexpressionexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMethodInvokeExpression/VB/codemethodinvokeexpressionexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMethodInvokeExpression/Overview/codemethodinvokeexpressionexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeMethodReferenceExpression.xml b/xml/System.CodeDom/CodeMethodReferenceExpression.xml
index 58c1c6367e8..fbc2f1b8eff 100644
--- a/xml/System.CodeDom/CodeMethodReferenceExpression.xml
+++ b/xml/System.CodeDom/CodeMethodReferenceExpression.xml
@@ -63,7 +63,7 @@
  The following code example uses a <xref:System.CodeDom.CodeMethodReferenceExpression> to refer to a method:
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMethodReferenceExpression/Overview/codemethodreferenceexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMethodReferenceExample/VB/codemethodreferenceexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMethodReferenceExpression/Overview/codemethodreferenceexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeMethodReturnStatement.xml b/xml/System.CodeDom/CodeMethodReturnStatement.xml
index 2d0c3277fb1..1cd5eb64426 100644
--- a/xml/System.CodeDom/CodeMethodReturnStatement.xml
+++ b/xml/System.CodeDom/CodeMethodReturnStatement.xml
@@ -59,7 +59,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeMethodReturnStatement> to return a value from a method.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMemberMethod/Overview/codemembermethodexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMemberMethodExample/VB/codemembermethodexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMemberMethod/Overview/codemembermethodexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeNamespace.xml b/xml/System.CodeDom/CodeNamespace.xml
index 5c814703289..9c41c165648 100644
--- a/xml/System.CodeDom/CodeNamespace.xml
+++ b/xml/System.CodeDom/CodeNamespace.xml
@@ -66,7 +66,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeNamespace> to declare a namespace.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespace/Overview/codenamespaceexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceExample/VB/codenamespaceexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespace/Overview/codenamespaceexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeNamespaceCollection.xml b/xml/System.CodeDom/CodeNamespaceCollection.xml
index 207d1c2033e..10afc9d4b0d 100644
--- a/xml/System.CodeDom/CodeNamespaceCollection.xml
+++ b/xml/System.CodeDom/CodeNamespaceCollection.xml
@@ -59,7 +59,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeNamespaceCollection> class. The example creates a new instance of the class and uses several methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -115,7 +115,7 @@
  The following example demonstrates how to create an empty instance of the <xref:System.CodeDom.CodeNamespaceCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeNamespaceCollection.Add%2A> method to add a <xref:System.CodeDom.CodeNamespace> object to a <xref:System.CodeDom.CodeNamespaceCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -291,7 +291,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeNamespaceCollection.AddRange%28System.CodeDom.CodeNamespaceCollection%29> method overload to add members of a <xref:System.CodeDom.CodeNamespace> array to the <xref:System.CodeDom.CodeNamespaceCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -341,7 +341,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeNamespaceCollection.AddRange%28System.CodeDom.CodeNamespaceCollection%29> method overload to add <xref:System.CodeDom.CodeNamespace> objects from one <xref:System.CodeDom.CodeNamespaceCollection> to another <xref:System.CodeDom.CodeNamespaceCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -393,7 +393,7 @@
  The following example uses the <xref:System.CodeDom.CodeNamespaceCollection.Contains%2A> method to find a <xref:System.CodeDom.CodeNamespace> object in a <xref:System.CodeDom.CodeNamespaceCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -443,7 +443,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeNamespaceCollection.CopyTo%2A> method to copy the contents of a <xref:System.CodeDom.CodeNamespaceCollection> object to an array, starting at the specified index value.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -499,7 +499,7 @@
  The following example searches for the presence of a specific <xref:System.CodeDom.CodeNamespace> and uses the <xref:System.CodeDom.CodeNamespaceCollection.IndexOf%2A> method to retrieve the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -549,7 +549,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeNamespaceCollection.Insert%2A> method to insert a <xref:System.CodeDom.CodeNamespace> object into a <xref:System.CodeDom.CodeNamespaceCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -644,7 +644,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeNamespaceCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeNamespace> object from a <xref:System.CodeDom.CodeNamespaceCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeNamespaceImport.xml b/xml/System.CodeDom/CodeNamespaceImport.xml
index 06fec7f8316..e3f159f329c 100644
--- a/xml/System.CodeDom/CodeNamespaceImport.xml
+++ b/xml/System.CodeDom/CodeNamespaceImport.xml
@@ -64,7 +64,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeNamespaceImport> to import the <xref:System.CodeDom.CodeNamespaceImport> namespace:
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeNamespaceImport/Overview/codenamespaceimportexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeNamespaceImportExample/VB/codenamespaceimportexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeNamespaceImport/Overview/codenamespaceimportexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeNamespaceImportCollection.xml b/xml/System.CodeDom/CodeNamespaceImportCollection.xml
index e69ae3532f4..04ca46e36b8 100644
--- a/xml/System.CodeDom/CodeNamespaceImportCollection.xml
+++ b/xml/System.CodeDom/CodeNamespaceImportCollection.xml
@@ -70,7 +70,7 @@
  The following example demonstrates some of the members of the <xref:System.CodeDom.CodeNamespaceImportCollection> class. The example initializes a new instance of the class, adds <xref:System.CodeDom.CodeNamespaceImport> objects to it, and gets the total number of objects in the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
@@ -148,7 +148,7 @@
  The following example demonstrates how to add a <xref:System.CodeDom.CodeNamespaceImport> object to a <xref:System.CodeDom.CodeNamespaceImportCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -196,7 +196,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeNamespaceImportCollection.AddRange%2A> method to add the members of a <xref:System.CodeDom.CodeNamespaceImport> array to a <xref:System.CodeDom.CodeNamespaceImportCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -280,7 +280,7 @@
  The following code gets the count of items in a <xref:System.CodeDom.CodeNamespaceImportCollection> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeObjectCreateExpression.xml b/xml/System.CodeDom/CodeObjectCreateExpression.xml
index 1339f441e7d..f847bfadb12 100644
--- a/xml/System.CodeDom/CodeObjectCreateExpression.xml
+++ b/xml/System.CodeDom/CodeObjectCreateExpression.xml
@@ -61,7 +61,7 @@
  The following example demonstrates use of <xref:System.CodeDom.CodeObjectCreateExpression> to create a new instance of the System.DateTime class using the parameterless constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMultiExample/VB/codemultiexample.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeDirectionExpression/Overview/codemultiexample.vb" id="Snippet5":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeParameterDeclarationExpression.xml b/xml/System.CodeDom/CodeParameterDeclarationExpression.xml
index 42c2cefdaa1..57a8fa87299 100644
--- a/xml/System.CodeDom/CodeParameterDeclarationExpression.xml
+++ b/xml/System.CodeDom/CodeParameterDeclarationExpression.xml
@@ -61,7 +61,7 @@
  The following example demonstrates use of <xref:System.CodeDom.CodeParameterDeclarationExpression> to declare parameters of a method using different <xref:System.CodeDom.FieldDirection> field reference type specifiers.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpression/Overview/codeparameterdeclarationexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExample/VB/codeparameterdeclarationexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpression/Overview/codeparameterdeclarationexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeParameterDeclarationExpressionCollection.xml b/xml/System.CodeDom/CodeParameterDeclarationExpressionCollection.xml
index ccfcbcd10d2..735c09200ad 100644
--- a/xml/System.CodeDom/CodeParameterDeclarationExpressionCollection.xml
+++ b/xml/System.CodeDom/CodeParameterDeclarationExpressionCollection.xml
@@ -59,7 +59,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection> class methods. The example creates a new instance of the class and uses the methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -224,7 +224,7 @@
  The following example demonstrates how to add a <xref:System.CodeDom.CodeParameterDeclarationExpression> object to a <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection.AddRange%28System.CodeDom.CodeParameterDeclarationExpression%5B%5D%29> method overload to add the members of a <xref:System.CodeDom.CodeParameterDeclarationExpression> array to a <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -331,7 +331,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection.AddRange%28System.CodeDom.CodeParameterDeclarationExpressionCollection%29> method overload to add the members of one <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection> object to another  <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@
  The following example uses the <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection.Contains%2A> method to search for the presence of a specific <xref:System.CodeDom.CodeParameterDeclarationExpression> object and get the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@
  The following example demonstrates how to copy the contents of a <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection> to an <xref:System.Array> beginning at the specified index value.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -489,7 +489,7 @@
  The following example searches for the presence of a specific <xref:System.CodeDom.CodeParameterDeclarationExpression> instance and uses the <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection.IndexOf%2A> method to get the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -539,7 +539,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection.Insert%2A> method to add a <xref:System.CodeDom.CodeParameterDeclarationExpression> object to a <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -633,7 +633,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeParameterDeclarationExpression> object from a <xref:System.CodeDom.CodeParameterDeclarationExpressionCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExpressionCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpressionCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodePrimitiveExpression.xml b/xml/System.CodeDom/CodePrimitiveExpression.xml
index ca35d28663d..a6184149091 100644
--- a/xml/System.CodeDom/CodePrimitiveExpression.xml
+++ b/xml/System.CodeDom/CodePrimitiveExpression.xml
@@ -63,7 +63,7 @@
  The following example demonstrates use of <xref:System.CodeDom.CodePrimitiveExpression> to represent values of several primitive types.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodePrimitiveExpression/Overview/codeprimitiveexpressionexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodePrimitiveExpressionExample/VB/codeprimitiveexpressionexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodePrimitiveExpression/Overview/codeprimitiveexpressionexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodePropertyReferenceExpression.xml b/xml/System.CodeDom/CodePropertyReferenceExpression.xml
index 866fcc5ce36..d7971c7856d 100644
--- a/xml/System.CodeDom/CodePropertyReferenceExpression.xml
+++ b/xml/System.CodeDom/CodePropertyReferenceExpression.xml
@@ -63,7 +63,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodePropertyReferenceExpression> to refer to a property.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeFieldReferenceExpression/Overview/codereferenceexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeReferenceExample/VB/codereferenceexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeFieldReferenceExpression/Overview/codereferenceexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodePropertySetValueReferenceExpression.xml b/xml/System.CodeDom/CodePropertySetValueReferenceExpression.xml
index 1b5e4be84a6..ded66d58276 100644
--- a/xml/System.CodeDom/CodePropertySetValueReferenceExpression.xml
+++ b/xml/System.CodeDom/CodePropertySetValueReferenceExpression.xml
@@ -61,7 +61,7 @@
  This example demonstrates use of a <xref:System.CodeDom.CodePropertySetValueReferenceExpression> to represent the value argument passed to a property set value statement block.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodePropertySetValueReferenceExpression/Overview/codepropertysetvalueexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodePropertySetValueExample/VB/codepropertysetvalueexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodePropertySetValueReferenceExpression/Overview/codepropertysetvalueexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeRemoveEventStatement.xml b/xml/System.CodeDom/CodeRemoveEventStatement.xml
index 29259cff38b..f81da8e6959 100644
--- a/xml/System.CodeDom/CodeRemoveEventStatement.xml
+++ b/xml/System.CodeDom/CodeRemoveEventStatement.xml
@@ -61,7 +61,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeRemoveEventStatement> to remove a delegate from an event.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeRemoveEventStatement/Overview/coderemoveeventexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeRemoveEventExample/VB/coderemoveeventexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeRemoveEventStatement/Overview/coderemoveeventexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeSnippetCompileUnit.xml b/xml/System.CodeDom/CodeSnippetCompileUnit.xml
index 51b339f6032..8f08fe6379f 100644
--- a/xml/System.CodeDom/CodeSnippetCompileUnit.xml
+++ b/xml/System.CodeDom/CodeSnippetCompileUnit.xml
@@ -63,7 +63,7 @@
  The following code example demonstrates how to create a new instance of the <xref:System.CodeDom.CodeSnippetCompileUnit> class by using a string that represents literal code.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
     </remarks>
@@ -158,7 +158,7 @@
  The following code example demonstrates how to create a new instance of the <xref:System.CodeDom.CodeSnippetCompileUnit> class by using a string that represents literal code.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeSnippetExpression.xml b/xml/System.CodeDom/CodeSnippetExpression.xml
index 66ced65721a..1ff1c682283 100644
--- a/xml/System.CodeDom/CodeSnippetExpression.xml
+++ b/xml/System.CodeDom/CodeSnippetExpression.xml
@@ -61,7 +61,7 @@
  The following code example demonstrates how to create an instance of the <xref:System.CodeDom.CodeSnippetExpression> class using a literal code fragment.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
     </remarks>
@@ -150,7 +150,7 @@
  The following code example demonstrates in the use of the <xref:System.CodeDom.CodeSnippetExpression.%23ctor%2A> constructor to create an instance of the <xref:System.CodeDom.CodeSnippetExpression> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeExpressionStatement/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomSampleBatch/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeExpressionStatement/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeSnippetTypeMember.xml b/xml/System.CodeDom/CodeSnippetTypeMember.xml
index 6bb4b0b1ae1..581b920e8dd 100644
--- a/xml/System.CodeDom/CodeSnippetTypeMember.xml
+++ b/xml/System.CodeDom/CodeSnippetTypeMember.xml
@@ -63,7 +63,7 @@
  The following example demonstrates the use of the <xref:System.CodeDom.CodeSnippetTypeMember> class to store literal code in a string format. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CodeDomProvider.GenerateCodeFromMember%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_GenerateCodeFromMember/vb/module1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/module1.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
@@ -152,7 +152,7 @@
  The following example demonstrates the use of the <xref:System.CodeDom.CodeSnippetTypeMember.%23ctor%2A> constructor to create an instance of the <xref:System.CodeDom.CodeSnippetTypeMember> class. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CodeDomProvider.GenerateCodeFromMember%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDom_GenerateCodeFromMember/vb/module1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.CSharp/CSharpCodeProvider/GenerateCodeFromMember/module1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeStatementCollection.xml b/xml/System.CodeDom/CodeStatementCollection.xml
index 4ea13916d0f..2f301a1a057 100644
--- a/xml/System.CodeDom/CodeStatementCollection.xml
+++ b/xml/System.CodeDom/CodeStatementCollection.xml
@@ -59,7 +59,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeStatementCollection> class. The example creates a new instance of the class and uses several methods to add statements to the collection, return their index, and add or remove statements at a specific index point.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -115,7 +115,7 @@
  The following example shows how to create an empty instance of the <xref:System.CodeDom.CodeStatementCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -283,7 +283,7 @@
  The following example demonstrates how to add a <xref:System.CodeDom.CodeStatement> object to a <xref:System.CodeDom.CodeStatementCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeStatementCollection.AddRange%28System.CodeDom.CodeStatement%5B%5D%29> method overload to add the members of an array to a <xref:System.CodeDom.CodeStatementCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -390,7 +390,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeStatementCollection.AddRange%28System.CodeDom.CodeStatementCollection%29> method overload to add the members of one <xref:System.CodeDom.CodeStatementCollection> to another.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -442,7 +442,7 @@
  The following example uses the <xref:System.CodeDom.CodeStatementCollection.Contains%2A> method to search for the presence of a specific <xref:System.CodeDom.CodeStatement> and retrieve the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -492,7 +492,7 @@
  The following example demonstrates how to copy the contents of a <xref:System.CodeDom.CodeStatementCollection> object to an array, starting at the specified index value.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -548,7 +548,7 @@
  The following example searches for the presence of a specific <xref:System.CodeDom.CodeStatement> and uses the <xref:System.CodeDom.CodeStatementCollection.IndexOf%2A> method to retrieve the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -598,7 +598,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeStatementCollection.Insert%2A> method to add a <xref:System.CodeDom.CodeStatement> object to a <xref:System.CodeDom.CodeStatementCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -692,7 +692,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeStatementCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeStatement> object from a <xref:System.CodeDom.CodeStatementCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeStatementCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeStatementCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeStatementCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeThisReferenceExpression.xml b/xml/System.CodeDom/CodeThisReferenceExpression.xml
index d9b59688082..e1e02fa29e6 100644
--- a/xml/System.CodeDom/CodeThisReferenceExpression.xml
+++ b/xml/System.CodeDom/CodeThisReferenceExpression.xml
@@ -59,7 +59,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeThisReferenceExpression> to refer to the current object.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMethodReferenceExpression/Overview/codemethodreferenceexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMethodReferenceExample/VB/codemethodreferenceexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMethodReferenceExpression/Overview/codemethodreferenceexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeThrowExceptionStatement.xml b/xml/System.CodeDom/CodeThrowExceptionStatement.xml
index cd79e0dfdeb..33d19f2b5aa 100644
--- a/xml/System.CodeDom/CodeThrowExceptionStatement.xml
+++ b/xml/System.CodeDom/CodeThrowExceptionStatement.xml
@@ -61,7 +61,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeThrowExceptionStatement> to throw a new `System.Exception`.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeThrowExceptionStatement/Overview/codethrowexceptionstatementexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeThrowExceptionStatement/VB/codethrowexceptionstatementexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeThrowExceptionStatement/Overview/codethrowexceptionstatementexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeTryCatchFinallyStatement.xml b/xml/System.CodeDom/CodeTryCatchFinallyStatement.xml
index 4fac30f5d39..df8b643c8ce 100644
--- a/xml/System.CodeDom/CodeTryCatchFinallyStatement.xml
+++ b/xml/System.CodeDom/CodeTryCatchFinallyStatement.xml
@@ -64,7 +64,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeTryCatchFinallyStatement> to define a `try...catch...finally` statement for exception handling.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeCatchClause/Overview/codetrycatchfinallyexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTryCatchFinallyExample/VB/codetrycatchfinallyexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeCatchClause/Overview/codetrycatchfinallyexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeTypeConstructor.xml b/xml/System.CodeDom/CodeTypeConstructor.xml
index b4e44a80d36..4d6c23e4d5d 100644
--- a/xml/System.CodeDom/CodeTypeConstructor.xml
+++ b/xml/System.CodeDom/CodeTypeConstructor.xml
@@ -62,7 +62,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeTypeConstructor> to declare a static constructor for a type.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeConstructor/Overview/codetypeconstructorexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeConstructorExample/VB/codetypeconstructorexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeConstructor/Overview/codetypeconstructorexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeTypeDeclaration.xml b/xml/System.CodeDom/CodeTypeDeclaration.xml
index d8295ba7741..a10ab6c5a67 100644
--- a/xml/System.CodeDom/CodeTypeDeclaration.xml
+++ b/xml/System.CodeDom/CodeTypeDeclaration.xml
@@ -66,7 +66,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeTypeDeclaration> to declare a type.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclaration/Overview/codetypedeclarationexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationExample/VB/codetypedeclarationexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclaration/Overview/codetypedeclarationexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -398,12 +398,12 @@ Implements Interface1
  This example demonstrates using a <xref:System.CodeDom.CodeTypeDeclaration> to supply a class implementation across multiple declarations. The example builds the initial class declaration statement and sets the <xref:System.CodeDom.CodeTypeDeclaration.IsPartial%2A> property to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclaration/IsPartial/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomPartialTypeExample/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclaration/IsPartial/source.vb" id="Snippet3":::
 
  A different method in the example extends the class implementation. This method builds a new type declaration statement for the existing class and sets the <xref:System.CodeDom.CodeTypeDeclaration.IsPartial%2A> property to `true`. The compiler combines the two partial type declarations together for the complete class implementation.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclaration/IsPartial/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeDomPartialTypeExample/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclaration/IsPartial/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeTypeDeclarationCollection.xml b/xml/System.CodeDom/CodeTypeDeclarationCollection.xml
index a9161649134..0da5c5a14bd 100644
--- a/xml/System.CodeDom/CodeTypeDeclarationCollection.xml
+++ b/xml/System.CodeDom/CodeTypeDeclarationCollection.xml
@@ -59,7 +59,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeTypeDeclarationCollection> class. The example creates a new instance of the class and uses several methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -115,7 +115,7 @@
  The following example shows how to create an empty instance of the <xref:System.CodeDom.CodeTypeDeclarationCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -231,7 +231,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeTypeDeclarationCollection.Add%2A> method to add a <xref:System.CodeDom.CodeTypeDeclaration> object to a <xref:System.CodeDom.CodeTypeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -288,7 +288,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeTypeDeclarationCollection.AddRange%28System.CodeDom.CodeTypeDeclaration%5B%5D%29> method overload to add an array of <xref:System.CodeDom.CodeTypeDeclaration> objects to a <xref:System.CodeDom.CodeTypeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -338,7 +338,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeTypeDeclarationCollection.AddRange%28System.CodeDom.CodeTypeDeclarationCollection%29> method overload to add <xref:System.CodeDom.CodeTypeDeclaration> objects from one <xref:System.CodeDom.CodeTypeDeclarationCollection> to another <xref:System.CodeDom.CodeTypeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -390,7 +390,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeTypeDeclarationCollection.Contains%2A> method to find a <xref:System.CodeDom.CodeTypeDeclaration> object in a <xref:System.CodeDom.CodeTypeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -440,7 +440,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeTypeDeclarationCollection.CopyTo%2A> method to copy the contents of a <xref:System.CodeDom.CodeTypeDeclarationCollection> object to an array, starting at the specified index value.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -496,7 +496,7 @@
  The following example retrieves <xref:System.CodeDom.CodeTypeDeclaration> entries from a <xref:System.CodeDom.CodeTypeDeclarationCollection> object and displays their names and indexes returned by the <xref:System.CodeDom.CodeTypeDeclarationCollection.IndexOf%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -546,7 +546,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeTypeDeclarationCollection.Insert%2A> method to insert a <xref:System.CodeDom.CodeTypeDeclaration> object into a <xref:System.CodeDom.CodeTypeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -640,7 +640,7 @@
  The following example demonstrates how to use the <xref:System.CodeDom.CodeTypeDeclarationCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeTypeDeclaration> object from a <xref:System.CodeDom.CodeTypeDeclarationCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDeclarationCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDeclarationCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeTypeDelegate.xml b/xml/System.CodeDom/CodeTypeDelegate.xml
index 1e9fee72fe2..aaa25132d2f 100644
--- a/xml/System.CodeDom/CodeTypeDelegate.xml
+++ b/xml/System.CodeDom/CodeTypeDelegate.xml
@@ -66,7 +66,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeTypeDelegate> to declare a new delegate type.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeDelegate/Overview/codetypedelegateexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeDelegateExample/VB/codetypedelegateexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeDelegate/Overview/codetypedelegateexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeTypeMemberCollection.xml b/xml/System.CodeDom/CodeTypeMemberCollection.xml
index e901c9aae6f..755fd055997 100644
--- a/xml/System.CodeDom/CodeTypeMemberCollection.xml
+++ b/xml/System.CodeDom/CodeTypeMemberCollection.xml
@@ -59,7 +59,7 @@
  The following code example demonstrates the use of the <xref:System.CodeDom.CodeTypeMemberCollection> class. The example creates a new instance of the class and uses several methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -115,7 +115,7 @@
  The following code example demonstrates how to create an empty instance of the <xref:System.CodeDom.CodeTypeMemberCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -231,7 +231,7 @@
  The following code example demonstrates how to add a <xref:System.CodeDom.CodeTypeMember> object to a <xref:System.CodeDom.CodeTypeMemberCollection> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -288,7 +288,7 @@
  The following example demonstrates how to use the two <xref:System.CodeDom.CodeTypeMemberCollection.AddRange%2A> method overloads to add the members of an array to a <xref:System.CodeDom.CodeTypeMemberCollection> object, and to add the members of one <xref:System.CodeDom.CodeTypeMemberCollection> to another.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -338,7 +338,7 @@
  The following code example demonstrates how to use the two <xref:System.CodeDom.CodeTypeMemberCollection.AddRange%2A> method overloads to add the members of an array to a <xref:System.CodeDom.CodeTypeMemberCollection> object, and to add the members of one <xref:System.CodeDom.CodeTypeMemberCollection> to another.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -390,7 +390,7 @@
  The following code example uses the <xref:System.CodeDom.CodeTypeMemberCollection.Contains%2A> method to search for the presence of a specific <xref:System.CodeDom.CodeTypeMember> object and retrieve the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -440,7 +440,7 @@
  The following code example demonstrates how to copy the contents of a <xref:System.CodeDom.CodeTypeMemberCollection> to an array, beginning at the specified index value.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -496,7 +496,7 @@
  The following code example searches for the presence of a specific <xref:System.CodeDom.CodeTypeMember> object and uses the <xref:System.CodeDom.CodeTypeMemberCollection.IndexOf%2A> method to retrieve the index value at which it was found.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -546,7 +546,7 @@
  The following code example demonstrates how to use the <xref:System.CodeDom.CodeTypeMemberCollection.Insert%2A> method to add a <xref:System.CodeDom.CodeTypeMember> object to a <xref:System.CodeDom.CodeTypeMemberCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -640,7 +640,7 @@
  The following code example demonstrates how to use the <xref:System.CodeDom.CodeTypeMemberCollection.Remove%2A> method to delete a <xref:System.CodeDom.CodeTypeMember> object from a <xref:System.CodeDom.CodeTypeMemberCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeMemberCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeMemberCollectionExample/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeMemberCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeTypeOfExpression.xml b/xml/System.CodeDom/CodeTypeOfExpression.xml
index 58901f0383b..6c895ec9478 100644
--- a/xml/System.CodeDom/CodeTypeOfExpression.xml
+++ b/xml/System.CodeDom/CodeTypeOfExpression.xml
@@ -63,7 +63,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeTypeOfExpression> to represent a typeof expression.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeOfExpression/Overview/codetypeofexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeOfExample/VB/codetypeofexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeOfExpression/Overview/codetypeofexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeTypeReference.xml b/xml/System.CodeDom/CodeTypeReference.xml
index dbf15b1136f..d71016fdce8 100644
--- a/xml/System.CodeDom/CodeTypeReference.xml
+++ b/xml/System.CodeDom/CodeTypeReference.xml
@@ -63,7 +63,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeTypeReference> to represent a reference to a type.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeOfExpression/Overview/codetypeofexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeOfExample/VB/codetypeofexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeOfExpression/Overview/codetypeofexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeTypeReferenceCollection.xml b/xml/System.CodeDom/CodeTypeReferenceCollection.xml
index 318b4ecb398..3c0866b581c 100644
--- a/xml/System.CodeDom/CodeTypeReferenceCollection.xml
+++ b/xml/System.CodeDom/CodeTypeReferenceCollection.xml
@@ -57,7 +57,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -111,7 +111,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -363,7 +363,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -411,7 +411,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -461,7 +461,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -509,7 +509,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -563,7 +563,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -611,7 +611,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -703,7 +703,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeReferenceCollection/VB/class1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeReferenceCollection/Overview/class1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.CodeDom/CodeTypeReferenceExpression.xml b/xml/System.CodeDom/CodeTypeReferenceExpression.xml
index 57dfbd8044c..f1a108d40f8 100644
--- a/xml/System.CodeDom/CodeTypeReferenceExpression.xml
+++ b/xml/System.CodeDom/CodeTypeReferenceExpression.xml
@@ -61,7 +61,7 @@
  The following example demonstrates use of a <xref:System.CodeDom.CodeTypeReferenceExpression> to represent a reference to a type.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeTypeOfExpression/Overview/codetypeofexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeTypeOfExample/VB/codetypeofexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeTypeOfExpression/Overview/codetypeofexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeVariableDeclarationStatement.xml b/xml/System.CodeDom/CodeVariableDeclarationStatement.xml
index 6d26e0d9ae0..ab6f0b1983b 100644
--- a/xml/System.CodeDom/CodeVariableDeclarationStatement.xml
+++ b/xml/System.CodeDom/CodeVariableDeclarationStatement.xml
@@ -64,7 +64,7 @@
  This example demonstrates using a <xref:System.CodeDom.CodeVariableDeclarationStatement> to declare a variable.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeVariableDeclarationStatement/Overview/codevariabledeclarationstatementexample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeVariableDeclarationStatementExample/VB/codevariabledeclarationstatementexample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeVariableDeclarationStatement/Overview/codevariabledeclarationstatementexample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/CodeVariableReferenceExpression.xml b/xml/System.CodeDom/CodeVariableReferenceExpression.xml
index cf512077a51..31a1e7a17ef 100644
--- a/xml/System.CodeDom/CodeVariableReferenceExpression.xml
+++ b/xml/System.CodeDom/CodeVariableReferenceExpression.xml
@@ -63,7 +63,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeVariableReferenceExpression> to refer to a local variable.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeFieldReferenceExpression/Overview/codereferenceexample.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeReferenceExample/VB/codereferenceexample.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeFieldReferenceExpression/Overview/codereferenceexample.vb" id="Snippet4":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/FieldDirection.xml b/xml/System.CodeDom/FieldDirection.xml
index 5b3ecfea532..8d5186ece22 100644
--- a/xml/System.CodeDom/FieldDirection.xml
+++ b/xml/System.CodeDom/FieldDirection.xml
@@ -54,7 +54,7 @@
  The following example demonstrates use of <xref:System.CodeDom.FieldDirection> to indicate the field direction types of the parameters of a method in a method declaration.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeParameterDeclarationExpression/Overview/codeparameterdeclarationexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeParameterDeclarationExample/VB/codeparameterdeclarationexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeParameterDeclarationExpression/Overview/codeparameterdeclarationexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.CodeDom/MemberAttributes.xml b/xml/System.CodeDom/MemberAttributes.xml
index b91dcb9ad58..5ac260ad3cb 100644
--- a/xml/System.CodeDom/MemberAttributes.xml
+++ b/xml/System.CodeDom/MemberAttributes.xml
@@ -64,7 +64,7 @@
  The following example code demonstrates use of a <xref:System.CodeDom.CodeMemberProperty> to define a `string` property with `get` and `set` accessors.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom/CodeMemberProperty/Overview/codememberpropertyexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CodeMemberPropertyExample/VB/codememberpropertyexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom/CodeMemberProperty/Overview/codememberpropertyexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Collections.Generic/Dictionary`2.xml b/xml/System.Collections.Generic/Dictionary`2.xml
index 4cb0c0d8e47..8161356e8bb 100644
--- a/xml/System.Collections.Generic/Dictionary`2.xml
+++ b/xml/System.Collections.Generic/Dictionary`2.xml
@@ -154,7 +154,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.cs" id="Snippet11":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.fs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source2.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.vb" id="Snippet11":::
 
  The `foreach` statement is a wrapper around the enumerator, which allows only reading from the collection, not writing to it.
 
@@ -177,7 +177,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -261,7 +261,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -328,7 +328,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IDic/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -457,7 +457,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source2.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IEqC/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -526,7 +526,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source3.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_Int32/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -612,7 +612,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_IDicIEqC/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -755,7 +755,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source4.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source4.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.ctor_Int32IEqC/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/.ctor/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -895,7 +895,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1106,13 +1106,13 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1541,16 +1541,16 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet3":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1618,10 +1618,10 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet9":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet9":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet7":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1752,7 +1752,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet10":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -2566,7 +2566,7 @@ Getting the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2649,12 +2649,12 @@ Getting the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet6":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2740,12 +2740,12 @@ Getting the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2941,15 +2941,15 @@ Getting the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet3":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -3022,15 +3022,15 @@ Getting the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet9":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet9":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet9":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet9":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -3097,12 +3097,12 @@ Getting the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet10":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet10":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet10":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet10":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -3169,15 +3169,15 @@ Getting the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet8":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet8":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet8":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.fs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -3522,10 +3522,10 @@ Unlike the <xref:System.Collections.Generic.Dictionary%602.Add%2A> method, this
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3593,10 +3593,10 @@ Unlike the <xref:System.Collections.Generic.Dictionary%602.Add%2A> method, this
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet8":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet7":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.fs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.Generic/IDictionary`2.xml b/xml/System.Collections.Generic/IDictionary`2.xml
index b397d926b71..aa0948ef00f 100644
--- a/xml/System.Collections.Generic/IDictionary`2.xml
+++ b/xml/System.Collections.Generic/IDictionary`2.xml
@@ -92,7 +92,7 @@
  The `foreach` statement of the C# language (`For Each` in Visual Basic) returns an object of the type of the elements in the collection. Since each element of the <xref:System.Collections.Generic.IDictionary%602> is a key/value pair, the element type is not the type of the key or the type of the value. Instead, the element type is <xref:System.Collections.Generic.KeyValuePair%602>. For example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source2.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source2.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source2.vb" id="Snippet11":::
 
  The `foreach` statement is a wrapper around the enumerator, which only allows reading from, not writing to, the collection.
 
@@ -113,7 +113,7 @@
  Finally, the example shows how to enumerate the keys and values in the dictionary, and how to enumerate the values alone using the <xref:System.Collections.Generic.IDictionary%602.Values%2A> property.
 
   :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
-  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet1":::
+  :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -188,7 +188,7 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.IDictionary%602?displayProperty=nameWithType>.
 
   :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
-  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet2":::
+  :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -260,11 +260,11 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.IDictionary%602?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -341,11 +341,11 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.IDictionary%602?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -413,7 +413,7 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.IDictionary%602?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -480,7 +480,7 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.IDictionary%602?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -561,9 +561,9 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.IDictionary%602?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -628,7 +628,7 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.IDictionary%602?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.Generic/IReadOnlyDictionary`2.xml b/xml/System.Collections.Generic/IReadOnlyDictionary`2.xml
index b2fc32c9885..b79e1047cad 100644
--- a/xml/System.Collections.Generic/IReadOnlyDictionary`2.xml
+++ b/xml/System.Collections.Generic/IReadOnlyDictionary`2.xml
@@ -90,7 +90,7 @@
  The `foreach` statement of the C# language (`For Each` in Visual Basic) requires the type of each element in the collection. Because each element of the <xref:System.Collections.Generic.IReadOnlyDictionary%602> interface is a key/value pair, the element type is not the type of the key or the type of the value. Instead, the element type is <xref:System.Collections.Generic.KeyValuePair%602>, as the following example illustrates.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source2.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.IDictionary/VB/source2.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/IDictionaryTKey,TValue/Overview/source2.vb" id="Snippet11":::
 
  The `foreach` statement is a wrapper around the enumerator; it allows only reading from the collection, not writing to the collection.
 
diff --git a/xml/System.Collections.Generic/KeyValuePair`2.xml b/xml/System.Collections.Generic/KeyValuePair`2.xml
index 3ffde278385..98acd82707e 100644
--- a/xml/System.Collections.Generic/KeyValuePair`2.xml
+++ b/xml/System.Collections.Generic/KeyValuePair`2.xml
@@ -93,7 +93,7 @@
  The `foreach` statement of the C# language (`For Each` in Visual Basic) returns an object of the type of the elements in the collection. Since each element of a collection based on <xref:System.Collections.Generic.IDictionary%602> is a key/value pair, the element type is not the type of the key or the type of the value. Instead, the element type is <xref:System.Collections.Generic.KeyValuePair%602>. For example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source2.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.vb" id="Snippet11":::
 
  The `foreach` statement is a wrapper around the enumerator, which allows only reading from, not writing to, the collection.
 
@@ -105,7 +105,7 @@
  This code is part of a larger example provided for the <xref:System.Collections.Generic.Dictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
     </remarks>
@@ -262,7 +262,7 @@
  This code is part of a larger example provided for the <xref:System.Collections.Generic.Dictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -378,7 +378,7 @@
  This code is part of a larger example provided for the <xref:System.Collections.Generic.Dictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.Generic/LinkedList`1.xml b/xml/System.Collections.Generic/LinkedList`1.xml
index 7e1a3812fad..48140e7c28b 100644
--- a/xml/System.Collections.Generic/LinkedList`1.xml
+++ b/xml/System.Collections.Generic/LinkedList`1.xml
@@ -141,7 +141,7 @@
  The following code example demonstrates many features of the <xref:System.Collections.Generic.LinkedList%601> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/LinkedListT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.LinkedList/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/LinkedListT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Collections.Generic/List`1.xml b/xml/System.Collections.Generic/List`1.xml
index 956b7817b9a..0f704a83b95 100644
--- a/xml/System.Collections.Generic/List`1.xml
+++ b/xml/System.Collections.Generic/List`1.xml
@@ -190,7 +190,7 @@
  The example adds, inserts, and removes items, showing how the capacity changes as these methods are used.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
@@ -248,7 +248,7 @@
  The following example demonstrates the <xref:System.Collections.Generic.List%601.%23ctor%2A> constructor and various methods of the <xref:System.Collections.Generic.List%601> class that act on ranges. An array of strings is created and passed to the constructor, populating the list with the elements of the array. The <xref:System.Collections.Generic.List%601.Capacity%2A> property is then displayed, to show that the initial capacity is exactly what is required to hold the input elements.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Ranges/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
  The following example demonstrates the <xref:System.Collections.Generic.List%601.%23ctor%28System.Int32%29> constructor. A <xref:System.Collections.Generic.List%601> of strings with a capacity of 4 is created, because the ultimate size of the list is known to be exactly 4. The list is populated with four strings, and a read-only copy is created by using the <xref:System.Collections.Generic.List%601.AsReadOnly%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/.ctor/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_AsReadOnly/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -396,7 +396,7 @@
  Other properties and methods are used to search for, insert, and remove elements from the list, and finally to clear the list.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
@@ -463,7 +463,7 @@
  The following example demonstrates the <xref:System.Collections.Generic.List%601.AddRange%2A> method and various other methods of the <xref:System.Collections.Generic.List%601> class that act on ranges. An array of strings is created and passed to the constructor, populating the list with the elements of the array. The <xref:System.Collections.Generic.List%601.AddRange%2A> method is called, with the list as its argument. The result is that the current elements of the list are added to the end of the list, duplicating all the elements.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Ranges/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -531,7 +531,7 @@
  An element of the original list is set to "Coelophysis" using the <xref:System.Collections.Generic.List%601.Item%2A> property (the indexer in C#), and the contents of the read-only list are displayed again to demonstrate that it is just a wrapper for the original list.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/.ctor/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_AsReadOnly/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -613,7 +613,7 @@
  The <xref:System.Collections.Generic.List%601.BinarySearch%28%600%29> method overload is then used to search for two strings that are not in the list, and the <xref:System.Collections.Generic.List%601.Insert%2A> method is used to insert them. The return value of the <xref:System.Collections.Generic.List%601.BinarySearch%28%600%29> method is negative in each case, because the strings are not in the list. Taking the bitwise complement (the ~ operator in C#, `Xor` -1 in Visual Basic) of this negative number produces the index of the first element in the list that is larger than the search string, and inserting at this location preserves the sort order. The second search string is larger than any element in the list, so the insertion position is at the end of the list.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/BinarySearch/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearch/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -708,7 +708,7 @@
  The <xref:System.Collections.Generic.List%601.BinarySearch%28%600%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> method overload is then used to search for several strings that are not in the list, employing the alternate comparer. The <xref:System.Collections.Generic.List%601.Insert%2A> method is used to insert the strings. These two methods are located in the function named `SearchAndInsert`, along with code to take the bitwise complement (the ~ operator in C#, `Xor` -1 in Visual Basic) of the negative number returned by <xref:System.Collections.Generic.List%601.BinarySearch%28%600%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> and use it as an index for inserting the new string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/BinarySearch/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearchComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -804,7 +804,7 @@
  The <xref:System.Collections.Generic.List%601.BinarySearch%28System.Int32%2CSystem.Int32%2C%600%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> method overload is then used to search only the range of herbivores for "Brachiosaurus". The string is not found, and the bitwise complement (the ~ operator in C#, `Xor` -1 in Visual Basic) of the negative number returned by the <xref:System.Collections.Generic.List%601.BinarySearch%28System.Int32%2CSystem.Int32%2C%600%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> method is used as an index for inserting the new string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/BinarySearch/source2.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearchComparerRange/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -892,7 +892,7 @@
  The <xref:System.Collections.Generic.List%601.Capacity%2A> property is displayed again after the <xref:System.Collections.Generic.List%601.TrimExcess%2A> method is used to reduce the capacity to match the count. Finally, the <xref:System.Collections.Generic.List%601.Clear%2A> method is used to remove all items from the list, and the <xref:System.Collections.Generic.List%601.Capacity%2A> and <xref:System.Collections.Generic.List%601.Count%2A> properties are displayed again.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
@@ -961,7 +961,7 @@
  The following example demonstrates the <xref:System.Collections.Generic.List%601.Clear%2A> method and various other properties and methods of the <xref:System.Collections.Generic.List%601> generic class. The <xref:System.Collections.Generic.List%601.Clear%2A> method is used at the end of the program, to remove all items from the list, and the <xref:System.Collections.Generic.List%601.Capacity%2A> and <xref:System.Collections.Generic.List%601.Count%2A> properties are then displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
@@ -1110,7 +1110,7 @@
  The following example defines a method named `PointFToPoint` that converts a <xref:System.Drawing.PointF> structure to a <xref:System.Drawing.Point> structure. The example then creates a <xref:System.Collections.Generic.List%601> of <xref:System.Drawing.PointF> structures, creates a `Converter\<PointF, Point>` delegate (`Converter(Of PointF, Point)` in Visual Basic) to represent the `PointFToPoint` method, and passes the delegate to the <xref:System.Collections.Generic.List%601.ConvertAll%2A> method. The <xref:System.Collections.Generic.List%601.ConvertAll%2A> method passes each element of the input list to the `PointFToPoint` method and puts the converted elements into a new list of <xref:System.Drawing.Point> structures. Both lists are displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System/ConverterTInput,TOutput/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_ConvertAll/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ConverterTInput,TOutput/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1135,7 +1135,7 @@
  The following example demonstrates all three overloads of the <xref:System.Collections.Generic.List%601.CopyTo%2A> method. A <xref:System.Collections.Generic.List%601> of strings is created and populated with 5 strings. An empty string array of 15 elements is created, and the <xref:System.Collections.Generic.List%601.CopyTo%28%600%5B%5D%29> method overload is used to copy all the elements of the list to the array beginning at the first element of the array. The <xref:System.Collections.Generic.List%601.CopyTo%28%600%5B%5D%2CSystem.Int32%29> method overload is used to copy all the elements of the list to the array beginning at array index 6 (leaving index 5 empty). Finally, the <xref:System.Collections.Generic.List%601.CopyTo%28System.Int32%2C%600%5B%5D%2CSystem.Int32%2CSystem.Int32%29> method overload is used to copy 3 elements from the list, beginning with index 2, to the array beginning at array index 12 (leaving index 11 empty). The contents of the array are then displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/CopyTo/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_CopyTo/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1416,7 +1416,7 @@
  The following example shows the value of the <xref:System.Collections.Generic.List%601.Count%2A> property at various points in the life of a list. After the list has been created and populated and its elements displayed, the <xref:System.Collections.Generic.List%601.Capacity%2A> and <xref:System.Collections.Generic.List%601.Count%2A> properties are displayed. These properties are displayed again after the <xref:System.Collections.Generic.List%601.TrimExcess%2A> method has been called, and again after the contents of the list are cleared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
@@ -1529,7 +1529,7 @@
 > In C# and Visual Basic, it is not necessary to create the `Predicate<string>` delegate (`Predicate(Of String)` in Visual Basic) explicitly. These languages infer the correct delegate from context and create it automatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Exists/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_FindEtAl/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Exists/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1623,7 +1623,7 @@
 |<xref:System.Collections.Generic.List%601.FindLastIndex%28System.Int32%2CSystem.Int32%2CSystem.Predicate%7B%600%7D%29>|Finds the index of last computer book in the second half of the collection, using the `FindComputer` predicate delegate.|
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Find/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/list`1_find_methods/vb/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Find/module1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1707,7 +1707,7 @@
 |<xref:System.Collections.Generic.List%601.FindLastIndex%28System.Int32%2CSystem.Int32%2CSystem.Predicate%7B%600%7D%29>|Finds the index of last computer book in the second half of the collection, using the `FindComputer` predicate delegate.|
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Find/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/list`1_find_methods/vb/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Find/module1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2100,7 +2100,7 @@ Public Function StartsWith(e As Employee) As Boolean
 |<xref:System.Collections.Generic.List%601.FindLastIndex%28System.Int32%2CSystem.Int32%2CSystem.Predicate%7B%600%7D%29>|Finds the index of last computer book in the second half of the collection, using the `FindComputer` predicate delegate.|
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Find/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/list`1_find_methods/vb/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Find/module1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2197,7 +2197,7 @@ Public Function StartsWith(e As Employee) As Boolean
 |<xref:System.Collections.Generic.List%601.FindLastIndex%28System.Int32%2CSystem.Int32%2CSystem.Predicate%7B%600%7D%29>|Finds the index of last computer book in the second half of the collection, using the `FindComputer` predicate delegate.|
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Find/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/list`1_find_methods/vb/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Find/module1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2359,7 +2359,7 @@ Public Function StartsWith(e As Employee) As Boolean
 |<xref:System.Collections.Generic.List%601.FindLastIndex%28System.Int32%2CSystem.Int32%2CSystem.Predicate%7B%600%7D%29>|Finds the index of last computer book in the second half of the collection, using the `FindComputer` predicate delegate.|
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Find/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/list`1_find_methods/vb/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Find/module1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2589,7 +2589,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The following example demonstrates the <xref:System.Collections.Generic.List%601.GetRange%2A> method and other methods of the <xref:System.Collections.Generic.List%601> class that act on ranges. At the end of the example, the <xref:System.Collections.Generic.List%601.GetRange%2A> method is used to get three items from the list, beginning with index location 2. The <xref:System.Collections.Generic.List%601.ToArray%2A> method is called on the resulting <xref:System.Collections.Generic.List%601>, creating an array of three elements. The elements of the array are displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Ranges/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2622,7 +2622,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The following example demonstrates all three overloads of the <xref:System.Collections.Generic.List%601.IndexOf%2A> method. A <xref:System.Collections.Generic.List%601> of strings is created, with one entry that appears twice, at index location 0 and index location 5. The <xref:System.Collections.Generic.List%601.IndexOf%28%600%29> method overload searches the list from the beginning, and finds the first occurrence of the string. The <xref:System.Collections.Generic.List%601.IndexOf%28%600%2CSystem.Int32%29> method overload is used to search the list beginning with index location 3 and continuing to the end of the list, and finds the second occurrence of the string. Finally, the <xref:System.Collections.Generic.List%601.IndexOf%28%600%2CSystem.Int32%2CSystem.Int32%29> method overload is used to search a range of two entries, beginning at index location two; it returns -1 because there are no instances of the search string in that range.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/IndexOf/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_IndexOf/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/IndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2905,7 +2905,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The following example demonstrates the <xref:System.Collections.Generic.List%601.Insert%2A> method, along with various other properties and methods of the <xref:System.Collections.Generic.List%601> generic class. After the list is created, elements are added. The <xref:System.Collections.Generic.List%601.Insert%2A> method is used to insert an item into the middle of the list. The item inserted is a duplicate, which is later removed using the <xref:System.Collections.Generic.List%601.Remove%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
@@ -2983,7 +2983,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The following example demonstrates <xref:System.Collections.Generic.List%601.InsertRange%2A> method and various other methods of the <xref:System.Collections.Generic.List%601> class that act on ranges. After the list has been created and populated with the names of several peaceful plant-eating dinosaurs, the <xref:System.Collections.Generic.List%601.InsertRange%2A> method is used to insert an array of three ferocious meat-eating dinosaurs into the list, beginning at index location 3.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Ranges/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3076,9 +3076,9 @@ Public Function StartsWith(e As Employee) As Boolean
  The C# language uses the [`this`](/dotnet/csharp/language-reference/keywords/this) keyword to define the indexers instead of implementing the <xref:System.Collections.Generic.List%601.Item%2A> property. Visual Basic implements <xref:System.Collections.Generic.List%601.Item%2A> as a default property, which provides the same indexing functionality.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3107,7 +3107,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The following example demonstrates all three overloads of the <xref:System.Collections.Generic.List%601.LastIndexOf%2A> method. A <xref:System.Collections.Generic.List%601> of strings is created, with one entry that appears twice, at index location 0 and index location 5. The <xref:System.Collections.Generic.List%601.LastIndexOf%28%600%29> method overload searches the entire list from the end, and finds the second occurrence of the string. The <xref:System.Collections.Generic.List%601.LastIndexOf%28%600%2CSystem.Int32%29> method overload is used to search the list backward beginning with index location 3 and continuing to the beginning of the list, so it finds the first occurrence of the string in the list. Finally, the <xref:System.Collections.Generic.List%601.LastIndexOf%28%600%2CSystem.Int32%2CSystem.Int32%29> method overload is used to search a range of four entries, beginning at index location 4 and extending backward (that is, it searches the items at locations 4, 3, 2, and 1); this search returns -1 because there are no instances of the search string in that range.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/LastIndexOf/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_LastIndexOf/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/LastIndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3383,7 +3383,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The following example demonstrates <xref:System.Collections.Generic.List%601.Remove%2A> method. Several properties and methods of the <xref:System.Collections.Generic.List%601> generic class are used to add, insert, and search the list. After these operations, the list contains a duplicate. The <xref:System.Collections.Generic.List%601.Remove%2A> method is used to remove the first instance of the duplicate item, and the contents are displayed. The <xref:System.Collections.Generic.List%601.Remove%2A> method always removes the first instance it encounters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
@@ -3461,7 +3461,7 @@ Public Function StartsWith(e As Employee) As Boolean
  Finally, the <xref:System.Collections.Generic.List%601.Exists%2A> method verifies that there are no strings in the list that end with "saurus".
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Exists/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_FindEtAl/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Exists/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3605,7 +3605,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The following example demonstrates the <xref:System.Collections.Generic.List%601.RemoveRange%2A> method and various other methods of the <xref:System.Collections.Generic.List%601> class that act on ranges. After the list has been created and modified, the <xref:System.Collections.Generic.List%601.RemoveRange%2A> method is used to remove two elements from the list, beginning at index location 2.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Ranges/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3640,7 +3640,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The following example demonstrates both overloads of the <xref:System.Collections.Generic.List%601.Reverse%2A> method. The example creates a <xref:System.Collections.Generic.List%601> of strings and adds six strings. The <xref:System.Collections.Generic.List%601.Reverse> method overload is used to reverse the list, and then the <xref:System.Collections.Generic.List%601.Reverse%28System.Int32%2CSystem.Int32%29> method overload is used to reverse the middle of the list, beginning with element 1 and encompassing four elements.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Reverse/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Reverse/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Reverse/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3888,7 +3888,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The <xref:System.Collections.Generic.List%601.BinarySearch%28%600%29> method overload is then used to search for two strings that are not in the list, and the <xref:System.Collections.Generic.List%601.Insert%2A> method is used to insert them. The return value of the <xref:System.Collections.Generic.List%601.BinarySearch%2A> method is negative in each case, because the strings are not in the list. Taking the bitwise complement (the ~ operator in C#, `Xor` -1 in Visual Basic) of this negative number produces the index of the first element in the list that is larger than the search string, and inserting at this location preserves the sort order. The second search string is larger than any element in the list, so the insertion position is at the end of the list.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/BinarySearch/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearch/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3976,7 +3976,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The <xref:System.Collections.Generic.List%601.BinarySearch%28%600%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> method overload is then used to search for several strings that are not in the list, employing the alternate comparer. The <xref:System.Collections.Generic.List%601.Insert%2A> method is used to insert the strings. These two methods are located in the function named `SearchAndInsert`, along with code to take the bitwise complement (the ~ operator in C#, `Xor` -1 in Visual Basic) of the negative number returned by <xref:System.Collections.Generic.List%601.BinarySearch%28%600%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> and use it as an index for inserting the new string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/BinarySearch/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearchComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4061,7 +4061,7 @@ Public Function StartsWith(e As Employee) As Boolean
  A <xref:System.Collections.Generic.List%601> of strings is created and populated with four strings, in no particular order. The list also includes an empty string and a null reference. The list is displayed, sorted using a <xref:System.Comparison%601> generic delegate representing the `CompareDinosByLength` method, and displayed again.
 
  :::code language="csharp" source="~/snippets/csharp/System/ComparisonT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_SortComparison/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ComparisonT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4156,7 +4156,7 @@ Public Function StartsWith(e As Employee) As Boolean
  The <xref:System.Collections.Generic.List%601.BinarySearch%28System.Int32%2CSystem.Int32%2C%600%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> method overload is then used to search only the range of herbivores for "Brachiosaurus". The string is not found, and the bitwise complement (the ~ operator in C#, `Xor` -1 in Visual Basic) of the negative number returned by the <xref:System.Collections.Generic.List%601.BinarySearch%28System.Int32%2CSystem.Int32%2C%600%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> method is used as an index for inserting the new string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/BinarySearch/source2.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_SortSearchComparerRange/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/BinarySearch/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5172,7 +5172,7 @@ Retrieving the value of this property is an O(1) operation.
  The following example demonstrates the <xref:System.Collections.Generic.List%601.ToArray%2A> method and other methods of the <xref:System.Collections.Generic.List%601> class that act on ranges. At the end of the example, the <xref:System.Collections.Generic.List%601.GetRange%2A> method is used to get three items from the list, beginning with index location 2. The <xref:System.Collections.Generic.List%601.ToArray%2A> method is called on the resulting <xref:System.Collections.Generic.List%601>, creating an array of three elements. The elements of the array are displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Ranges/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5242,7 +5242,7 @@ Retrieving the value of this property is an O(1) operation.
  The following example demonstrates the <xref:System.Collections.Generic.List%601.TrimExcess%2A> method. Several properties and methods of the <xref:System.Collections.Generic.List%601> class are used to add, insert, and remove items from a list of strings. Then the <xref:System.Collections.Generic.List%601.TrimExcess%2A> method is used to reduce the capacity to match the count, and the <xref:System.Collections.Generic.List%601.Capacity%2A> and <xref:System.Collections.Generic.List%601.Count%2A> properties are displayed. If the unused capacity had been less than 10 percent of total capacity, the list would not have been resized. Finally, the contents of the list are cleared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Overview/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_Class/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/.ctor/source1.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_Class/fs/listclass.fs" id="Snippet1":::
 
  ]]></format>
@@ -5315,7 +5315,7 @@ Retrieving the value of this property is an O(1) operation.
 > In C# and Visual Basic, it is not necessary to create the `Predicate<string>` delegate (`Predicate(Of String)` in Visual Basic) explicitly. These languages infer the correct delegate from context and create it automatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/ListT/Exists/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_FindEtAl/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/ListT/Exists/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.Generic/Queue`1.xml b/xml/System.Collections.Generic/Queue`1.xml
index 8cdbaae207d..a10771f6cf2 100644
--- a/xml/System.Collections.Generic/Queue`1.xml
+++ b/xml/System.Collections.Generic/Queue`1.xml
@@ -130,7 +130,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -163,7 +163,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -428,7 +428,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -502,7 +502,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -644,7 +644,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -715,7 +715,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -789,7 +789,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -909,7 +909,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -982,7 +982,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1410,7 +1410,7 @@ Retrieving the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/QueueT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/QueueT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Queue/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/QueueT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.Generic/SortedDictionary`2.xml b/xml/System.Collections.Generic/SortedDictionary`2.xml
index 17271b88623..710e19d3eb8 100644
--- a/xml/System.Collections.Generic/SortedDictionary`2.xml
+++ b/xml/System.Collections.Generic/SortedDictionary`2.xml
@@ -133,7 +133,7 @@
  The `foreach` statement of the C# language (`For Each` in Visual Basic) returns an object of the type of the elements in the collection. Since each element of the <xref:System.Collections.Generic.SortedDictionary%602> is a key/value pair, the element type is not the type of the key or the type of the value. Instead, the element type is <xref:System.Collections.Generic.KeyValuePair%602>. The following code shows the syntax.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Dictionary/VB/source2.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/DictionaryTKey,TValue/Overview/source2.vb" id="Snippet11":::
 
  The `foreach` statement is a wrapper around the enumerator, which allows only reading from the collection, not writing to it.
 
@@ -149,7 +149,7 @@
  Finally, the example demonstrates the <xref:System.Collections.Generic.SortedDictionary%602.Remove%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -230,7 +230,7 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedDictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -302,7 +302,7 @@
  The following code example creates a <xref:System.Collections.Generic.SortedDictionary%602> with a case-insensitive comparer for the current culture. The example adds four elements, some with lower-case keys and some with upper-case keys. The example then attempts to add an element with a key that differs from an existing key only by case, catches the resulting exception, and displays an error message. Finally, the example displays the elements in case-insensitive sort order.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IComp/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -373,7 +373,7 @@
  The following code example shows how to use <xref:System.Collections.Generic.SortedDictionary%602> to create a sorted copy of the information in a <xref:System.Collections.Generic.Dictionary%602>, by passing the <xref:System.Collections.Generic.Dictionary%602> to the <xref:System.Collections.Generic.SortedDictionary%602.%23ctor%28System.Collections.Generic.IComparer%7B%600%7D%29> constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IDic/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -452,7 +452,7 @@
  The following code example shows how to use <xref:System.Collections.Generic.SortedDictionary%602> to create a case-insensitive sorted copy of the information in a case-insensitive <xref:System.Collections.Generic.Dictionary%602>, by passing the <xref:System.Collections.Generic.Dictionary%602> to the <xref:System.Collections.Generic.SortedDictionary%602.%23ctor%28System.Collections.Generic.IDictionary%7B%600%2C%601%7D%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> constructor. In this example, the case-insensitive comparers are for the current culture.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source2.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.ctor_IDicIComp/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -532,7 +532,7 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedDictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -713,11 +713,11 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedDictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1053,11 +1053,11 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedDictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1124,9 +1124,9 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.SortedDictionary%602>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet9":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1197,7 +1197,7 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedDictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1915,7 +1915,7 @@ Getting the value of this property is an O(1) operation.
  The code example demonstrates the use of several other members of the <xref:System.Collections.IDictionary?displayProperty=nameWithType> interface.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1997,11 +1997,11 @@ Getting the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedDictionary%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2084,11 +2084,11 @@ Getting the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedDictionary%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2285,13 +2285,13 @@ Getting the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedDictionary%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2369,13 +2369,13 @@ Getting the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedDictionary%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet9":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet9":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet9":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2441,11 +2441,11 @@ Getting the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedDictionary%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet10":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet10":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet10":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2517,13 +2517,13 @@ Getting the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedDictionary%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet8":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet8":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2677,9 +2677,9 @@ Getting the value of this property is an O(1) operation.
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedDictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2746,9 +2746,9 @@ Getting the value of this property is an O(1) operation.
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedDictionary%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedDictionaryTKey,TValue/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.Generic/SortedList`2.xml b/xml/System.Collections.Generic/SortedList`2.xml
index 5b0a6664182..dae91304b21 100644
--- a/xml/System.Collections.Generic/SortedList`2.xml
+++ b/xml/System.Collections.Generic/SortedList`2.xml
@@ -128,7 +128,7 @@
  Another difference between the <xref:System.Collections.Generic.SortedDictionary%602> and <xref:System.Collections.Generic.SortedList%602> classes is that <xref:System.Collections.Generic.SortedList%602> supports efficient indexed retrieval of keys and values through the collections returned by the <xref:System.Collections.Generic.SortedList%602.Keys%2A> and <xref:System.Collections.Generic.SortedList%602.Values%2A> properties. It is not necessary to regenerate the lists when the properties are accessed, because the lists are just wrappers for the internal arrays of keys and values. The following code shows the use of the <xref:System.Collections.Generic.SortedList%602.Values%2A> property for indexed retrieval of values from a sorted list of strings:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/remarks.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.vb" id="Snippet11":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.fs" id="Snippet11":::
 
  <xref:System.Collections.Generic.SortedList%602> is implemented as an array of key/value pairs, sorted by the key.  Each element can be retrieved as a <xref:System.Collections.Generic.KeyValuePair%602> object.
@@ -144,7 +144,7 @@
  The `foreach` statement of the C# language (`For Each` in Visual Basic) returns an object of the type of the elements in the collection. Since the elements of the <xref:System.Collections.Generic.SortedList%602> are key/value pairs, the element type is not the type of the key or the type of the value. Instead, the element type is <xref:System.Collections.Generic.KeyValuePair%602>. For example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.cs"  id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/remarks.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.vb" id="Snippet12":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.fs"  id="Snippet12":::
 
  The `foreach` statement is a wrapper around the enumerator, which only allows reading from, not writing to, the collection.
@@ -163,7 +163,7 @@
  Finally, the example demonstrates the <xref:System.Collections.Generic.SortedList%602.Remove%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet1":::
 
  ]]></format>
@@ -242,7 +242,7 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedList%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet2":::
 
  ]]></format>
@@ -318,7 +318,7 @@
  The following code example creates a sorted list with a case-insensitive comparer for the current culture. The example adds four elements, some with lower-case keys and some with upper-case keys. The example then attempts to add an element with a key that differs from an existing key only by case, catches the resulting exception, and displays an error message. Finally, the example displays the elements in case-insensitive sort order.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/.ctor/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IComp/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -390,7 +390,7 @@
  The following code example shows how to use <xref:System.Collections.Generic.SortedList%602> to create a sorted copy of the information in a <xref:System.Collections.Generic.Dictionary%602>, by passing the <xref:System.Collections.Generic.Dictionary%602> to the <xref:System.Collections.Generic.SortedList%602.%23ctor%28System.Collections.Generic.IDictionary%7B%600%2C%601%7D%29> constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/.ctor/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IDic/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -464,7 +464,7 @@
  The following code example creates a sorted list with an initial capacity of 4 and populates it with 4 entries.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/.ctor/source3.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_Int32/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -544,7 +544,7 @@
  The following code example shows how to use <xref:System.Collections.Generic.SortedList%602> to create a case-insensitive sorted copy of the information in a case-insensitive <xref:System.Collections.Generic.Dictionary%602>, by passing the <xref:System.Collections.Generic.Dictionary%602> to the <xref:System.Collections.Generic.SortedList%602.%23ctor%28System.Collections.Generic.IDictionary%7B%600%2C%601%7D%2CSystem.Collections.Generic.IComparer%7B%600%7D%29> constructor. In this example, the case-insensitive comparers are for the current culture.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/.ctor/source2.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_IDicIComp/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -631,7 +631,7 @@
  The following code example creates a sorted list with an initial capacity of 5 and a case-insensitive comparer for the current culture. The example adds four elements, some with lower-case keys and some with upper-case keys. The example then attempts to add an element with a key that differs from an existing key only by case, catches the resulting exception, and displays an error message. Finally, the example displays the elements in case-insensitive sort order.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/.ctor/source4.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.ctor_Int32IComp/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/.ctor/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -710,7 +710,7 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedList%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" interactive="try-dotnet-method" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet2":::
 
  ]]></format>
@@ -956,13 +956,13 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedList%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet5":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet4":::
 
  ]]></format>
@@ -1412,13 +1412,13 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedList%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet5":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet5":::
 
  ]]></format>
@@ -1484,7 +1484,7 @@
  The collection returned by the <xref:System.Collections.Generic.SortedList%602.Keys%2A> property provides an efficient way to retrieve keys by index. It is not necessary to regenerate the list when the property is accessed, because the list is just a wrapper for the internal array of keys. The following code shows the use of the <xref:System.Collections.Generic.SortedList%602.Keys%2A> property for indexed retrieval of keys from a sorted list of elements with string keys:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/remarks.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.vb" id="Snippet11":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.fs" id="Snippet11":::
 
  Retrieving the value of this property is an O(1) operation.
@@ -1499,10 +1499,10 @@
  This code is part of a larger example that can be compiled and executed. See <xref:System.Collections.Generic.SortedList%602>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet9":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet9":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet7":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet7":::
 
  ]]></format>
@@ -1571,7 +1571,7 @@
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedList%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet10":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet10":::
 
  ]]></format>
@@ -2430,7 +2430,7 @@ Retrieving the value of this property is an O(1) operation.
  The code example demonstrates the use of several other members of the <xref:System.Collections.IDictionary?displayProperty=nameWithType> interface.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2511,11 +2511,11 @@ Retrieving the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedList%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2597,11 +2597,11 @@ Retrieving the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedList%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2801,13 +2801,13 @@ Retrieving the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedList%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2885,13 +2885,13 @@ Retrieving the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedList%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet9":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet9":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet9":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -2958,11 +2958,11 @@ Retrieving the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedList%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet10":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet10":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet10":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -3035,13 +3035,13 @@ Retrieving the value of this property is an O(1) operation.
  The code example is part of a larger example, including output, provided for the <xref:System.Collections.Generic.SortedList%602.System%23Collections%23IDictionary%23Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet31":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet8":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet8":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.cs" id="Snippet32":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList.IDictionary/VB/source.vb" id="Snippet32":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/System.Collections.IDictionary.Add/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -3251,10 +3251,10 @@ Retrieving the value of this property is an O(1) operation.
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedList%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet4":::
 
  ]]></format>
@@ -3322,7 +3322,7 @@ Retrieving the value of this property is an O(1) operation.
  The collection returned by the <xref:System.Collections.Generic.SortedList%602.Values%2A> property provides an efficient way to retrieve values by index. It is not necessary to regenerate the list when the property is accessed, because the list is just a wrapper for the internal array of values. The following code shows the use of the <xref:System.Collections.Generic.SortedList%602.Values%2A> property for indexed retrieval of values from a sorted list of strings:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/remarks.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.vb" id="Snippet11":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/remarks.fs" id="Snippet11":::
 
  Retrieving the value of this property is an O(1) operation.
@@ -3337,10 +3337,10 @@ Retrieving the value of this property is an O(1) operation.
  This code example is part of a larger example provided for the <xref:System.Collections.Generic.SortedList%602> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet8":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.SortedList/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/SortedListTKey,TValue/Overview/source.vb" id="Snippet7":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/SortedListTKey,TValue/Overview/source.fs" id="Snippet7":::
 
  ]]></format>
diff --git a/xml/System.Collections.Generic/Stack`1.xml b/xml/System.Collections.Generic/Stack`1.xml
index 9a57f63105a..4bdb0e8c5dc 100644
--- a/xml/System.Collections.Generic/Stack`1.xml
+++ b/xml/System.Collections.Generic/Stack`1.xml
@@ -138,7 +138,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -222,7 +222,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -296,7 +296,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -455,7 +455,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -528,7 +528,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -602,7 +602,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -688,7 +688,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -804,7 +804,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -877,7 +877,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -951,7 +951,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1029,7 +1029,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1455,7 +1455,7 @@ Retrieving the value of this property is an O(1) operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.Generic/StackT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Collections.Generic/StackT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Generic.Stack/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.Generic/StackT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.ObjectModel/Collection`1.xml b/xml/System.Collections.ObjectModel/Collection`1.xml
index 54243f4aad6..2f7e1325590 100644
--- a/xml/System.Collections.ObjectModel/Collection`1.xml
+++ b/xml/System.Collections.ObjectModel/Collection`1.xml
@@ -139,7 +139,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  Example 2
 
@@ -150,7 +150,7 @@
  The code example calls several properties and methods of <xref:System.Collections.ObjectModel.Collection%601> to demonstrate the custom event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.CollectionInherited/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -232,7 +232,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings with the <xref:System.Collections.ObjectModel.Collection%601.%23ctor> constructor, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -354,7 +354,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -431,7 +431,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -506,7 +506,7 @@
  The code example calls several properties and methods of <xref:System.Collections.ObjectModel.Collection%601> to demonstrate the custom event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.CollectionInherited/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -725,7 +725,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -873,7 +873,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1029,7 +1029,7 @@
  The code example calls several properties and methods of <xref:System.Collections.ObjectModel.Collection%601> to demonstrate the custom event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.CollectionInherited/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1114,7 +1114,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1246,7 +1246,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1319,7 +1319,7 @@
  The following code example demonstrates many of the properties and methods of <xref:System.Collections.ObjectModel.Collection%601>. The code example creates a collection of strings, uses the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method to add several strings, displays the <xref:System.Collections.ObjectModel.Collection%601.Count%2A>, and lists the strings. The example uses the <xref:System.Collections.ObjectModel.Collection%601.IndexOf%2A> method to find the index of a string and the <xref:System.Collections.ObjectModel.Collection%601.Contains%2A> method to determine whether a string is in the collection. The example inserts a string using the <xref:System.Collections.ObjectModel.Collection%601.Insert%2A> method and retrieves and sets strings using the default <xref:System.Collections.ObjectModel.Collection%601.Item%2A> property (the indexer in C#). The example removes strings by string identity using the <xref:System.Collections.ObjectModel.Collection%601.Remove%2A> method and by index using the <xref:System.Collections.ObjectModel.Collection%601.RemoveAt%2A> method. Finally, the <xref:System.Collections.ObjectModel.Collection%601.Clear%2A> method is used to clear all strings from the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.Collection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1403,7 +1403,7 @@
  The code example calls several properties and methods of <xref:System.Collections.ObjectModel.Collection%601> to demonstrate the custom event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.CollectionInherited/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1478,7 +1478,7 @@
  The code example calls several properties and methods of <xref:System.Collections.ObjectModel.Collection%601> to demonstrate the custom event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/CollectionT/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectModel.CollectionInherited/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/CollectionT/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.ObjectModel/KeyedCollection`2.xml b/xml/System.Collections.ObjectModel/KeyedCollection`2.xml
index de6541996cc..fa4638dd74e 100644
--- a/xml/System.Collections.ObjectModel/KeyedCollection`2.xml
+++ b/xml/System.Collections.ObjectModel/KeyedCollection`2.xml
@@ -113,7 +113,7 @@
  The `SimpleOrder` class is a very simple requisition list that contains `OrderItem` objects, each of which represents a line item in the order. The key of `OrderItem` is immutable, an important consideration for classes that derive from <xref:System.Collections.ObjectModel.KeyedCollection%602>. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.vb" id="Snippet1":::
 
  **Example 2**
 
@@ -126,7 +126,7 @@
  This code example uses objects with immutable keys. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -200,7 +200,7 @@
  The `SimpleOrder` class is a very simple requisition list that contains `OrderItem` objects, each of which represents a line item in the order. The key of `OrderItem` is immutable, an important consideration for classes that derive from <xref:System.Collections.ObjectModel.KeyedCollection%602>. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -346,7 +346,7 @@
  This code example uses objects with immutable keys. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -409,7 +409,7 @@ The code example creates the `MutableKeys` collection, which derives from <xref:
 In order to maintain the connection between a `MutableKey` object and the `MutableKeys` collection and to prevent an object from being inserted into two collections, the `MutableKey` class has an `internal` `Collection` field. This field is maintained by the protected methods that provide custom behavior for adding and removing items from the collection, such as the <xref:System.Collections.ObjectModel.KeyedCollection%602.InsertItem%2A> method. The field is set when the item is added to a collection and cleared when the item is removed.
 
 :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ChangeItemKey/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollectionMutable/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ClearItems/source.vb" id="Snippet1":::
           ]]></format>
         </example>
         <exception cref="T:System.ArgumentNullException">
@@ -499,7 +499,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  This code example uses objects with immutable keys. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.vb" id="Snippet1":::
 
  Example 2
 
@@ -510,7 +510,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  In order to maintain the connection between a `MutableKey` object and the `MutableKeys` collection and to prevent an object from being inserted into two collections, the `MutableKey` class has an `internal` (`Friend` in Visual Basic) `Collection` field. This field is maintained by the protected methods that provide custom behavior for adding and removing items from the collection, such as the <xref:System.Collections.ObjectModel.KeyedCollection%602.InsertItem%2A> method. The field is set when the item is added to a collection and cleared when the item is removed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ChangeItemKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollectionMutable/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ClearItems/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -627,7 +627,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  The `SimpleOrder` class is a very simple requisition list that contains `OrderItem` objects, each of which represents a line item in the order. The key of `OrderItem` is immutable, an important consideration for classes that derive from <xref:System.Collections.ObjectModel.KeyedCollection%602>. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -700,7 +700,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  In order to maintain the connection between a `MutableKey` object and the `MutableKeys` collection and to prevent an object from being inserted into two collections, the `MutableKey` class has an `internal` (`Friend` in Visual Basic) `Collection` field. This field is maintained by the protected methods that provide custom behavior for adding and removing items from the collection, such as the <xref:System.Collections.ObjectModel.KeyedCollection%602.InsertItem%2A> method. The field is set when the item is added to a collection and cleared when the item is removed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ChangeItemKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollectionMutable/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ClearItems/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -772,7 +772,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  The `SimpleOrder` class is a very simple requisition list that contains `OrderItem` objects, each of which represents a line item in the order. The key of `OrderItem` is immutable, an important consideration for classes that derive from <xref:System.Collections.ObjectModel.KeyedCollection%602>. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -856,7 +856,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  This code example uses objects with immutable keys. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.vb" id="Snippet1":::
 
  Example 2
 
@@ -867,7 +867,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  In order to maintain the connection between a `MutableKey` object and the `MutableKeys` collection and to prevent an object from being inserted into two collections, the `MutableKey` class has an `internal` (`Friend` in Visual Basic) `Collection` field. This field is maintained by the protected methods that provide custom behavior for adding and removing items from the collection, such as the <xref:System.Collections.ObjectModel.KeyedCollection%602.InsertItem%2A> method. The field is set when the item is added to a collection and cleared when the item is removed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ChangeItemKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollectionMutable/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ClearItems/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -946,7 +946,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  The `SimpleOrder` class is a very simple requisition list that contains `OrderItem` objects, each of which represents a line item in the order. The key of `OrderItem` is immutable, an important consideration for classes that derive from <xref:System.Collections.ObjectModel.KeyedCollection%602>. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1023,7 +1023,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  The `SimpleOrder` class is a very simple requisition list that contains `OrderItem` objects, each of which represents a line item in the order. The key of `OrderItem` is immutable, an important consideration for classes that derive from <xref:System.Collections.ObjectModel.KeyedCollection%602>. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1107,7 +1107,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  This code example uses objects with immutable keys. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.vb" id="Snippet1":::
 
  Example 2
 
@@ -1118,7 +1118,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  In order to maintain the connection between a `MutableKey` object and the `MutableKeys` collection and to prevent an object from being inserted into two collections, the `MutableKey` class has an `internal` (`Friend` in Visual Basic) `Collection` field. This field is maintained by the protected methods that provide custom behavior for adding and removing items from the collection, such as the <xref:System.Collections.ObjectModel.KeyedCollection%602.InsertItem%2A> method. The field is set when the item is added to a collection and cleared when the item is removed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ChangeItemKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollectionMutable/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ClearItems/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1203,7 +1203,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  This code example uses objects with immutable keys. For a code example that uses mutable keys, see <xref:System.Collections.ObjectModel.KeyedCollection%602.ChangeItemKey%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollection2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/Overview/source1.vb" id="Snippet1":::
 
  Example 2
 
@@ -1214,7 +1214,7 @@ In order to maintain the connection between a `MutableKey` object and the `Mutab
  In order to maintain the connection between a `MutableKey` object and the `MutableKeys` collection and to prevent an object from being inserted into two collections, the `MutableKey` class has an `internal` (`Friend` in Visual Basic) `Collection` field. This field is maintained by the protected methods that provide custom behavior for adding and removing items from the collection, such as the <xref:System.Collections.ObjectModel.KeyedCollection%602.InsertItem%2A> method. The field is set when the item is added to a collection and cleared when the item is removed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ChangeItemKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/KeyedCollectionMutable/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/KeyedCollectionTKey,TItem/ClearItems/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections.ObjectModel/ReadOnlyCollection`1.xml b/xml/System.Collections.ObjectModel/ReadOnlyCollection`1.xml
index d0275309d84..317af67aafe 100644
--- a/xml/System.Collections.ObjectModel/ReadOnlyCollection`1.xml
+++ b/xml/System.Collections.ObjectModel/ReadOnlyCollection`1.xml
@@ -135,7 +135,7 @@
  Finally, the code example creates an array larger than the collection and uses the <xref:System.Collections.ObjectModel.ReadOnlyCollection%601.CopyTo%2A> method to insert the elements of the collection into the middle of the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -211,7 +211,7 @@
  Finally, the code example creates an array larger than the collection and uses the <xref:System.Collections.ObjectModel.ReadOnlyCollection%601.CopyTo%2A> method to insert the elements of the collection into the middle of the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -293,7 +293,7 @@
  Finally, the code example creates an array larger than the collection and uses the <xref:System.Collections.ObjectModel.ReadOnlyCollection%601.CopyTo%2A> method to insert the elements of the collection into the middle of the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -370,7 +370,7 @@
  Finally, the code example creates an array larger than the collection and uses the <xref:System.Collections.ObjectModel.ReadOnlyCollection%601.CopyTo%2A> method to insert the elements of the collection into the middle of the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -449,7 +449,7 @@
  Finally, the code example creates an array larger than the collection and uses the <xref:System.Collections.ObjectModel.ReadOnlyCollection%601.CopyTo%2A> method to insert the elements of the collection into the middle of the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -561,7 +561,7 @@
  The following code example uses the enumerator to display the contents of a <xref:System.Collections.ObjectModel.ReadOnlyCollection%601> that wraps a <xref:System.Collections.Generic.List%601>. The enumerator is concealed by the `foreach` statement (`For Each` in Visual Basic).
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -706,7 +706,7 @@
  Finally, the code example creates an array larger than the collection and uses the <xref:System.Collections.ObjectModel.ReadOnlyCollection%601.CopyTo%2A> method to insert the elements of the collection into the middle of the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -776,7 +776,7 @@
  Finally, the code example creates an array larger than the collection and uses the <xref:System.Collections.ObjectModel.ReadOnlyCollection%601.CopyTo%2A> method to insert the elements of the collection into the middle of the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/generic.ReadOnlyCollection/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ReadOnlyCollectionT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/ArrayList.xml b/xml/System.Collections/ArrayList.xml
index 7ec51290172..8e90f242f6b 100644
--- a/xml/System.Collections/ArrayList.xml
+++ b/xml/System.Collections/ArrayList.xml
@@ -1745,7 +1745,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example gets the enumerator for an <xref:System.Collections.ArrayList>, and the enumerator for a range of elements in the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/GetEnumerator/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/collections.arraylist.getenumerator/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/GetEnumerator/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1834,7 +1834,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example gets the enumerator for an <xref:System.Collections.ArrayList>, and the enumerator for a range of elements in the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/GetEnumerator/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/collections.arraylist.getenumerator/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/GetEnumerator/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/DictionaryEntry.xml b/xml/System.Collections/DictionaryEntry.xml
index 3149f4daa75..1ec56de1c2d 100644
--- a/xml/System.Collections/DictionaryEntry.xml
+++ b/xml/System.Collections/DictionaryEntry.xml
@@ -256,7 +256,7 @@ The <xref:System.Collections.IDictionaryEnumerator.Entry%2A?displayProperty=name
  The following example demonstrates the <xref:System.Collections.DictionaryEntry.Key%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.DictionaryEntry> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -318,7 +318,7 @@ The <xref:System.Collections.IDictionaryEnumerator.Entry%2A?displayProperty=name
  The following example demonstrates the <xref:System.Collections.DictionaryEntry.Value%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.DictionaryEntry> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/IDictionary.xml b/xml/System.Collections/IDictionary.xml
index a4c90992e2c..ad37126af7a 100644
--- a/xml/System.Collections/IDictionary.xml
+++ b/xml/System.Collections/IDictionary.xml
@@ -75,7 +75,7 @@
  The `foreach` statement of the C# language (`For Each` in Visual Basic) returns an object of the type of the elements in the collection. Since each element of the <xref:System.Collections.IDictionary> object is a key/value pair, the element type is not the type of the key or the type of the value. Instead, the element type is <xref:System.Collections.DictionaryEntry>. For example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/remarks.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/remarks.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/remarks.vb" id="Snippet14":::
 
  The `foreach` statement is a wrapper around the enumerator, which allows only reading from but not writing to the collection.
 
@@ -85,7 +85,7 @@
  The following code example demonstrates how to define a simple dictionary class that implements the <xref:System.Collections.IDictionary> interface.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -165,7 +165,7 @@
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.Add%2A> method. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -229,7 +229,7 @@
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.Clear%2A> method. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -295,7 +295,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.Contains%2A> method. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -428,7 +428,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.IsFixedSize%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -489,7 +489,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.IsReadOnly%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -566,7 +566,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.Item%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -634,7 +634,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.Keys%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -698,7 +698,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.Remove%2A> method. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -765,7 +765,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example demonstrates how to implement the <xref:System.Collections.IDictionary.Values%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/IDictionaryEnumerator.xml b/xml/System.Collections/IDictionaryEnumerator.xml
index 27a4c712dd3..f2aa2507534 100644
--- a/xml/System.Collections/IDictionaryEnumerator.xml
+++ b/xml/System.Collections/IDictionaryEnumerator.xml
@@ -81,7 +81,7 @@
  This code example shows how to define a dictionary enumerator that implements the <xref:System.Collections.IDictionaryEnumerator> interface.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Configuration.Install/AssemblyInstaller.xml b/xml/System.Configuration.Install/AssemblyInstaller.xml
index 217161b94b4..d2d38f77f26 100644
--- a/xml/System.Configuration.Install/AssemblyInstaller.xml
+++ b/xml/System.Configuration.Install/AssemblyInstaller.xml
@@ -25,7 +25,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller/CPP/assemblyinstaller.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/Overview/assemblyinstaller.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller/VB/assemblyinstaller.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/Overview/assemblyinstaller.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -66,7 +66,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_Install/CPP/assemblyinstaller_install.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_install.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Install/VB/assemblyinstaller_install.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_install.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -136,7 +136,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_Uninstall/CPP/assemblyinstaller_uninstall.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_uninstall.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Uninstall/VB/assemblyinstaller_uninstall.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_uninstall.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -217,7 +217,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_CheckIfInstallable/CPP/assemblyinstaller_checkifinstallable.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/CheckIfInstallable/assemblyinstaller_checkifinstallable.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_CheckIfInstallable/VB/assemblyinstaller_checkifinstallable.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/CheckIfInstallable/assemblyinstaller_checkifinstallable.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_Rollback/CPP/assemblyinstaller_rollback.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/CommandLine/assemblyinstaller_rollback.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Rollback/VB/assemblyinstaller_rollback.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/CommandLine/assemblyinstaller_rollback.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -299,7 +299,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_Install/CPP/assemblyinstaller_install.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_install.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Install/VB/assemblyinstaller_install.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_install.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -365,7 +365,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_HelpText/CPP/assemblyinstaller_helptext.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/HelpText/assemblyinstaller_helptext.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_HelpText/VB/assemblyinstaller_helptext.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/HelpText/assemblyinstaller_helptext.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -410,7 +410,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_Install/CPP/assemblyinstaller_install.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_install.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Install/VB/assemblyinstaller_install.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_install.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -465,7 +465,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_Rollback/CPP/assemblyinstaller_rollback.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/CommandLine/assemblyinstaller_rollback.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Rollback/VB/assemblyinstaller_rollback.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/CommandLine/assemblyinstaller_rollback.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -507,7 +507,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_Rollback/CPP/assemblyinstaller_rollback.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/CommandLine/assemblyinstaller_rollback.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Rollback/VB/assemblyinstaller_rollback.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/CommandLine/assemblyinstaller_rollback.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -579,7 +579,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_Uninstall/CPP/assemblyinstaller_uninstall.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_uninstall.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_Uninstall/VB/assemblyinstaller_uninstall.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/.ctor/assemblyinstaller_uninstall.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -646,7 +646,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller_HelpText/CPP/assemblyinstaller_helptext.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/AssemblyInstaller/HelpText/assemblyinstaller_helptext.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller_HelpText/VB/assemblyinstaller_helptext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/AssemblyInstaller/HelpText/assemblyinstaller_helptext.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Configuration.Install/ComponentInstaller.xml b/xml/System.Configuration.Install/ComponentInstaller.xml
index 68eb2e10540..a2504021311 100644
--- a/xml/System.Configuration.Install/ComponentInstaller.xml
+++ b/xml/System.Configuration.Install/ComponentInstaller.xml
@@ -78,7 +78,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ComponentInstaller_CopyFromComponent/CPP/componentinstaller_copyfromcomponent.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/ComponentInstaller/CopyFromComponent/componentinstaller_copyfromcomponent.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ComponentInstaller_CopyFromComponent/VB/componentinstaller_copyfromcomponent.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/ComponentInstaller/CopyFromComponent/componentinstaller_copyfromcomponent.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -122,7 +122,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ComponentInstaller_CopyFromComponent/CPP/componentinstaller_copyfromcomponent.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/ComponentInstaller/CopyFromComponent/componentinstaller_copyfromcomponent.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ComponentInstaller_CopyFromComponent/VB/componentinstaller_copyfromcomponent.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/ComponentInstaller/CopyFromComponent/componentinstaller_copyfromcomponent.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Configuration.Install/InstallContext.xml b/xml/System.Configuration.Install/InstallContext.xml
index 8bb0cad9aec..0691dea2762 100644
--- a/xml/System.Configuration.Install/InstallContext.xml
+++ b/xml/System.Configuration.Install/InstallContext.xml
@@ -40,7 +40,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallContext_InstallContext/CPP/installcontext_installcontext.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallContext_InstallContext/VB/installcontext_installcontext.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -91,7 +91,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallContext_InstallContext/CPP/installcontext_installcontext.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallContext_InstallContext/VB/installcontext_installcontext.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -134,7 +134,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallContext_InstallContext/CPP/installcontext_installcontext.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallContext_InstallContext/VB/installcontext_installcontext.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -185,7 +185,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallContext_InstallContext/CPP/installcontext_installcontext.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallContext_InstallContext/VB/installcontext_installcontext.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -230,7 +230,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallContext_InstallContext/CPP/installcontext_installcontext.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallContext_InstallContext/VB/installcontext_installcontext.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -272,7 +272,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallContext_InstallContext/CPP/installcontext_installcontext.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallContext_InstallContext/VB/installcontext_installcontext.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallContext/Overview/installcontext_installcontext.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Configuration.Install/InstallEventArgs.xml b/xml/System.Configuration.Install/InstallEventArgs.xml
index c49945f8399..fceff91cb1d 100644
--- a/xml/System.Configuration.Install/InstallEventArgs.xml
+++ b/xml/System.Configuration.Install/InstallEventArgs.xml
@@ -32,7 +32,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallEventArgs/CPP/installeventargs.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallEventArgs/VB/installeventargs.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -87,7 +87,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallEventArgs/CPP/installeventargs.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallEventArgs/VB/installeventargs.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -124,7 +124,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallEventArgs/CPP/installeventargs.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallEventArgs/VB/installeventargs.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -162,7 +162,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallEventArgs/CPP/installeventargs.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallEventArgs/VB/installeventargs.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallEventArgs/Overview/installeventargs.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Configuration.Install/InstallException.xml b/xml/System.Configuration.Install/InstallException.xml
index 26337349253..13b74a9e1aa 100644
--- a/xml/System.Configuration.Install/InstallException.xml
+++ b/xml/System.Configuration.Install/InstallException.xml
@@ -40,7 +40,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallException/CPP/installexception.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallException/Overview/installexception.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallException/VB/installexception.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallException/Overview/installexception.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -88,7 +88,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallException/CPP/installexception.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallException/Overview/installexception.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallException/VB/installexception.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallException/Overview/installexception.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -127,7 +127,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallException/CPP/installexception.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallException/Overview/installexception.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallException/VB/installexception.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallException/Overview/installexception.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Configuration.Install/Installer.xml b/xml/System.Configuration.Install/Installer.xml
index 5725f5553f3..89b86c6716a 100644
--- a/xml/System.Configuration.Install/Installer.xml
+++ b/xml/System.Configuration.Install/Installer.xml
@@ -62,7 +62,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer/CPP/installer.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Overview/installer.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer/VB/installer.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Overview/installer.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -119,7 +119,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_AfterInstall/CPP/installer_afterinstall.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/AfterInstall/installer_afterinstall.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_AfterInstall/VB/installer_afterinstall.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/AfterInstall/installer_afterinstall.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -155,7 +155,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_AfterRollback/CPP/installer_afterrollback.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/AfterRollback/installer_afterrollback.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_AfterRollback/VB/installer_afterrollback.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/AfterRollback/installer_afterrollback.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -191,7 +191,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_AfterUninstall/CPP/installer_afteruninstall.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/AfterUninstall/installer_afteruninstall.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_AfterUninstall/VB/installer_afteruninstall.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/AfterUninstall/installer_afteruninstall.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -227,7 +227,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_BeforeInstall/CPP/installer_beforeinstall.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/BeforeInstall/installer_beforeinstall.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeInstall/VB/installer_beforeinstall.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/BeforeInstall/installer_beforeinstall.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -263,7 +263,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_BeforeRollback/CPP/installer_beforerollback.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/BeforeRollback/installer_beforerollback.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeRollback/VB/installer_beforerollback.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/BeforeRollback/installer_beforerollback.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -299,7 +299,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_BeforeUninstall/CPP/installer_beforeuninstall.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/BeforeUninstall/installer_beforeuninstall.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_BeforeUninstall/VB/installer_beforeuninstall.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/BeforeUninstall/installer_beforeuninstall.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -339,7 +339,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Install/CPP/installer_install.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Commit/installer_install.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Install/VB/installer_install.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Commit/installer_install.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -386,7 +386,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Committed1/CPP/installer_committed.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Committed/installer_committed.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Committed1/VB/installer_committed.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Committed/installer_committed.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -422,7 +422,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Committing/CPP/installer_committing.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Committing/installer_committing.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Committing/VB/installer_committing.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Committing/installer_committing.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -478,7 +478,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Context/CPP/installer_context.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Context/installer_context.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Context/VB/installer_context.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Context/installer_context.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -518,7 +518,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_HelpText/CPP/installer_helptext.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/HelpText/installer_helptext.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_HelpText/VB/installer_helptext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/HelpText/installer_helptext.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -557,7 +557,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Install/CPP/installer_install.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Commit/installer_install.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Install/VB/installer_install.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Commit/installer_install.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -625,7 +625,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Installers/CPP/installer_installers.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Installers/installer_installers.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Installers/VB/installer_installers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Installers/installer_installers.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -680,7 +680,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_OnInstall/CPP/installer_oninstall.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/OnAfterInstall/installer_oninstall.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_OnInstall/VB/installer_oninstall.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/OnAfterInstall/installer_oninstall.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -829,7 +829,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_OnInstall/CPP/installer_oninstall.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/OnAfterInstall/installer_oninstall.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_OnInstall/VB/installer_oninstall.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/OnAfterInstall/installer_oninstall.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -979,7 +979,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Committed/CPP/installer_committed.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/OnCommitted/installer_committed.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Committed/VB/installer_committed.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/OnCommitted/installer_committed.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1035,7 +1035,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Committed/CPP/installer_committed.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/OnCommitted/installer_committed.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Committed/VB/installer_committed.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/OnCommitted/installer_committed.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1104,7 +1104,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Installers/CPP/installer_installers.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Installers/installer_installers.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Installers/VB/installer_installers.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Installers/installer_installers.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1147,7 +1147,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Rollback/CPP/installer_rollback.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Rollback/installer_rollback.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Rollback/VB/installer_rollback.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Rollback/installer_rollback.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1198,7 +1198,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Installer_Uninstall/CPP/installer_uninstall.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/Installer/Uninstall/installer_uninstall.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Installer_Uninstall/VB/installer_uninstall.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/Installer/Uninstall/installer_uninstall.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Configuration.Install/InstallerCollection.xml b/xml/System.Configuration.Install/InstallerCollection.xml
index 912e69a5b56..63e7ed8c48c 100644
--- a/xml/System.Configuration.Install/InstallerCollection.xml
+++ b/xml/System.Configuration.Install/InstallerCollection.xml
@@ -44,7 +44,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_Add/CPP/installercollection_add.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/Overview/installercollection_add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Add/VB/installercollection_add.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Overview/installercollection_add.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -94,7 +94,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_Add/CPP/installercollection_add.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/Overview/installercollection_add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Add/VB/installercollection_add.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Overview/installercollection_add.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -148,7 +148,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_AddRange1/CPP/installercollection_addrange1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/AddRange/installercollection_addrange1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_AddRange1/VB/installercollection_addrange1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/AddRange/installercollection_addrange1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -193,7 +193,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_Insert/CPP/installercollection_insert.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/AddRange/installercollection_insert.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Insert/VB/installercollection_insert.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/AddRange/installercollection_insert.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -235,7 +235,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_Remove/CPP/installercollection_remove.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/Contains/installercollection_remove.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Remove/VB/installercollection_remove.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Contains/installercollection_remove.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -278,7 +278,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_CopyTo/CPP/installercollection_copyto.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/CopyTo/installercollection_copyto.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_CopyTo/VB/installercollection_copyto.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/CopyTo/installercollection_copyto.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -316,7 +316,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_Remove/CPP/installercollection_remove.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/Contains/installercollection_remove.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Remove/VB/installercollection_remove.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Contains/installercollection_remove.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -355,7 +355,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_Insert/CPP/installercollection_insert.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/AddRange/installercollection_insert.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Insert/VB/installercollection_insert.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/AddRange/installercollection_insert.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -398,7 +398,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_Item/CPP/installercollection_item.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/Item/installercollection_item.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Item/VB/installercollection_item.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Item/installercollection_item.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -527,7 +527,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/InstallerCollection_Remove/CPP/installercollection_remove.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/InstallerCollection/Contains/installercollection_remove.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InstallerCollection_Remove/VB/installercollection_remove.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/InstallerCollection/Contains/installercollection_remove.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Configuration.Install/TransactedInstaller.xml b/xml/System.Configuration.Install/TransactedInstaller.xml
index c0ea0f45917..96e550c2e0b 100644
--- a/xml/System.Configuration.Install/TransactedInstaller.xml
+++ b/xml/System.Configuration.Install/TransactedInstaller.xml
@@ -32,7 +32,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/TransactedInstaller/CPP/transactedinstaller.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/TransactedInstaller/Overview/transactedinstaller.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TransactedInstaller/VB/transactedinstaller.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/TransactedInstaller/Overview/transactedinstaller.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -95,7 +95,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/TransactedInstaller/CPP/transactedinstaller.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/TransactedInstaller/Overview/transactedinstaller.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TransactedInstaller/VB/transactedinstaller.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/TransactedInstaller/Overview/transactedinstaller.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -153,7 +153,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/TransactedInstaller/CPP/transactedinstaller.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/TransactedInstaller/Overview/transactedinstaller.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TransactedInstaller/VB/transactedinstaller.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/TransactedInstaller/Overview/transactedinstaller.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Configuration.Install/UninstallAction.xml b/xml/System.Configuration.Install/UninstallAction.xml
index f179ef6e126..99f22482beb 100644
--- a/xml/System.Configuration.Install/UninstallAction.xml
+++ b/xml/System.Configuration.Install/UninstallAction.xml
@@ -24,7 +24,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/UninstallAction_NoAction_Remove_3/CPP/uninstallaction_noaction_remove_3.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Configuration.Install/UninstallAction/Overview/uninstallaction_noaction_remove_3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/UninstallAction_NoAction_Remove_3/VB/uninstallaction_noaction_remove_3.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Configuration.Install/UninstallAction/Overview/uninstallaction_noaction_remove_3.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics.Contracts/Contract.xml b/xml/System.Diagnostics.Contracts/Contract.xml
index b098bd1ff8b..fc1f7272cef 100644
--- a/xml/System.Diagnostics.Contracts/Contract.xml
+++ b/xml/System.Diagnostics.Contracts/Contract.xml
@@ -566,7 +566,7 @@
  The following example shows how to use the <xref:System.Diagnostics.Contracts.Contract.Ensures%2A> method to ensure that an expected value is returned. This code example is part of a larger example provided for the <xref:System.Diagnostics.Contracts.ContractClassAttribute> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Contracts/Contract/Ensures/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/contractexample/vb/program.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Contracts/Contract/Ensures/program.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1006,7 +1006,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.Contracts.Contract.ForAll%2A> method to determine whether an array has a null element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Contracts/Contract/ForAll/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/contract.forallexample/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Contracts/Contract/ForAll/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1085,7 +1085,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.Contracts.Contract.ForAll%2A> method to determine whether a collection has a null element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Contracts/Contract/ForAll/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/contract.forallexample/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Contracts/Contract/ForAll/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1311,7 +1311,7 @@
  The following example shows the use of the <xref:System.Diagnostics.Contracts.Contract.OldValue%2A> method to ensure that a count has been updated. This code example is part of a larger example provided for the <xref:System.Diagnostics.Contracts.ContractClassAttribute> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Contracts/Contract/Ensures/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/contractexample/vb/program.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Contracts/Contract/Ensures/program.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1676,7 +1676,7 @@
  The following example shows how to use the <xref:System.Diagnostics.Contracts.Contract.Result%2A> method to specify an expected return value. This code example is part of a larger example provided for the <xref:System.Diagnostics.Contracts.ContractClassAttribute> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Contracts/Contract/Ensures/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/contractexample/vb/program.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Contracts/Contract/Ensures/program.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics.Contracts/ContractClassAttribute.xml b/xml/System.Diagnostics.Contracts/ContractClassAttribute.xml
index 58058bdd140..aebd8f33a71 100644
--- a/xml/System.Diagnostics.Contracts/ContractClassAttribute.xml
+++ b/xml/System.Diagnostics.Contracts/ContractClassAttribute.xml
@@ -72,7 +72,7 @@
  The following example shows how to use the <xref:System.Diagnostics.Contracts.ContractClassAttribute> attribute to specify that the contracts for the `IArray` interface are contained in the `IArrayContracts` class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Contracts/Contract/Ensures/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/contractexample/vb/program.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Contracts/Contract/Ensures/program.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -122,7 +122,7 @@
  The following example shows how to use the <xref:System.Diagnostics.Contracts.ContractClassAttribute.%23ctor%2A> constructor to specify that the contracts for the `IArray` interface are contained in the `IArrayContracts` class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Contracts/Contract/Ensures/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/contractexample/vb/program.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Contracts/Contract/Ensures/program.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.xml b/xml/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.xml
index aca47bb5bcb..0bcae6b7d97 100644
--- a/xml/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.xml
+++ b/xml/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.xml
@@ -62,7 +62,7 @@
  The following code example demonstrates how an <xref:System.Diagnostics.SymbolStore.ISymbolDocumentWriter> can be obtained when calling <xref:System.Reflection.Emit.ModuleBuilder.DefineDocument%2A>.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineDocument/VB/modulebuilder_definedocument.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics.SymbolStore/SymDocumentType.xml b/xml/System.Diagnostics.SymbolStore/SymDocumentType.xml
index 023c478d51a..18366546f88 100644
--- a/xml/System.Diagnostics.SymbolStore/SymDocumentType.xml
+++ b/xml/System.Diagnostics.SymbolStore/SymDocumentType.xml
@@ -56,7 +56,7 @@
  The following example demonstrates how <xref:System.Diagnostics.SymbolStore.SymDocumentType> is used when calling the <xref:System.Reflection.Emit.ModuleBuilder.DefineDocument%2A> method.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineDocument/VB/modulebuilder_definedocument.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics.SymbolStore/SymLanguageType.xml b/xml/System.Diagnostics.SymbolStore/SymLanguageType.xml
index bb6ee29ef0c..48ae2c7d44e 100644
--- a/xml/System.Diagnostics.SymbolStore/SymLanguageType.xml
+++ b/xml/System.Diagnostics.SymbolStore/SymLanguageType.xml
@@ -56,7 +56,7 @@
  The following code example demonstrates how <xref:System.Diagnostics.SymbolStore.SymLanguageType> is used when calling <xref:System.Reflection.Emit.ModuleBuilder.DefineDocument%2A>.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineDocument/VB/modulebuilder_definedocument.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics.SymbolStore/SymLanguageVendor.xml b/xml/System.Diagnostics.SymbolStore/SymLanguageVendor.xml
index 5bcd5a5148a..8bf434d136b 100644
--- a/xml/System.Diagnostics.SymbolStore/SymLanguageVendor.xml
+++ b/xml/System.Diagnostics.SymbolStore/SymLanguageVendor.xml
@@ -56,7 +56,7 @@
  The following code example demonstrates how <xref:System.Diagnostics.SymbolStore.SymLanguageVendor> is used when calling <xref:System.Reflection.Emit.ModuleBuilder.DefineDocument%2A>.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineDocument/VB/modulebuilder_definedocument.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics.Tracing/EventAttribute.xml b/xml/System.Diagnostics.Tracing/EventAttribute.xml
index 86a6580a9d8..b5e7e84b9b3 100644
--- a/xml/System.Diagnostics.Tracing/EventAttribute.xml
+++ b/xml/System.Diagnostics.Tracing/EventAttribute.xml
@@ -71,16 +71,16 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventAttribute> class to define a variety of events. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet6":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet7":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet8":::  
   
  ]]></format>
     </remarks>
@@ -133,10 +133,10 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventAttribute.%23ctor%2A> constructor to specify events. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet1":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -321,16 +321,16 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventAttribute.Keywords%2A> property to define event keywords. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet3":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet6":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -383,13 +383,13 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventAttribute.Level%2A> property to specify event levels. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet6":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -454,13 +454,13 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventAttribute.Message%2A> property to specify event messages. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet6":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -513,13 +513,13 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventAttribute.Opcode%2A> property to specify operation codes. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet8":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet9":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -613,13 +613,13 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventAttribute.Task%2A> property to define event tasks. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet4":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet8":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics.Tracing/EventKeywords.xml b/xml/System.Diagnostics.Tracing/EventKeywords.xml
index 5b345524cdb..2b0438478c3 100644
--- a/xml/System.Diagnostics.Tracing/EventKeywords.xml
+++ b/xml/System.Diagnostics.Tracing/EventKeywords.xml
@@ -66,7 +66,7 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventKeywords> class to redefine event keywords. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics.Tracing/EventLevel.xml b/xml/System.Diagnostics.Tracing/EventLevel.xml
index 110267de7e5..bc0189fc516 100644
--- a/xml/System.Diagnostics.Tracing/EventLevel.xml
+++ b/xml/System.Diagnostics.Tracing/EventLevel.xml
@@ -61,17 +61,17 @@
 The following example shows how to use the `Error` enumeration member to identify an error message. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::  
 
 The following example shows how to use the `Informational` enumeration member to identify an informational message. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet6":::  
 
 The following example shows how to use the `Verbose` enumeration member to identify a verbose message. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet11":::  
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics.Tracing/EventOpcode.xml b/xml/System.Diagnostics.Tracing/EventOpcode.xml
index fc2f498aa46..41ca4b65f0c 100644
--- a/xml/System.Diagnostics.Tracing/EventOpcode.xml
+++ b/xml/System.Diagnostics.Tracing/EventOpcode.xml
@@ -56,12 +56,12 @@
 The following example shows how to use the `Start` enumeration member to specify a start operation. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
   
 :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet7":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet7":::  
   
 The following example shows how to use the `Stop` enumeration member to specify a stop operation. This example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
 :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet8":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet8":::
+:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet8":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics.Tracing/EventSource.xml b/xml/System.Diagnostics.Tracing/EventSource.xml
index f928917db34..9ef8731dc42 100644
--- a/xml/System.Diagnostics.Tracing/EventSource.xml
+++ b/xml/System.Diagnostics.Tracing/EventSource.xml
@@ -2311,7 +2311,7 @@ public void Info1(string arg1)
  The following example shows how to use this method overload to write an event. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2501,7 +2501,7 @@ public void Info1(int  arg1)
  The following example shows how to use this method overload to write an event. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -2751,7 +2751,7 @@ public void Info1(string arg1)
  The following example shows how to use this method overload to write an event. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics.Tracing/EventTask.xml b/xml/System.Diagnostics.Tracing/EventTask.xml
index 01364ae979e..18fceca9feb 100644
--- a/xml/System.Diagnostics.Tracing/EventTask.xml
+++ b/xml/System.Diagnostics.Tracing/EventTask.xml
@@ -60,7 +60,7 @@
  The following example shows how to use the <xref:System.Diagnostics.Tracing.EventTask> class to define event tasks. This code example is part of a larger example provided for the <xref:System.Diagnostics.Tracing.EventSource> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.Tracing/EventAttribute/Overview/program.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/etwtrace/vb/program.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.Tracing/EventAttribute/Overview/program.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics/ConditionalAttribute.xml b/xml/System.Diagnostics/ConditionalAttribute.xml
index 715f3111aae..87683d431dc 100644
--- a/xml/System.Diagnostics/ConditionalAttribute.xml
+++ b/xml/System.Diagnostics/ConditionalAttribute.xml
@@ -119,7 +119,7 @@
  The following example demonstrates the use of <xref:System.Diagnostics.ConditionalAttribute>. The example assumes that the condition is defined with the **/define** compiler option. You can obtain different results by changing the compiler option. You can optionally define the conditions by using pragmas in the sample code instead of identifying them as compiler options.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ConditionalAttribute/Overview/cas.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConditionalAttributeSample1/VB/cas.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ConditionalAttribute/Overview/cas.vb" id="Snippet7":::
 
  ]]></format>
     </remarks>
@@ -174,7 +174,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.ConditionalAttribute.%23ctor%2A> constructor. This example is part of a larger example provided for the <xref:System.Diagnostics.ConditionalAttribute> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ConditionalAttribute/Overview/cas.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConditionalAttributeSample1/VB/cas.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ConditionalAttribute/Overview/cas.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/ConsoleTraceListener.xml b/xml/System.Diagnostics/ConsoleTraceListener.xml
index cf4c4598c05..b93b3cd5925 100644
--- a/xml/System.Diagnostics/ConsoleTraceListener.xml
+++ b/xml/System.Diagnostics/ConsoleTraceListener.xml
@@ -80,7 +80,7 @@ For .NET Framework apps, to direct all trace and debug messages to the console w
  When the example application runs, the environment and trace configuration details are written to the specified console output stream through the <xref:System.Diagnostics.ConsoleTraceListener> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ConsoleTraceListener/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_ConsoleTraceListener/VB/consoletrace.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ConsoleTraceListener/Overview/consoletrace.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -138,7 +138,7 @@ For .NET Framework apps, to direct all trace and debug messages to the console w
  The following code example initializes a <xref:System.Diagnostics.ConsoleTraceListener> object for the specified <xref:System.Console> output stream and adds it to the trace listener collection. This code example is part of a larger example provided for the <xref:System.Diagnostics.ConsoleTraceListener> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ConsoleTraceListener/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_ConsoleTraceListener/VB/consoletrace.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ConsoleTraceListener/Overview/consoletrace.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@ For .NET Framework apps, to direct all trace and debug messages to the console w
  The following code example initializes a <xref:System.Diagnostics.ConsoleTraceListener> object for the specified <xref:System.Console> output stream and adds it to the trace listener collection. This code example is part of a larger example provided for the <xref:System.Diagnostics.ConsoleTraceListener> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ConsoleTraceListener/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_ConsoleTraceListener/VB/consoletrace.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ConsoleTraceListener/Overview/consoletrace.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/CounterCreationData.xml b/xml/System.Diagnostics/CounterCreationData.xml
index 17407587a68..41b788b3953 100644
--- a/xml/System.Diagnostics/CounterCreationData.xml
+++ b/xml/System.Diagnostics/CounterCreationData.xml
@@ -58,7 +58,7 @@
  The following code example demonstrates how to use the <xref:System.Diagnostics.CounterCreationData> class to define custom counters. This example creates counters that display how many items are processed in an operation. The example initializes the counters, collects information from them, and then calculates and displays the results to the console.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -110,7 +110,7 @@
  The following code example shows how to create an empty instance of the <xref:System.Diagnostics.CounterCreationData> class. Because the example does not pass in any parameters, the <xref:System.Diagnostics.CounterCreationData.CounterHelp%2A>, <xref:System.Diagnostics.CounterCreationData.CounterName%2A>, and <xref:System.Diagnostics.CounterCreationData.CounterType%2A> properties are not specified and must be defined later.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_CounterCreationData/VB/diagnostics_countercreationdata.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -161,7 +161,7 @@
  The following code example shows how to create an instance of the <xref:System.Diagnostics.CounterCreationData> class, and pass in parameters to set the <xref:System.Diagnostics.CounterCreationData.CounterHelp%2A>, <xref:System.Diagnostics.CounterCreationData.CounterName%2A> and <xref:System.Diagnostics.CounterCreationData.CounterType%2A> properties of the object when it is initialized.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_CounterCreationData/VB/diagnostics_countercreationdata.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -225,7 +225,7 @@
  The following code example demonstrates how to get and set the <xref:System.Diagnostics.CounterCreationData.CounterHelp%2A> property. This example creates two counters and sets their <xref:System.Diagnostics.CounterCreationData.CounterHelp%2A> property by using different techniques. When the first counter is initialized, the <xref:System.Diagnostics.CounterCreationData.CounterHelp%2A> data is passed to the constructor, whereas the second counter sets the property explicitly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_CounterCreationData/VB/diagnostics_countercreationdata.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -299,7 +299,7 @@
  The following code example demonstrates how to get and set the <xref:System.Diagnostics.CounterCreationData.CounterName%2A> property. This example creates two counters and sets their <xref:System.Diagnostics.CounterCreationData.CounterName%2A> property by using different techniques. When the first counter is initialized, the <xref:System.Diagnostics.CounterCreationData.CounterName%2A> data is passed to the constructor, whereas the second counter sets the property explicitly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_CounterCreationData/VB/diagnostics_countercreationdata.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -362,7 +362,7 @@
  The following code example demonstrates how to get and set the <xref:System.Diagnostics.CounterCreationData.CounterType%2A> property. This example creates two counters and sets their <xref:System.Diagnostics.CounterCreationData.CounterType%2A> property by using different techniques. When the first counter is initialized, the <xref:System.Diagnostics.CounterCreationData.CounterType%2A> data is passed to the constructor, whereas the second counter sets the property explicitly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diagnostics_CounterCreationData/VB/diagnostics_countercreationdata.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/.ctor/diagnostics_countercreationdata.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/CounterCreationDataCollection.xml b/xml/System.Diagnostics/CounterCreationDataCollection.xml
index 23e6148013e..8810002199d 100644
--- a/xml/System.Diagnostics/CounterCreationDataCollection.xml
+++ b/xml/System.Diagnostics/CounterCreationDataCollection.xml
@@ -46,7 +46,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.CounterCreationDataCollection> class. The example creates a new instance of the class and uses several methods to add statements to the collection, return their index, and add or remove attributes at a specific index point.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -135,7 +135,7 @@
  The following example demonstrates how to create a <xref:System.Diagnostics.CounterCreationDataCollection> object by using a <xref:System.Diagnostics.CounterCreationData> array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationDataCollection/.ctor/countercreationdatacollection_ctor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_CounterCreationData/VB/countercreationdatacollection_ctor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/.ctor/countercreationdatacollection_ctor.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -181,7 +181,7 @@
  The following example demonstrates how to create a <xref:System.Diagnostics.CounterCreationDataCollection> object by using <xref:System.Diagnostics.CounterCreationData> objects from another <xref:System.Diagnostics.CounterCreationDataCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationDataCollection/.ctor/countercreationdatacollection_ctor_countercreationdatacollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_CounterCreationDataCollection/VB/countercreationdatacollection_ctor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/.ctor/countercreationdatacollection_ctor1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -231,7 +231,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.CounterCreationDataCollection.Add%2A> method to add a <xref:System.Diagnostics.CounterCreationData> object to a <xref:System.Diagnostics.CounterCreationDataCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -330,7 +330,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.CounterCreationDataCollection.AddRange%28System.Diagnostics.CounterCreationDataCollection%29> method overload to add <xref:System.Diagnostics.CounterCreationData> objects from one <xref:System.Diagnostics.CounterCreationDataCollection> to another <xref:System.Diagnostics.CounterCreationDataCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationDataCollection/AddRange/countercreationdatacollection_addrange.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_AddRange/VB/countercreationdatacollection_addrange.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/AddRange/countercreationdatacollection_addrange.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -381,7 +381,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.CounterCreationDataCollection.Contains%2A> method to find a <xref:System.Diagnostics.CounterCreationData> object in a <xref:System.Diagnostics.CounterCreationDataCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationDataCollection/Contains/countercreationdatacollection_contains.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_Contains/VB/countercreationdatacollection_contains.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/Contains/countercreationdatacollection_contains.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -473,7 +473,7 @@
  The following example retrieves <xref:System.Diagnostics.CounterCreationData> entries from a <xref:System.Diagnostics.CounterCreationDataCollection> and uses the <xref:System.Diagnostics.CounterCreationDataCollection.IndexOf%2A> method to display their names and indexes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationDataCollection/IndexOf/countercreationdatacollection_insert_indexof.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_Insert_IndexOf/VB/countercreationdatacollection_insert_indexof.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/IndexOf/countercreationdatacollection_insert_indexof.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -522,7 +522,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.CounterCreationDataCollection.Insert%2A> method to insert a <xref:System.Diagnostics.CounterCreationData> object into a <xref:System.Diagnostics.CounterCreationDataCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationDataCollection/IndexOf/countercreationdatacollection_insert_indexof.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_Insert_IndexOf/VB/countercreationdatacollection_insert_indexof.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/IndexOf/countercreationdatacollection_insert_indexof.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -709,7 +709,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.CounterCreationDataCollection.Remove%2A> method to delete a <xref:System.Diagnostics.CounterCreationData> object from the <xref:System.Diagnostics.CounterCreationDataCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationDataCollection/Contains/countercreationdatacollection_contains.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterCreationDataCollection_Contains/VB/countercreationdatacollection_contains.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationDataCollection/Contains/countercreationdatacollection_contains.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/CounterSample.xml b/xml/System.Diagnostics/CounterSample.xml
index e9c9f265093..fb5ec07f1c4 100644
--- a/xml/System.Diagnostics/CounterSample.xml
+++ b/xml/System.Diagnostics/CounterSample.xml
@@ -54,7 +54,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.CounterSample> class to display data for a performance counter.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -185,9 +185,9 @@
  The following example demonstrates how to initialize a new <xref:System.Diagnostics.CounterSample> structure, passing in values for the `rawValue`, `baseValue`, `counterFrequency`, `systemFrequency`, `timeStamp`, `timeStamp100nSec`, `counterType`, and `counterTimeStamp` parameters. After creating the <xref:System.Diagnostics.CounterSample> structure, the example displays the property values for the <xref:System.Diagnostics.CounterSample> in the console window.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterSample/.ctor/countersample_ctor_2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterSample_Ctor_2/VB/countersample_ctor_2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterSample/.ctor/countersample_ctor_2.vb" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterSample/.ctor/countersample_ctor_2.cs" id="Snippet2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CounterSample_Ctor_2/VB/countersample_ctor_2.vb" id="Snippet2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterSample/.ctor/countersample_ctor_2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -237,7 +237,7 @@
  The following example displays the value of the <xref:System.Diagnostics.CounterSample.BaseValue%2A> property for a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -374,7 +374,7 @@
  The following example displays the value of the <xref:System.Diagnostics.CounterSample.CounterFrequency%2A> property for a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -424,7 +424,7 @@
  The following example displays the value of the <xref:System.Diagnostics.CounterSample.CounterTimeStamp%2A> property for a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -779,7 +779,7 @@
  The following example displays the value of the <xref:System.Diagnostics.CounterSample.RawValue%2A> property for a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -829,7 +829,7 @@
  The following example displays the value of the <xref:System.Diagnostics.CounterSample.SystemFrequency%2A> property for a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -879,7 +879,7 @@
  The following example displays the value of the <xref:System.Diagnostics.CounterSample.TimeStamp%2A> property for a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -929,7 +929,7 @@
  The following example displays the value of the <xref:System.Diagnostics.CounterSample.TimeStamp100nSec%2A> property for a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/CounterSampleCalculator.xml b/xml/System.Diagnostics/CounterSampleCalculator.xml
index 3cb8eb89a52..4589bbfbf02 100644
--- a/xml/System.Diagnostics/CounterSampleCalculator.xml
+++ b/xml/System.Diagnostics/CounterSampleCalculator.xml
@@ -149,7 +149,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.CounterSampleCalculator.ComputeCounterValue%28System.Diagnostics.CounterSample%2CSystem.Diagnostics.CounterSample%29> method overload to calculate the value of two raw counter samples.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/DataReceivedEventArgs.xml b/xml/System.Diagnostics/DataReceivedEventArgs.xml
index 7330f709035..2c767295c9a 100644
--- a/xml/System.Diagnostics/DataReceivedEventArgs.xml
+++ b/xml/System.Diagnostics/DataReceivedEventArgs.xml
@@ -63,7 +63,7 @@
  The example creates an event delegate for the `SortOutputHandler` event handler and associates it with the <xref:System.Diagnostics.Process.OutputDataReceived> event. The event handler receives text lines from the redirected <xref:System.Diagnostics.Process.StandardOutput%2A> stream, formats the text, and writes the text to the screen.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/sort_async.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -134,7 +134,7 @@
  The following code example illustrates a simple event handler associated with the <xref:System.Diagnostics.Process.OutputDataReceived> event. The event handler receives text lines from the redirected <xref:System.Diagnostics.Process.StandardOutput%2A> stream, formats the text, and writes the text to the screen.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/datareceivedevent.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/datareceivedevent.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/datareceivedevent.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/DataReceivedEventHandler.xml b/xml/System.Diagnostics/DataReceivedEventHandler.xml
index 68d6b14b4f7..8a7bbb7bfdd 100644
--- a/xml/System.Diagnostics/DataReceivedEventHandler.xml
+++ b/xml/System.Diagnostics/DataReceivedEventHandler.xml
@@ -67,7 +67,7 @@
  The example creates a <xref:System.Diagnostics.DataReceivedEventHandler> delegate for the `SortOutputHandler` event handler and associates the delegate with the <xref:System.Diagnostics.Process.OutputDataReceived> event. The event handler receives text lines from the redirected <xref:System.Diagnostics.Process.StandardOutput%2A> stream, formats the text, and writes the text to the screen.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/sort_async.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics/EntryWrittenEventArgs.xml b/xml/System.Diagnostics/EntryWrittenEventArgs.xml
index aae16534ac3..3bdfe98466a 100644
--- a/xml/System.Diagnostics/EntryWrittenEventArgs.xml
+++ b/xml/System.Diagnostics/EntryWrittenEventArgs.xml
@@ -39,7 +39,7 @@
  The following example demonstrates the <xref:System.Diagnostics.EntryWrittenEventArgs.%23ctor%2A> constructor. It creates a custom <xref:System.Diagnostics.EventLog> object and writes an entry into it. Then it creates an <xref:System.Diagnostics.EntryWrittenEventArgs> object using the first entry in the custom <xref:System.Diagnostics.EventLog>. This object is used to notify a message.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EntryWrittenEventArgs/Overview/entrywritteneventargs_ctor1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EntryWrittenEventArgs_ctor1/VB/entrywritteneventargs_ctor1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EntryWrittenEventArgs/Overview/entrywritteneventargs_ctor1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -97,7 +97,7 @@
  The following example demonstrates the <xref:System.Diagnostics.EntryWrittenEventArgs.%23ctor%2A> constructor. It creates a custom <xref:System.Diagnostics.EventLog> object and writes an entry into it. Then it creates an <xref:System.Diagnostics.EntryWrittenEventArgs> object using the first entry in the custom <xref:System.Diagnostics.EventLog>. This object is used to notify a message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EntryWrittenEventArgs/Overview/entrywritteneventargs_ctor1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EntryWrittenEventArgs_ctor1/VB/entrywritteneventargs_ctor1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EntryWrittenEventArgs/Overview/entrywritteneventargs_ctor1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -147,7 +147,7 @@
  The following example demonstrates the <xref:System.Diagnostics.EntryWrittenEventArgs.%23ctor%2A> constructor. It creates a custom <xref:System.Diagnostics.EventLog> object and writes an entry into it. Then it creates an <xref:System.Diagnostics.EntryWrittenEventArgs> object using the first entry in the custom <xref:System.Diagnostics.EventLog>. This object is used to notify a message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EntryWrittenEventArgs/.ctor/entrywritteneventargs_ctor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EntryWrittenEventArgs_ctor2/VB/entrywritteneventargs_ctor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EntryWrittenEventArgs/.ctor/entrywritteneventargs_ctor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -199,7 +199,7 @@
  It creates a custom <xref:System.Diagnostics.EventLog> object and writes an entry into it. Then it creates an <xref:System.Diagnostics.EntryWrittenEventArgs> object using the first entry in the custom EventLog. This object is used to notify a message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EntryWrittenEventArgs/.ctor/entrywritteneventargs_ctor2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EntryWrittenEventArgs_ctor2/VB/entrywritteneventargs_ctor2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EntryWrittenEventArgs/.ctor/entrywritteneventargs_ctor2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/EventInstance.xml b/xml/System.Diagnostics/EventInstance.xml
index af39fee26ce..69bdceb2be7 100644
--- a/xml/System.Diagnostics/EventInstance.xml
+++ b/xml/System.Diagnostics/EventInstance.xml
@@ -55,7 +55,7 @@
  The following code example writes an informational event entry, and then reuses the <xref:System.Diagnostics.EventInstance> to write an entry for a warning event to an existing event log. The event message text is specified using a resource identifier in a message resource file. The code example assumes that the corresponding message resource file has been registered for the source.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet9":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -231,7 +231,7 @@ SVC_UPDATE.EXE
  The following code example writes an informational event entry, and then reuses the <xref:System.Diagnostics.EventInstance> to write an entry for a warning event to an existing event log. The event message text is specified using a resource identifier in a message resource file. The code example assumes that the corresponding message resource file has been registered for the source.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet9":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -409,7 +409,7 @@ SVC_UPDATE.EXE
  The following code example writes two audit event entries to the event log `myNewLog`. The code example creates a new event source and a new event log if they do not exist on the local computer. The event message text is specified using a resource identifier in a resource file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet7":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -599,7 +599,7 @@ SVC_UPDATE.EXE
  The following code example writes an informational event entry, and then reuses the <xref:System.Diagnostics.EventInstance> to write an entry for a warning event to an existing event log. The event message text is specified using a resource identifier in a message resource file. The code example assumes that the corresponding message resource file has been registered for the source.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet9":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -771,7 +771,7 @@ SVC_UPDATE.EXE
  The following code example writes an informational event entry, and then reuses the <xref:System.Diagnostics.EventInstance> to write an entry for a warning event to an existing event log. The event message text is specified using a resource identifier in a message resource file. The code example assumes that the corresponding message resource file has been registered for the source.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet9":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -944,7 +944,7 @@ SVC_UPDATE.EXE
  The following code example writes an informational event entry, and then reuses the <xref:System.Diagnostics.EventInstance> to write an entry for a warning event to an existing event log. The event message text is specified using a resource identifier in a message resource file. The code example assumes that the corresponding message resource file has been registered for the source.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet9":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
diff --git a/xml/System.Diagnostics/EventLog.xml b/xml/System.Diagnostics/EventLog.xml
index 465a7bd9d0a..32a735c6a20 100644
--- a/xml/System.Diagnostics/EventLog.xml
+++ b/xml/System.Diagnostics/EventLog.xml
@@ -685,7 +685,7 @@
  The following example determines whether the event source named `SampleApplicationSource` is registered on the local computer. If the event source does not exist, the example sets the message resource file for the source and creates the new event source. Finally, the example sets the localized display name for the event log, using the resource identifier value in `DisplayNameMsgId` and the resource file path in `messageFile`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet6":::
 
  The example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings. Specifically, resource identifier 5001 is defined for the localized name of the event log.
 
@@ -1833,7 +1833,7 @@ SVC_UPDATE.EXE
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Exists/eventlog_exists_1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_Exists_1/VB/eventlog_exists_1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Exists/eventlog_exists_1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1969,7 +1969,7 @@ SVC_UPDATE.EXE
  The following example enumerates the event logs defined on the local computer, and displays configuration details for each event log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/GetEventLogs/source1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2212,7 +2212,7 @@ SVC_UPDATE.EXE
  The following example enumerates the event logs defined on the local computer and displays the <xref:System.Diagnostics.EventLog.LogDisplayName%2A> for each event log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/GetEventLogs/source1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2434,7 +2434,7 @@ SVC_UPDATE.EXE
  The following example enumerates the event logs defined on the local computer, and displays configuration details for each event log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/GetEventLogs/source1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2500,7 +2500,7 @@ SVC_UPDATE.EXE
  The following example enumerates the event logs defined on the local computer, and displays configuration details for each event log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/GetEventLogs/source1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2578,7 +2578,7 @@ SVC_UPDATE.EXE
  The following example displays the configured overflow policy for a specified event log, and allows the user to select a new overflow policy setting for the event log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/GetEventLogs/source1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -2654,7 +2654,7 @@ SVC_UPDATE.EXE
  The following example enumerates the event logs defined on the local computer, and displays configuration details for each event log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/GetEventLogs/source1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2724,7 +2724,7 @@ SVC_UPDATE.EXE
  The following example determines whether the event source named `SampleApplicationSource` is registered on the local computer. If the event source does not exist, the example sets the message resource file for the source and creates the new event source. Finally, the example sets the localized display name for the event log, using the resource identifier value in `DisplayNameMsgId` and the resource file path in `messageFile`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet6":::
 
  The example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings. Specifically, resource identifier 5001 is defined for the localized name of the event log.
 
@@ -3602,7 +3602,7 @@ SVC_UPDATE.EXE
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_1_3/VB/eventlog_writeentry_1_3.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3828,7 +3828,7 @@ SVC_UPDATE.EXE
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_1_3/VB/eventlog_writeentry_1_3.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3935,7 +3935,7 @@ SVC_UPDATE.EXE
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_4/VB/eventlog_writeentry_4.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4058,7 +4058,7 @@ SVC_UPDATE.EXE
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_5.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_5/VB/eventlog_writeentry_5.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4173,7 +4173,7 @@ SVC_UPDATE.EXE
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_1_3/VB/eventlog_writeentry_1_3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4282,7 +4282,7 @@ SVC_UPDATE.EXE
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_WriteEntry_1_3/VB/eventlog_writeentry_1_3.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/eventlog_writeentry_1_3.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -4400,7 +4400,7 @@ SVC_UPDATE.EXE
  The following example writes two audit entries to the event log `myNewLog`. The example creates a new event source and a new event log if they do not exist on the local computer. The event message text is specified using a resource identifier in a resource file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet7":::
 
  The example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -4632,7 +4632,7 @@ SVC_UPDATE.EXE
  The following example writes two audit entries to the event log `myNewLog`. The example creates a new event source and a new event log if they do not exist on the local computer. The event message text is specified using a resource identifier in a resource file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet7":::
 
  The example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -4850,7 +4850,7 @@ SVC_UPDATE.EXE
  The following example writes an informational event entry and a warning event entry to an existing event log. The event message text is specified using a resource identifier in a resource file. The example assumes the corresponding resource file has been registered for the source.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet8":::
 
  The example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -5068,7 +5068,7 @@ SVC_UPDATE.EXE
  The following example writes an informational event entry and a warning event entry to an existing event log. The event message text is specified using a resource identifier in a resource file. The example assumes the corresponding resource file has been registered for the source.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet8":::
 
  The example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
diff --git a/xml/System.Diagnostics/EventLogEntry.xml b/xml/System.Diagnostics/EventLogEntry.xml
index 847d82e2cc8..4c4a6cf4217 100644
--- a/xml/System.Diagnostics/EventLogEntry.xml
+++ b/xml/System.Diagnostics/EventLogEntry.xml
@@ -66,7 +66,7 @@
  The following code example demonstrates the use of the <xref:System.Diagnostics.EventLogEntry> class. In this example, a `switch` statement uses console input to search for event log entries for the specified event type.  If a match is found, log entry source information is displayed at the console.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogEntry/Overview/eventlogentry_source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Source/VB/eventlogentry_source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogEntry/Overview/eventlogentry_source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -271,7 +271,7 @@
  The following code example demonstrates the use of the <xref:System.Diagnostics.EventLogEntry.EntryType%2A> property. In this example, a `switch` statement uses console input to search for event log entries for the specified <xref:System.Diagnostics.EventLogEntry.EntryType%2A>.  If a match is found, log entry source information is displayed at the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogEntry/Overview/eventlogentry_source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Source/VB/eventlogentry_source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogEntry/Overview/eventlogentry_source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -490,7 +490,7 @@
  The following code example searches an event log for entries with a particular resource identifier. The code example displays the event message for each matching entry, and counts the total number of matching entries in the log. The message text for each entry may or may not be the same; each event message depends on the event source message file, insertion strings, and parameters used when it was written.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -709,7 +709,7 @@ e1.WriteEntry(LocRM.GetString("strMessage"),
  The following code example demonstrates the use of the <xref:System.Diagnostics.EventLogEntry.Source%2A> property. In this example, a `switch` statement uses console input to search for event log entries for the specified <xref:System.Diagnostics.EventLogEntry.EntryType%2A>.  If a match is found, the <xref:System.Diagnostics.EventLogEntry.Source%2A> property information is displayed at the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogEntry/Overview/eventlogentry_source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Source/VB/eventlogentry_source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogEntry/Overview/eventlogentry_source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/EventLogEntryCollection.xml b/xml/System.Diagnostics/EventLogEntryCollection.xml
index a1d20a82424..bd8900f556d 100644
--- a/xml/System.Diagnostics/EventLogEntryCollection.xml
+++ b/xml/System.Diagnostics/EventLogEntryCollection.xml
@@ -53,7 +53,7 @@
  The following example demonstrates how to obtain event log information from an <xref:System.Diagnostics.EventLogEntryCollection> object.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogEntryCollection/Overview/eventlogentry_copyto.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_CopyTo/VB/eventlogentry_copyto.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogEntryCollection/Overview/eventlogentry_copyto.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -109,7 +109,7 @@
  The following example creates an <xref:System.Diagnostics.EventLogEntry> array and uses the <xref:System.Diagnostics.EventLogEntryCollection.CopyTo%2A> method to copy the contents of an <xref:System.Diagnostics.EventLogEntryCollection> into it.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogEntryCollection/Overview/eventlogentry_copyto.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_CopyTo/VB/eventlogentry_copyto.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogEntryCollection/Overview/eventlogentry_copyto.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -162,7 +162,7 @@
  The following example demonstrates how to use the <xref:System.Diagnostics.EventLogEntryCollection.Count%2A> property to iterate through an <xref:System.Diagnostics.EventLogEntryCollection> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogEntryCollection/Count/eventlogentry_item.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Item/VB/eventlogentry_item.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogEntryCollection/Count/eventlogentry_item.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@
  The following example demonstrates how to display information for the items in an <xref:System.Diagnostics.EventLogEntryCollection> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogEntryCollection/Count/eventlogentry_item.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogEntry_Item/VB/eventlogentry_item.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogEntryCollection/Count/eventlogentry_item.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/EventLogEntryType.xml b/xml/System.Diagnostics/EventLogEntryType.xml
index bcd3c2e7131..569f9f65677 100644
--- a/xml/System.Diagnostics/EventLogEntryType.xml
+++ b/xml/System.Diagnostics/EventLogEntryType.xml
@@ -49,7 +49,7 @@
  The following code example demonstrates how to use the <xref:System.Diagnostics.EventLogEntryType> class to add information about triggered events to a log file. In this example, a `switch` statement is used to determine the event type. Each `case` statement uses the <xref:System.Diagnostics.EventLogEntryType> to specify the event type, gets the message and ID, and then writes the information to the log.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogEntryType/Overview/eventlogentrytype_6.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogEntryType_6/VB/eventlogentrytype_6.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogEntryType/Overview/eventlogentrytype_6.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics/EventLogInstaller.xml b/xml/System.Diagnostics/EventLogInstaller.xml
index b72b47e46b1..69c25a6b01a 100644
--- a/xml/System.Diagnostics/EventLogInstaller.xml
+++ b/xml/System.Diagnostics/EventLogInstaller.xml
@@ -56,7 +56,7 @@
  The following code example sets the installation properties for a new event source. The code example sets the source name and the event log name, and adds the <xref:System.Diagnostics.EventLogInstaller> to the <xref:System.Configuration.Install.Installer.Installers%2A> collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogInstaller/Overview/eventloginstaller.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogInstaller/VB/eventloginstaller.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogInstaller/Overview/eventloginstaller.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -125,7 +125,7 @@
  The following code example sets the installation properties for a new event source. The code example sets the event source name, event log name, and resource file for localized event text.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogInstaller/CategoryCount/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlogInstaller_Resources/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogInstaller/CategoryCount/source.vb" id="Snippet1":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -304,7 +304,7 @@ SVC_UPDATE.EXE
  The following code example sets the installation properties for a new event source. The code example sets the event source name, event log name, and resource file for localized event text.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogInstaller/CategoryCount/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlogInstaller_Resources/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogInstaller/CategoryCount/source.vb" id="Snippet1":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -662,7 +662,7 @@ SVC_UPDATE.EXE
  The following code example sets the installation properties for a new event source. The code example sets the event source name, event log name, and resource file for localized event text.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogInstaller/CategoryCount/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlogInstaller_Resources/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogInstaller/CategoryCount/source.vb" id="Snippet1":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -865,7 +865,7 @@ TRIGGER.EXE
  The following code example sets the installation properties for a new event source. The code example sets the event source name, event log name, and resource file for localized event text.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogInstaller/CategoryCount/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlogInstaller_Resources/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogInstaller/CategoryCount/source.vb" id="Snippet1":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings. Specifically, the message defined for resource identifier 1004 uses a placeholder for a parameter string defined for resource identifier 5002.
 
diff --git a/xml/System.Diagnostics/EventSourceCreationData.xml b/xml/System.Diagnostics/EventSourceCreationData.xml
index d579190ab28..c228371785e 100644
--- a/xml/System.Diagnostics/EventSourceCreationData.xml
+++ b/xml/System.Diagnostics/EventSourceCreationData.xml
@@ -61,7 +61,7 @@
  The following code example sets the configuration properties for an event source from command-line arguments. The input arguments specify the event source name, event log name, computer name, and event message resource file. The code example verifies that the source does not conflict with an existing event source, and then creates the new event source for the specified event log.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventSourceCreationData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_EventSourceCreation_Properties/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventSourceCreationData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -129,7 +129,7 @@
  The following code example determines whether the event source named `SampleApplicationSource` is registered on the local computer. If the event source does not exist, the example sets the message resource file for the source and creates the new event source. Finally, the code example sets the localized display name for the event log, using the resource identifier value in `DisplayNameMsgId` and the resource file path in `messageFile`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet6":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -302,7 +302,7 @@ SVC_UPDATE.EXE
  The following code example determines whether the event source named `SampleApplicationSource` is registered on the local computer. If the event source does not exist, the example sets the message resource file for the source and creates the new event source. Finally, the code example sets the localized display name for the event log, using the resource identifier value in `DisplayNameMsgId` and the resource file path in `messageFile`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet6":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -481,7 +481,7 @@ SVC_UPDATE.EXE
  The following code example determines whether the event source named `SampleApplicationSource` is registered on the local computer. If the event source does not exist, the example sets the message resource file for the source and creates the new event source. Finally, the code example sets the localized display name for the event log, using the resource identifier value in `DisplayNameMsgId` and the resource file path in `messageFile`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet6":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -661,7 +661,7 @@ SVC_UPDATE.EXE
  The following code example sets the configuration properties for an event source from command-line arguments. The input arguments specify the event source name, event log name, computer name, and event message resource file. This example is part of a larger example provided for the <xref:System.Diagnostics.EventSourceCreationData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventSourceCreationData/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_EventSourceCreation_Properties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventSourceCreationData/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -723,7 +723,7 @@ SVC_UPDATE.EXE
  The following code example sets the configuration properties for an event source from command-line arguments. The input arguments specify the event source name, event log name, computer name, and event message resource file. This example is part of a larger example provided for the <xref:System.Diagnostics.EventSourceCreationData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventSourceCreationData/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_EventSourceCreation_Properties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventSourceCreationData/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -793,7 +793,7 @@ SVC_UPDATE.EXE
  The following code example determines whether the event source named `SampleApplicationSource` is registered on the local computer. If the event source does not exist, the example sets the message resource file for the source and creates the new event source. Finally, the code example sets the localized display name for the event log, using the resource identifier value in `DisplayNameMsgId` and the resource file path in `messageFile`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet6":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings.
 
@@ -996,7 +996,7 @@ TRIGGER.EXE
  The following code example determines whether the event source named `SampleApplicationSource` is registered on the local computer. If the event source does not exist, the example sets the message resource file for the source and creates the new event source. Finally, the code example sets the localized display name for the event log, using the resource identifier value in `DisplayNameMsgId` and the resource file path in `messageFile`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventInstance/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventlog_WriteEvent/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventInstance/Overview/source.vb" id="Snippet6":::
 
  The code example uses the following message text file, built into the resource library EventLogMsgs.dll. A message text file is the source from which the message resource file is created. The message text file defines the resource identifiers and text for the category, event message, and parameter insertion strings. Specifically, the message defined for resource identifier 1004 uses a placeholder for a parameter string defined for resource identifier 5002.
 
@@ -1172,7 +1172,7 @@ SVC_UPDATE.EXE
  The following code example sets the configuration properties for an event source from command-line arguments. The input arguments specify the event source name, event log name, computer name, and event message resource file. This example is part of a larger example provided for the <xref:System.Diagnostics.EventSourceCreationData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventSourceCreationData/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLog_EventSourceCreation_Properties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventSourceCreationData/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/OverflowAction.xml b/xml/System.Diagnostics/OverflowAction.xml
index f576c10e6bb..1ba63d1f8a4 100644
--- a/xml/System.Diagnostics/OverflowAction.xml
+++ b/xml/System.Diagnostics/OverflowAction.xml
@@ -50,7 +50,7 @@
 The following example enumerates the event logs defined on the local computer and displays configuration details for each event log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/GetEventLogs/source1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventLogProperties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics/PerformanceCounter.xml b/xml/System.Diagnostics/PerformanceCounter.xml
index b35aa82e9cf..8dd921215d0 100644
--- a/xml/System.Diagnostics/PerformanceCounter.xml
+++ b/xml/System.Diagnostics/PerformanceCounter.xml
@@ -93,7 +93,7 @@
  The following code example demonstrates the use of the <xref:System.Diagnostics.PerformanceCounter> class to create and use an <xref:System.Diagnostics.PerformanceCounterType.AverageCount64> counter type. The example creates categories, sets up counters, collects data from the counters, and calls the <xref:System.Diagnostics.CounterSampleCalculator> class to interpret the performance counter data. The intermediate and final results are displayed in the console window. For additional examples of other performance counter types, see the <xref:System.Diagnostics.PerformanceCounterType> enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -155,7 +155,7 @@
  The following code example creates a default instance of the <xref:System.Diagnostics.PerformanceCounter> class. After the instance is created, the <xref:System.Diagnostics.PerformanceCounter.CategoryName%2A>, <xref:System.Diagnostics.PerformanceCounter.CounterName%2A>, and <xref:System.Diagnostics.PerformanceCounter.InstanceName%2A> property values are set, and the results of a call to the <xref:System.Diagnostics.PerformanceCounter.NextValue%2A> method are displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerfCounter/VB/perfcounter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -313,7 +313,7 @@
  The following code example creates an instance of the <xref:System.Diagnostics.PerformanceCounter> class. The example passes in category names, counter names, and a flag value indicating that the counter is not read-only. This code example is part of a larger example for the <xref:System.Diagnostics.PerformanceCounter> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -764,7 +764,7 @@
  The following code example creates a default instance of the <xref:System.Diagnostics.PerformanceCounter> class. After the instance is created, the <xref:System.Diagnostics.PerformanceCounter.CategoryName%2A>, <xref:System.Diagnostics.PerformanceCounter.CounterName%2A>, and <xref:System.Diagnostics.PerformanceCounter.InstanceName%2A> property values are set, and the results of a call to the <xref:System.Diagnostics.PerformanceCounter.NextValue%2A> method are displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerfCounter/VB/perfcounter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -997,7 +997,7 @@
  The following code example shows how to set the <xref:System.Diagnostics.PerformanceCounter.CounterName%2A> property to a typical counter name.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerfCounter/VB/perfcounter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1393,7 +1393,7 @@
  The following code example demonstrates how to use the <xref:System.Diagnostics.PerformanceCounter.IncrementBy%2A> method to add increments to a counter. This code example is part of a larger example for the <xref:System.Diagnostics.PerformanceCounter> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1568,7 +1568,7 @@
  The following code example creates a default instance of the <xref:System.Diagnostics.PerformanceCounter> class. After the instance is created, the <xref:System.Diagnostics.PerformanceCounter.CategoryName%2A>, <xref:System.Diagnostics.PerformanceCounter.CounterName%2A>, and <xref:System.Diagnostics.PerformanceCounter.InstanceName%2A> property values are set, and the results of a call to the <xref:System.Diagnostics.PerformanceCounter.NextValue%2A> method are displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerfCounter/VB/perfcounter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounter/.ctor/perfcounter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1694,7 +1694,7 @@
  The following code example demonstrates how to use the <xref:System.Diagnostics.PerformanceCounter.NextSample%2A> method to obtain the next uncalculated value of a counter. This code example is part of a larger example for the <xref:System.Diagnostics.PerformanceCounter> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1756,7 +1756,7 @@
  The following code example creates an <xref:System.Diagnostics.PerformanceCounterType.ElapsedTime> counter and uses the <xref:System.Diagnostics.PerformanceCounter.NextValue%2A> method to display the counter's values over a time period.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounter/NextValue/elapsedtime.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.ElapsedTime/VB/elapsedtime.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounter/NextValue/elapsedtime.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1839,7 +1839,7 @@
  The following example uses the <xref:System.Diagnostics.CounterSample> class to display the value of the <xref:System.Diagnostics.PerformanceCounter.RawValue%2A> property for a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/CounterCreationData/Overview/averagecount32.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.AverageCounter64/VB/averagecount32.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/CounterCreationData/Overview/averagecount32.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/PerformanceCounterCategory.xml b/xml/System.Diagnostics/PerformanceCounterCategory.xml
index 5079331b3a6..f214bea1397 100644
--- a/xml/System.Diagnostics/PerformanceCounterCategory.xml
+++ b/xml/System.Diagnostics/PerformanceCounterCategory.xml
@@ -707,7 +707,7 @@
  The following code example determines whether a <xref:System.Diagnostics.PerformanceCounterCategory> object named "orders" exists. If not, it creates the <xref:System.Diagnostics.PerformanceCounterCategory> object by using a <xref:System.Diagnostics.CounterCreationDataCollection> object that contains two performance counters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounterCategory/Create/ccd.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerfCounter_ccd/VB/ccd.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounterCategory/Create/ccd.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1154,7 +1154,7 @@
  The following code example determines whether a <xref:System.Diagnostics.PerformanceCounterCategory> object named "orders" exists. If not, it creates the <xref:System.Diagnostics.PerformanceCounterCategory> object by using a <xref:System.Diagnostics.CounterCreationDataCollection> object that contains two performance counters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounterCategory/Create/ccd.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerfCounter_ccd/VB/ccd.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounterCategory/Create/ccd.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1223,7 +1223,7 @@
  The following example determines whether a <xref:System.Diagnostics.PerformanceCounterCategory> object named `Orders` exists. If it does not exist, the example creates the <xref:System.Diagnostics.PerformanceCounterCategory> object by using a <xref:System.Diagnostics.CounterCreationDataCollection> object that contains two performance counters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounterCategory/Create/ccd.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerfCounter_ccd/VB/ccd.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounterCategory/Create/ccd.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/PerformanceCounterInstaller.xml b/xml/System.Diagnostics/PerformanceCounterInstaller.xml
index 5a9bbea170b..ff2a1a2b0f3 100644
--- a/xml/System.Diagnostics/PerformanceCounterInstaller.xml
+++ b/xml/System.Diagnostics/PerformanceCounterInstaller.xml
@@ -29,7 +29,7 @@
  The following code example demonstrates how to create a <xref:System.Diagnostics.PerformanceCounterInstaller> object and add it to an <xref:System.Configuration.Install.InstallerCollection>.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounterInstaller/Overview/performancecounterinstaller.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterInstaller/VB/performancecounterinstaller.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounterInstaller/Overview/performancecounterinstaller.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics/Process.xml b/xml/System.Diagnostics/Process.xml
index 248185ee78e..64813136a8d 100644
--- a/xml/System.Diagnostics/Process.xml
+++ b/xml/System.Diagnostics/Process.xml
@@ -132,13 +132,13 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstart.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Overview/processstart.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_instance/VB/processstart.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstart.vb" id="Snippet1":::
 
  The following example uses the <xref:System.Diagnostics.Process> class itself and a static <xref:System.Diagnostics.Process.Start%2A> method to start a process.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstartstatic.cs":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Overview/processstartstatic.fs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic.vb":::
 
  The following F# example defines a `runProc` function that starts a process, captures all output and error information, and records the number of milliseconds that the process has run.  The `runProc` function has three parameters: the name of application to launch, the arguments to supply to the application, and the starting directory.
 
@@ -285,7 +285,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -377,7 +377,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/net_async.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/DataReceivedEventArgs/Overview/net_async.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/net_async.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/net_async.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -477,7 +477,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/sort_async.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/sort_async.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -577,7 +577,7 @@ process.BeginErrorReadLine();
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/nmake_async.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/DataReceivedEventArgs/Overview/nmake_async.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/nmake_async.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/nmake_async.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -669,7 +669,7 @@ process.BeginOutputReadLine();
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/nmake_async.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/DataReceivedEventArgs/Overview/nmake_async.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/nmake_async.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/nmake_async.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -735,7 +735,7 @@ process.BeginOutputReadLine();
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Close/process_refresh.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Close/process_refresh.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_refresh/VB/process_refresh.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Close/process_refresh.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -798,7 +798,7 @@ process.BeginOutputReadLine();
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Close/process_refresh.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Close/process_refresh.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_refresh/VB/process_refresh.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Close/process_refresh.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1104,7 +1104,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/net_async.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/DataReceivedEventArgs/Overview/net_async.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/net_async.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/net_async.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1194,7 +1194,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1417,7 +1417,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1500,7 +1500,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1573,7 +1573,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1676,7 +1676,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1763,7 +1763,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1874,7 +1874,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1973,7 +1973,7 @@ The following code example creates a process that prints a file. It sets the <xr
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/GetCurrentProcess/processstaticget.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.GetProcesses_noexception/VB/processstaticget.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/GetCurrentProcess/processstaticget.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2207,7 +2207,7 @@ There are problems accessing the performance counter APIs used to get process in
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Close/process_refresh.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Close/process_refresh.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_refresh/VB/process_refresh.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Close/process_refresh.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2591,7 +2591,7 @@ The calling process is a member of the associated process's descendant tree.</ex
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/MachineName/process_getprocessesbyname2_2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/MachineName/process_getprocessesbyname2_2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_GetProcessesByName2_2/VB/process_getprocessesbyname2_2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/MachineName/process_getprocessesbyname2_2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2814,7 +2814,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/MainWindowTitle/process_mainwindowtitle.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/MainWindowTitle/process_mainwindowtitle.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_MainWindowTitle/VB/process_mainwindowtitle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/MainWindowTitle/process_mainwindowtitle.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3250,7 +3250,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3316,7 +3316,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/OnExited/program.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/OnExited/program.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/onexitsample/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/OnExited/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3396,7 +3396,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/DataReceivedEventArgs/Overview/datareceivedevent.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/DataReceivedEventArgs/Overview/datareceivedevent.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_asyncstreams/VB/datareceivedevent.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/DataReceivedEventArgs/Overview/datareceivedevent.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3540,7 +3540,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3679,7 +3679,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3818,7 +3818,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3956,7 +3956,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4108,7 +4108,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4263,7 +4263,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4410,7 +4410,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4485,7 +4485,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4712,7 +4712,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Close/process_refresh.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Close/process_refresh.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_refresh/VB/process_refresh.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Close/process_refresh.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4784,7 +4784,7 @@ If no main module is found, it could be because the process hasn't finished load
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5011,7 +5011,7 @@ You can use asynchronous read operations to avoid these dependencies and their d
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/StandardError/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/StandardError/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_StandardError/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/StandardError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5094,7 +5094,7 @@ You can use asynchronous read operations to avoid these dependencies and their d
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/StandardInput/process_standardinput.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/StandardInput/process_standardinput.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_StandardInput/VB/process_standardinput.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/StandardInput/process_standardinput.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5201,7 +5201,7 @@ There is a similar issue when you read all text from both the standard output an
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/StandardOutput/process_standardoutput.cs":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/StandardOutput/process_standardoutput.fs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_StandardOutput/VB/process_standardoutput.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/StandardOutput/process_standardoutput.vb":::
 
  ]]></format>
         </remarks>
@@ -5317,7 +5317,7 @@ There is a similar issue when you read all text from both the standard output an
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstart.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Overview/processstart.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_instance/VB/processstart.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstart.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5439,7 +5439,7 @@ The <see cref="P:System.Diagnostics.ProcessStartInfo.UseShellExecute" /> member
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstartstatic.cs":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Overview/processstartstatic.fs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic.vb":::
 
  ]]></format>
         </remarks>
@@ -5565,7 +5565,7 @@ The <see cref="P:System.Diagnostics.ProcessStartInfo.UseShellExecute" /> member
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstartstatic.cs":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Overview/processstartstatic.fs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic.vb":::
 
  ]]></format>
         </remarks>
@@ -5732,7 +5732,7 @@ The file specified in the <paramref name="fileName" /> could not be found.</exce
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstartstatic.cs":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Overview/processstartstatic.fs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic.vb":::
 
  ]]></format>
         </remarks>
@@ -6042,7 +6042,7 @@ The file specified in the <paramref name="fileName" /> could not be found.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstart.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/Overview/processstart.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_instance/VB/processstart.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstart.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6196,7 +6196,7 @@ The file specified in the <paramref name="fileName" /> could not be found.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/SynchronizingObject/remarks.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/SynchronizingObject/remarks.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_SynchronizingObject/VB/remarks.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/SynchronizingObject/remarks.vb" id="Snippet2":::
 
  Typically, this property is set when the component is placed inside a control or form, because those components are bound to a specific thread.
 
@@ -6204,7 +6204,7 @@ The file specified in the <paramref name="fileName" /> could not be found.
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/SynchronizingObject/process_synchronizingobject.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_SynchronizingObject/VB/process_synchronizingobject.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/SynchronizingObject/process_synchronizingobject.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6332,7 +6332,7 @@ The file specified in the <paramref name="fileName" /> could not be found.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6407,7 +6407,7 @@ The file specified in the <paramref name="fileName" /> could not be found.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6485,7 +6485,7 @@ The file specified in the <paramref name="fileName" /> could not be found.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6628,7 +6628,7 @@ The file specified in the <paramref name="fileName" /> could not be found.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7190,7 +7190,7 @@ No process is associated with this <see cref="T:System.Diagnostics.Process" /> o
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/WorkingSet/process_sample.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/WorkingSet/process_sample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/process_sample/VB/process_sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/WorkingSet/process_sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7272,7 +7272,7 @@ No process is associated with this <see cref="T:System.Diagnostics.Process" /> o
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/BasePriority/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Diagnostics/Process/BasePriority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Diag_Process_MemoryProperties64/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/BasePriority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/ProcessModule.xml b/xml/System.Diagnostics/ProcessModule.xml
index 7bef8b5192b..3563ae5ebb5 100644
--- a/xml/System.Diagnostics/ProcessModule.xml
+++ b/xml/System.Diagnostics/ProcessModule.xml
@@ -83,7 +83,7 @@
  The following code sample demonstrates how to use the <xref:System.Diagnostics.ProcessModule> class to get and display information about all the modules that are used by the Notepad.exe application.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessModule/Overview/processmodule.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessModule/VB/processmodule.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessModule/Overview/processmodule.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -141,7 +141,7 @@
  The following code example creates a new process for the Notepad.exe application. The code iterates through the <xref:System.Diagnostics.ProcessModuleCollection> class to obtain a <xref:System.Diagnostics.ProcessModule> object for each module in the collection. The <xref:System.Diagnostics.ProcessModule.ModuleName%2A> and  <xref:System.Diagnostics.ProcessModule.BaseAddress%2A> properties are used to display the module name and the memory address where each module was loaded.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessModule/BaseAddress/processmodule_baseaddress.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_BaseAddress/VB/processmodule_baseaddress.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessModule/BaseAddress/processmodule_baseaddress.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -207,7 +207,7 @@
  The following code example creates a new process for the Notepad.exe application. The code iterates through the <xref:System.Diagnostics.ProcessModuleCollection> class to obtain a <xref:System.Diagnostics.ProcessModule> object for each module in the collection. The <xref:System.Diagnostics.ProcessModule.ModuleName%2A> and <xref:System.Diagnostics.ProcessModule.EntryPointAddress%2A> properties are used to display the name and the entry point address for each module.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessModule/EntryPointAddress/processmodule_entrypoint.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_EntryPoint/VB/processmodule_entrypoint.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessModule/EntryPointAddress/processmodule_entrypoint.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -271,7 +271,7 @@
  The following code example creates a new process for the Notepad.exe application. The code iterates through the <xref:System.Diagnostics.ProcessModuleCollection> class to obtain a <xref:System.Diagnostics.ProcessModule> object for each module in the collection. The <xref:System.Diagnostics.ProcessModule.ModuleName%2A> and <xref:System.Diagnostics.ProcessModule.FileName%2A> properties are used to display the module name and the full path information for each module.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessModule/FileName/processmodule_filename.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_FileName/VB/processmodule_filename.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessModule/FileName/processmodule_filename.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -328,7 +328,7 @@
  The following code example creates a new process for the Notepad.exe application. The code iterates through the <xref:System.Diagnostics.ProcessModuleCollection> class to obtain a <xref:System.Diagnostics.ProcessModule> object for each module in the collection. The <xref:System.Diagnostics.ProcessModule.ModuleName%2A> and <xref:System.Diagnostics.ProcessModule.FileVersionInfo%2A> properties are used to display the module name and the file version information for each module.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessModule/FileVersionInfo/processmodule_fileversioninfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_FileVersionInfo/VB/processmodule_fileversioninfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessModule/FileVersionInfo/processmodule_fileversioninfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -391,7 +391,7 @@
  The following code example creates a new process for the Notepad.exe application. The code iterates through the <xref:System.Diagnostics.ProcessModuleCollection> class to obtain a <xref:System.Diagnostics.ProcessModule> object for each module in the collection. The <xref:System.Diagnostics.ProcessModule.ModuleName%2A> and <xref:System.Diagnostics.ProcessModule.ModuleMemorySize%2A> properties are used to display the module name and the amount of memory needed for each module.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessModule/ModuleMemorySize/processmodule_modulememorysize.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ModuleMemorySize/VB/processmodule_modulememorysize.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessModule/ModuleMemorySize/processmodule_modulememorysize.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -455,7 +455,7 @@
  The following code example creates a new process for the Notepad.exe application. The code iterates through the <xref:System.Diagnostics.ProcessModuleCollection> class to obtain a <xref:System.Diagnostics.ProcessModule> object for each module in the collection. The <xref:System.Diagnostics.ProcessModule.ModuleName%2A> property is used to display the name of each module.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessModule/ModuleName/processmodule_modulename.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ModuleName/VB/processmodule_modulename.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessModule/ModuleName/processmodule_modulename.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -508,7 +508,7 @@
  The following code example creates a new process for the Notepad.exe application. The code iterates through the <xref:System.Diagnostics.ProcessModuleCollection> class to obtain a <xref:System.Diagnostics.ProcessModule> object for each module in the collection. The <xref:System.Diagnostics.ProcessModule.ToString%2A> method is used to display the name for each module.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessModule/ToString/processmodule_tostring.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessModule_ToString/VB/processmodule_tostring.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessModule/ToString/processmodule_tostring.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/ProcessStartInfo.xml b/xml/System.Diagnostics/ProcessStartInfo.xml
index 1e0c78c8ea2..16da13f25cf 100644
--- a/xml/System.Diagnostics/ProcessStartInfo.xml
+++ b/xml/System.Diagnostics/ProcessStartInfo.xml
@@ -79,7 +79,7 @@
  The following code example demonstrates how to use the <xref:System.Diagnostics.ProcessStartInfo> class to start Internet Explorer. The destination URLs are provided as <xref:System.Diagnostics.ProcessStartInfo> arguments.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstartstatic.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic.vb":::
 
  ]]></format>
     </remarks>
@@ -446,10 +446,10 @@ If you use this property to set command-line arguments, <xref:System.Diagnostics
  The first example creates a small application (argsecho.exe) that echos its arguments to the console. The second example creates an application that invokes argsecho.exe to demonstrate different variations for the `Arguments` property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstartstatic3.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic3.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic3.vb":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstartstatic2.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic2.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic2.vb":::
 
  ]]></format>
         </remarks>
@@ -529,7 +529,7 @@ If you use this property to set command-line arguments, <xref:System.Diagnostics
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstart.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_instance/VB/processstart.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstart.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -981,7 +981,7 @@ If you use this property to set command-line arguments, <xref:System.Diagnostics
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstart.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_instance/VB/processstart.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstart.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1303,7 +1303,7 @@ You can use asynchronous read operations to avoid these dependencies and their d
  The following example uses the `net use` command together with a user-supplied argument to map a network resource. It then reads the standard error stream of the net command and writes it to console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/StandardError/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_StandardError/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/StandardError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1390,7 +1390,7 @@ You can use asynchronous read operations to avoid these dependencies and their d
  The example starts the `sort` command with redirected input. It then prompts the user for text, and passes the text to the `sort` process through the redirected <xref:System.Diagnostics.Process.StandardInput%2A> stream. The `sort` results are displayed to the user on the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/StandardInput/process_standardinput.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process_StandardInput/VB/process_standardinput.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/StandardInput/process_standardinput.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1496,7 +1496,7 @@ You can use asynchronous read operations to avoid these dependencies and their d
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessStartInfo/RedirectStandardOutput/stdstr.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessOneStream/VB/stdstr.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessStartInfo/RedirectStandardOutput/stdstr.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1836,7 +1836,7 @@ You can use asynchronous read operations to avoid these dependencies and their d
         <example>
           <format type="text/markdown"><![CDATA[
 :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessStartInfo/RedirectStandardOutput/stdstr.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessOneStream/VB/stdstr.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessStartInfo/RedirectStandardOutput/stdstr.vb" id="Snippet1":::
           ]]></format>
         </example>
         <exception cref="T:System.PlatformNotSupportedException">An attempt to set the value to <see langword="true" /> on Universal Windows Platform (UWP) apps occurs.</exception>
@@ -1931,7 +1931,7 @@ When you use the <xref:System.Diagnostics.ProcessStartInfo.Verb%2A> property, yo
 The following code example starts a new process by using the specified verb and file name. This code example is part of a larger example provided for the <xref:System.Diagnostics.ProcessStartInfo.Verbs%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessStartInfo/Verb/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessVerbs_Diagnostics/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessStartInfo/Verb/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2000,7 +2000,7 @@ The following code example starts a new process by using the specified verb and
  The following code example displays the defined verbs for the chosen file name. If the user selects one of the defined verbs, the example starts a new process using the selected verb and the input file name.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessStartInfo/Verb/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessVerbs_Diagnostics/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessStartInfo/Verb/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -2072,7 +2072,7 @@ The following code example starts a new process by using the specified verb and
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Process/Overview/processstartstatic.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Process.Start_static/VB/processstartstatic.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Process/Overview/processstartstatic.vb":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/ProcessThread.xml b/xml/System.Diagnostics/ProcessThread.xml
index fa03a1ea3d4..45665afe700 100644
--- a/xml/System.Diagnostics/ProcessThread.xml
+++ b/xml/System.Diagnostics/ProcessThread.xml
@@ -332,7 +332,7 @@
  The following example demonstrates how to set the <xref:System.Diagnostics.ProcessThread.IdealProcessor%2A> property for an instance of Notepad to the first processor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessThread/IdealProcessor/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessThreadIdealProcessor/VB/program.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessThread/IdealProcessor/program.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -637,7 +637,7 @@
  The following example shows how to set the <xref:System.Diagnostics.ProcessThread.ProcessorAffinity%2A> property for an instance of Notepad to the first processor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/ProcessThread/IdealProcessor/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProcessThreadIdealProcessor/VB/program.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/ProcessThread/IdealProcessor/program.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/StackFrame.xml b/xml/System.Diagnostics/StackFrame.xml
index 7a0fef805fe..b413b45f182 100644
--- a/xml/System.Diagnostics/StackFrame.xml
+++ b/xml/System.Diagnostics/StackFrame.xml
@@ -78,12 +78,12 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame> class to provide the stack frame information for a stack trace.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stackframesample2/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/program.vb" id="Snippet1":::
 
  The following example demonstrates the use of  the members of the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -188,7 +188,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.%23ctor%28System.Int32%29> constructor. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -247,7 +247,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.%23ctor%28System.Boolean%29> constructor. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.%23ctor%28System.String%2CSystem.Int32%29> constructor. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -373,7 +373,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.%23ctor%28System.Int32%2CSystem.Boolean%29> constructor. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -440,7 +440,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.%23ctor%2A> constructor. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -499,7 +499,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.GetFileColumnNumber%2A> method. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -558,7 +558,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.GetFileLineNumber%2A> method. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -624,7 +624,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.GetFileName%2A> method. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -683,7 +683,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.GetILOffset%2A> method. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -759,7 +759,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.GetMethod%2A> method. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/GetMethod/stacktracesample3.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackTraceSample3/VB/stacktracesample3.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/GetMethod/stacktracesample3.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -811,7 +811,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.GetNativeOffset%2A> method. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -922,7 +922,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.StackFrame.ToString%2A> method. This code example is part of a larger example provided for the <xref:System.Diagnostics.StackFrame> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/StackTrace.xml b/xml/System.Diagnostics/StackTrace.xml
index bd8a5bb6f5a..21fa73bd9a4 100644
--- a/xml/System.Diagnostics/StackTrace.xml
+++ b/xml/System.Diagnostics/StackTrace.xml
@@ -78,7 +78,7 @@
  The following console application demonstrates how to create a simple <xref:System.Diagnostics.StackTrace> and iterate through its frames to obtain debugging and diagnostic information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackTrace/Overview/stacktracesample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackTraceSample1/VB/stacktracesample1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackTrace/Overview/stacktracesample1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -145,7 +145,7 @@
  The following code example displays the first and last function calls in a stack trace.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -202,7 +202,7 @@
  The following code example demonstrates various <xref:System.Diagnostics.StackTrace> constructor methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -287,7 +287,7 @@
  The following code example writes stack trace information to an event log entry.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/GetMethod/stacktracesample3.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackTraceSample3/VB/stacktracesample3.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/GetMethod/stacktracesample3.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -507,7 +507,7 @@
  The following code example demonstrates various <xref:System.Diagnostics.StackTrace> constructor methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -733,7 +733,7 @@
  The following code example displays the first and last function calls in a stack trace.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -794,7 +794,7 @@
  The following code example displays the first and last function calls in a stack trace.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/Overview/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackFrameSample1/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/Overview/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -870,7 +870,7 @@
  The following code example demonstrates enumerating the frames in a <xref:System.Diagnostics.StackTrace>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackTrace/GetFrames/stacktracesample2.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackTraceSample2/VB/stacktracesample2.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackTrace/GetFrames/stacktracesample2.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -980,7 +980,7 @@
  The following code example writes stack trace information to an event log entry.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/StackFrame/GetMethod/stacktracesample3.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StackTraceSample3/VB/stacktracesample3.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/StackFrame/GetMethod/stacktracesample3.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/Stopwatch.xml b/xml/System.Diagnostics/Stopwatch.xml
index b9fcc4f239f..ab8800adf8d 100644
--- a/xml/System.Diagnostics/Stopwatch.xml
+++ b/xml/System.Diagnostics/Stopwatch.xml
@@ -91,7 +91,7 @@
  The following example demonstrates the use of the <xref:System.Diagnostics.Stopwatch> class to calculate performance data.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Stopwatch/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StopWatchPerfSample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -287,7 +287,7 @@
  The following example uses the <xref:System.Diagnostics.Stopwatch> class to measure the performance of four different implementations for parsing an integer from a string. This code example is part of a larger example provided for the <xref:System.Diagnostics.Stopwatch> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Stopwatch/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StopWatchPerfSample/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -363,7 +363,7 @@
  The following example uses the <xref:System.Diagnostics.Stopwatch> class to measure the performance of four different implementations for parsing an integer from a string. This code example is part of a larger example provided for the <xref:System.Diagnostics.Stopwatch> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Stopwatch/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StopWatchPerfSample/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -430,7 +430,7 @@
  The following example displays the frequency and resolution of a <xref:System.Diagnostics.Stopwatch> timer. This code example is part of a larger example provided for the <xref:System.Diagnostics.Stopwatch> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Stopwatch/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StopWatchPerfSample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -569,7 +569,7 @@
  The following example illustrates the use of the <xref:System.Diagnostics.Stopwatch.GetTimestamp%2A> method to update a performance counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/PerformanceCounter/NextValue/elapsedtime.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PerformanceCounterType.ElapsedTime/VB/elapsedtime.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/PerformanceCounter/NextValue/elapsedtime.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -630,7 +630,7 @@
  The following example displays the frequency and resolution of a <xref:System.Diagnostics.Stopwatch> timer. This code example is part of a larger example provided for the <xref:System.Diagnostics.Stopwatch> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Stopwatch/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StopWatchPerfSample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -935,7 +935,7 @@
  The following example uses the <xref:System.Diagnostics.Stopwatch> class to measure the performance of four different implementations for parsing an integer from a string. This code example is part of a larger example provided for the <xref:System.Diagnostics.Stopwatch> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Stopwatch/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StopWatchPerfSample/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.DirectoryServices/PropertyCollection.xml b/xml/System.DirectoryServices/PropertyCollection.xml
index 1c74d919f32..7b8978978ca 100644
--- a/xml/System.DirectoryServices/PropertyCollection.xml
+++ b/xml/System.DirectoryServices/PropertyCollection.xml
@@ -472,7 +472,7 @@ Dim myCollection As New ICollection()
  The following example shows how to implement the <xref:System.Collections.IDictionary.Add%2A> method. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -520,7 +520,7 @@ Dim myCollection As New ICollection()
  The following example demonstrates how to implement the <xref:System.Collections.IDictionary.Clear%2A> method. This example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -565,7 +565,7 @@ Dim myCollection As New ICollection()
  The following example demonstrates how to implement the <xref:System.Collections.IDictionary.Contains%2A> method. This example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -613,7 +613,7 @@ Dim myCollection As New ICollection()
  The following example demonstrates how to implement the <xref:System.Collections.IDictionary.IsFixedSize%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -657,7 +657,7 @@ Dim myCollection As New ICollection()
  The following example shows how to implement the <xref:System.Collections.IDictionary.IsReadOnly%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -713,7 +713,7 @@ Dim myCollection As New ICollection()
  The following example shows how to implement the <xref:System.Collections.IDictionary.Item%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -764,7 +764,7 @@ Dim myCollection As New ICollection()
  The following example shows how to implement the <xref:System.Collections.IDictionary.Keys%2A> property. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -807,7 +807,7 @@ Dim myCollection As New ICollection()
  The following example shows how to implement the <xref:System.Collections.IDictionary.Remove%2A> method. This code example is part of a larger example provided for the <xref:System.Collections.IDictionary> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/DictionaryEntry/Key/Dictionary.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dictionary/VB/Dictionary.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/DictionaryEntry/Key/Dictionary.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/CalendarAlgorithmType.xml b/xml/System.Globalization/CalendarAlgorithmType.xml
index 5a84f00194a..800636b7c20 100644
--- a/xml/System.Globalization/CalendarAlgorithmType.xml
+++ b/xml/System.Globalization/CalendarAlgorithmType.xml
@@ -61,7 +61,7 @@
  The following code example demonstrates the <xref:System.Globalization.Calendar.AlgorithmType%2A> property and the <xref:System.Globalization.CalendarAlgorithmType> enumeration.
   
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CalendarAlgorithmType/Overview/caltype.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.calendartype/VB/caltype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CalendarAlgorithmType/Overview/caltype.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Globalization/CompareInfo.xml b/xml/System.Globalization/CompareInfo.xml
index c4bafbcadb2..0f463818f46 100644
--- a/xml/System.Globalization/CompareInfo.xml
+++ b/xml/System.Globalization/CompareInfo.xml
@@ -98,7 +98,7 @@
       The following example shows how the <xref:System.Globalization.CompareInfo> object associated with a <xref:System.Globalization.CultureInfo> object affects string comparison.
 
       :::code language="csharp" source="~/snippets/csharp/System.Globalization/CompareInfo/Overview/CompareInfo.cs" id="Snippet1":::
-      :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompareInfo/VB/CompareInfo.vb" id="Snippet1":::
+      :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CompareInfo/Overview/CompareInfo.vb" id="Snippet1":::
 
       ]]></format>
     </remarks>
@@ -211,7 +211,7 @@
  The following example demonstrates calling the <xref:System.Globalization.CompareInfo.Compare%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CompareInfo/Overview/CompareInfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompareInfo/VB/CompareInfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CompareInfo/Overview/CompareInfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -369,7 +369,7 @@
  The following example demonstrates calling the <xref:System.Globalization.CompareInfo.Compare%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CompareInfo/Overview/CompareInfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompareInfo/VB/CompareInfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CompareInfo/Overview/CompareInfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5204,7 +5204,7 @@ This method has greater overhead than other <xref:System.Globalization.CompareIn
  The following example demonstrates the <xref:System.Globalization.CompareInfo.LCID%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CompareInfo/Overview/CompareInfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompareInfo/VB/CompareInfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CompareInfo/Overview/CompareInfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5273,7 +5273,7 @@ This method has greater overhead than other <xref:System.Globalization.CompareIn
  The following example compares three strings using the fr-FR and ja-JP cultures. The <xref:System.Globalization.CultureInfo.Name%2A> property is used to display the name of each culture.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CompareInfo/Overview/CompareInfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CompareInfo/VB/CompareInfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CompareInfo/Overview/CompareInfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/CultureAndRegionInfoBuilder.xml b/xml/System.Globalization/CultureAndRegionInfoBuilder.xml
index f011368654d..c9a29161ab2 100644
--- a/xml/System.Globalization/CultureAndRegionInfoBuilder.xml
+++ b/xml/System.Globalization/CultureAndRegionInfoBuilder.xml
@@ -67,7 +67,7 @@
 The following code example creates a custom culture with a private use prefix, then lists a set of its properties. The first property lists the name of the culture.
 
 :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/.ctor/carib.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/carib.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/carib.vb" id="Snippet1":::
           ]]></format>
         </example>
         <exception cref="T:System.ArgumentNullException">
@@ -281,7 +281,7 @@ The following code example creates a custom culture with a private use prefix, t
  The following example demonstrates the <xref:System.Globalization.CultureAndRegionInfoBuilder.Save%2A> and <xref:System.Globalization.CultureAndRegionInfoBuilder.CreateFromLdml%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/CreateFromLdml/sl.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.saveLdml/vb/sl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CreateFromLdml/sl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -333,7 +333,7 @@ The following code example creates a custom culture with a private use prefix, t
  The following code example creates a custom culture with a private use prefix, then lists a set of its properties. The first property lists the name of the culture.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/.ctor/carib.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/carib.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/carib.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -374,7 +374,7 @@ The following code example creates a custom culture with a private use prefix, t
  The following code example creates a custom culture with a private use prefix, then lists a set of its properties. The first property lists the name of the culture.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/.ctor/carib.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/carib.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/carib.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -415,7 +415,7 @@ The following code example creates a custom culture with a private use prefix, t
  The following code example creates a custom culture with a private use prefix, then lists a set of its properties. The first property lists the name of the culture.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/.ctor/carib.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/carib.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/carib.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1032,7 +1032,7 @@ The following code example creates a custom culture with a private use prefix, t
  The following example demonstrates the <xref:System.Globalization.CultureAndRegionInfoBuilder.Register%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/Register/persist.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.register/VB/persist.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Register/persist.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1086,7 +1086,7 @@ The following code example creates a custom culture with a private use prefix, t
  The following example demonstrates the <xref:System.Globalization.CultureAndRegionInfoBuilder.Save%2A> and <xref:System.Globalization.CultureAndRegionInfoBuilder.CreateFromLdml%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/CreateFromLdml/sl.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.saveLdml/vb/sl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CreateFromLdml/sl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1378,7 +1378,7 @@ The following code example creates a custom culture with a private use prefix, t
  The following example demonstrates the <xref:System.Globalization.CultureAndRegionInfoBuilder.Unregister%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/Unregister/unregister.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib.unregister/VB/unregister.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/Unregister/unregister.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/CultureAndRegionModifiers.xml b/xml/System.Globalization/CultureAndRegionModifiers.xml
index 931ce724307..9b85a4f3be7 100644
--- a/xml/System.Globalization/CultureAndRegionModifiers.xml
+++ b/xml/System.Globalization/CultureAndRegionModifiers.xml
@@ -48,7 +48,7 @@
  The following code example creates a custom culture with a private use prefix, then lists a set of its properties. The first property is the name of the culture.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureAndRegionInfoBuilder/.ctor/carib.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.carib1/VB/carib.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureAndRegionInfoBuilder/CultureEnglishName/carib.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Globalization/CultureInfo.xml b/xml/System.Globalization/CultureInfo.xml
index 8dc23575fda..247858f6787 100644
--- a/xml/System.Globalization/CultureInfo.xml
+++ b/xml/System.Globalization/CultureInfo.xml
@@ -1734,7 +1734,7 @@ csc /resource:GreetingStrings.resources Example1.cs
  The following code example displays the fallback user interface culture associated with a culture object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/CultureInfo/GetConsoleFallbackUICulture/cfuic.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.ci.getCFUIC/VB/cfuic.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/CultureInfo/GetConsoleFallbackUICulture/cfuic.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/IdnMapping.xml b/xml/System.Globalization/IdnMapping.xml
index 3c7961f84e5..582ab5d1c71 100644
--- a/xml/System.Globalization/IdnMapping.xml
+++ b/xml/System.Globalization/IdnMapping.xml
@@ -525,7 +525,7 @@
  The following example uses the <xref:System.Globalization.IdnMapping.GetAscii%28System.String%2CSystem.Int32%2CSystem.Int32%29> method to convert an internationalized domain name to a domain name that complies with the IDNA standard. The <xref:System.Globalization.IdnMapping.GetUnicode%28System.String%2CSystem.Int32%2CSystem.Int32%29> method then converts the standardized domain name back into the original domain name, but replaces the original label separators with the standard label separator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/IdnMapping/GetAscii/getx.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IdnMapping.GetX/VB/getx.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/IdnMapping/GetAscii/getx.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/NumberFormatInfo.xml b/xml/System.Globalization/NumberFormatInfo.xml
index 0d344c77046..361a65e6bae 100644
--- a/xml/System.Globalization/NumberFormatInfo.xml
+++ b/xml/System.Globalization/NumberFormatInfo.xml
@@ -95,7 +95,7 @@
       The following example shows how to retrieve a <xref:System.Globalization.NumberFormatInfo> object for a corresponding <xref:System.Globalization.CultureInfo> object, and use the retrieved object to query number formatting information for the particular culture.
 
       :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/Overview/NumberFormatInfo.cs" id="Snippet1":::
-      :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/NumberFormatInfo/vb/numberformatinfo.vb" id="Snippet1":::
+      :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/Overview/numberformatinfo.vb" id="Snippet1":::
 
       ]]></format>
     </remarks>
@@ -288,7 +288,7 @@
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.CurrencyDecimalDigits%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/CurrencyDecimalDigits/currencydecimaldigits.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CurrencyDecimalDigits/VB/currencydecimaldigits.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyDecimalDigits/currencydecimaldigits.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -359,7 +359,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.CurrencyDecimalSeparator%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/CurrencyDecimalSeparator/currencydecimalseparator.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CurrencyDecimalSeparator/VB/currencydecimalseparator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyDecimalSeparator/currencydecimalseparator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -431,7 +431,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.CurrencyGroupSeparator%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/CurrencyGroupSeparator/currencygroupseparator.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CurrencyGroupSeparator/VB/currencygroupseparator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyGroupSeparator/currencygroupseparator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -504,7 +504,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.CurrencyGroupSizes%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/CurrencyGroupSizes/currencygroupsizes.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CurrencyGroupSizes/VB/currencygroupsizes.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/CurrencyGroupSizes/currencygroupsizes.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1260,7 +1260,7 @@ The pattern does not support a positive sign.
  The following example demonstrates the <xref:System.Globalization.NumberFormatInfo.NativeDigits%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/NativeDigits/nd.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.NFI.nativeDigits/vb/nd.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/NativeDigits/nd.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1457,7 +1457,7 @@ The pattern does not support a positive sign.
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.NumberDecimalDigits%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/NumberDecimalDigits/numberdecimaldigits.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/NumberDecimalDigits/VB/numberdecimaldigits.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberDecimalDigits/numberdecimaldigits.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1527,7 +1527,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.NumberDecimalSeparator%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/NumberDecimalSeparator/numberdecimalseparator.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/NumberDecimalSeparator/VB/numberdecimalseparator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberDecimalSeparator/numberdecimalseparator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1598,7 +1598,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.NumberGroupSeparator%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/NumberGroupSeparator/numbergroupseparator.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/NumberGroupSeparator/VB/numbergroupseparator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSeparator/numbergroupseparator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1672,7 +1672,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.NumberGroupSizes%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/NumberGroupSizes/numbergroupsizes.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/NumberGroupSizes/VB/numbergroupsizes.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSizes/numbergroupsizes.vb" id="Snippet1":::
 
  The following example prints a value using different <xref:System.Globalization.NumberFormatInfo.NumberGroupSizes%2A> arrays.
 
@@ -1828,7 +1828,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.PercentDecimalDigits%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/PercentDecimalDigits/percentdecimaldigits.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PercentDecimalDigits/VB/percentdecimaldigits.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentDecimalDigits/percentdecimaldigits.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1897,7 +1897,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.PercentDecimalSeparator%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/PercentDecimalSeparator/percentdecimalseparator.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PercentDecimalSeparator/VB/percentdecimalseparator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentDecimalSeparator/percentdecimalseparator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1967,7 +1967,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.PercentGroupSeparator%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/PercentGroupSeparator/percentgroupseparator.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PercentGroupSeparator/VB/percentgroupseparator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentGroupSeparator/percentgroupseparator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2040,7 +2040,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example demonstrates the effect of changing the <xref:System.Globalization.NumberFormatInfo.PercentGroupSizes%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/PercentGroupSizes/percentgroupsizes.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PercentGroupSizes/VB/percentgroupsizes.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/PercentGroupSizes/percentgroupsizes.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/NumberStyles.xml b/xml/System.Globalization/NumberStyles.xml
index 38970357c23..f0b542ca6ab 100644
--- a/xml/System.Globalization/NumberStyles.xml
+++ b/xml/System.Globalization/NumberStyles.xml
@@ -99,7 +99,7 @@ The following table lists the composite number styles and indicates which indivi
 This example shows how to parse a string into a 32-bit integer by using various `NumberStyles` flags.
 
 :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberStyles/Overview/NumberStyles.cs" interactive="try-dotnet" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/NumberStyles/vb/numberstyles.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberStyles/Overview/numberstyles.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Globalization/PersianCalendar.xml b/xml/System.Globalization/PersianCalendar.xml
index a1cde3217b5..7335e5b95fb 100644
--- a/xml/System.Globalization/PersianCalendar.xml
+++ b/xml/System.Globalization/PersianCalendar.xml
@@ -73,12 +73,12 @@
         The following example instantiates <xref:System.DateTime> objects by using the <xref:System.DateTime.Now?displayProperty=nameWithType> property, a <xref:System.DateTime> constructor, and the Persian calendar's <xref:System.Globalization.Calendar.ToDateTime(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)> method. It then displays these dates in both the Gregorian and Persian calendars. It also displays the date range of the Persian calendar.
 
         :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/calendar2.cs" id="Snippet3":::
-        :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/calendar2.vb" id="Snippet3":::
+        :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/calendar2.vb" id="Snippet3":::
 
         The following example demonstrates the field, property, and method members of the <xref:System.Globalization.PersianCalendar> class.
 
         :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
-        :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+        :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
       ]]></format>
     </example>
     <altmember cref="T:System.Globalization.Calendar" />
@@ -132,7 +132,7 @@
  The following code example demonstrates the use of the constructor for the <xref:System.Globalization.PersianCalendar> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -201,7 +201,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.AddMonths%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -275,7 +275,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.AddYears%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -393,7 +393,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.Eras%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetDayOfMonth%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -518,7 +518,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetDayOfWeek%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -582,7 +582,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetDayOfYear%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -651,7 +651,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetDaysInMonth%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -716,7 +716,7 @@
  The following code example demonstrates use of the <xref:System.Globalization.PersianCalendar.GetDaysInYear%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -779,7 +779,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetEra%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -844,7 +844,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetLeapMonth%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -905,7 +905,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetMonth%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -970,7 +970,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetMonthsInYear%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1032,7 +1032,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.GetYear%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1106,7 +1106,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.IsLeapDay%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1174,7 +1174,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.IsLeapMonth%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1245,7 +1245,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.IsLeapYear%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1313,7 +1313,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.MaxSupportedDateTime%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1376,7 +1376,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.MinSupportedDateTime%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1434,7 +1434,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.PersianEra> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1512,7 +1512,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.ToDateTime%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1586,7 +1586,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.ToFourDigitYear%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1653,7 +1653,7 @@
  The following code example demonstrates the use of the <xref:System.Globalization.PersianCalendar.TwoDigitYearMax%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/PersianCalendar/Overview/pcal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.persianCal/vb/pcal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/PersianCalendar/Overview/pcal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/RegionInfo.xml b/xml/System.Globalization/RegionInfo.xml
index a9bf3543a86..d9b635214f3 100644
--- a/xml/System.Globalization/RegionInfo.xml
+++ b/xml/System.Globalization/RegionInfo.xml
@@ -324,7 +324,7 @@ This constructor throws an <xref:System.ArgumentException> if `name` is a neutra
  The following code example demonstrates the <xref:System.Globalization.RegionInfo.CurrencyEnglishName%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.regioninfo.rgn5props/VB/rgn5props.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -392,7 +392,7 @@ This constructor throws an <xref:System.ArgumentException> if `name` is a neutra
  The following code example demonstrates the <xref:System.Globalization.RegionInfo.CurrencyNativeName%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.regioninfo.rgn5props/VB/rgn5props.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -798,7 +798,7 @@ This constructor throws an <xref:System.ArgumentException> if `name` is a neutra
  The following code example demonstrates the <xref:System.Globalization.RegionInfo.GeoId%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.regioninfo.rgn5props/VB/rgn5props.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1242,7 +1242,7 @@ This constructor throws an <xref:System.ArgumentException> if `name` is a neutra
  The following code example demonstrates the <xref:System.Globalization.RegionInfo.NativeName%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.regioninfo.rgn5props/VB/rgn5props.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/RegionInfo/CurrencyEnglishName/rgn5props.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/SortKey.xml b/xml/System.Globalization/SortKey.xml
index 7ce0db169ac..a26aac49b92 100644
--- a/xml/System.Globalization/SortKey.xml
+++ b/xml/System.Globalization/SortKey.xml
@@ -156,7 +156,7 @@
  The following code example compares two strings using the <xref:System.Globalization.SortKey.Compare%2A> method and the equivalent <xref:System.Globalization.CompareInfo.Compare(System.String,System.String,System.Globalization.CompareOptions)?displayProperty=nameWithType> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/SortKey/Compare/skcmp.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.sortkey.compare/vb/skcmp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/SortKey/Compare/skcmp.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -346,7 +346,7 @@
  The following code example displays an original string and the equivalent string and key data for a case-sensitive sort key and a case-insensitive sort key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/SortKey/KeyData/ts.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.sortkey.tostring/vb/ts.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/SortKey/KeyData/ts.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -400,7 +400,7 @@
  The following code example displays an original string and the equivalent string and key data for a case-sensitive sort key and a case-insensitive sort key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/SortKey/KeyData/ts.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.sortkey.tostring/vb/ts.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/SortKey/KeyData/ts.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -459,7 +459,7 @@
  The following code example displays an original string, the strings yielded by the <xref:System.Globalization.SortKey.ToString%2A> method for case-sensitive and case-insensitive sort keys, and the key data for case-sensitive and case-insensitive sort keys.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/SortKey/KeyData/ts.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.sortkey.tostring/vb/ts.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/SortKey/KeyData/ts.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/StringInfo.xml b/xml/System.Globalization/StringInfo.xml
index d8cdb68558b..77f86a14209 100644
--- a/xml/System.Globalization/StringInfo.xml
+++ b/xml/System.Globalization/StringInfo.xml
@@ -110,7 +110,7 @@ Each string is parsed once by the <xref:System.Globalization.StringInfo.ParseCom
 This example uses the <xref:System.Globalization.StringInfo.GetTextElementEnumerator%2A> and <xref:System.Globalization.StringInfo.ParseCombiningCharacters%2A> methods of the <xref:System.Globalization.StringInfo> class to manipulate a string that contains surrogate and combining characters.
 
 :::code language="csharp" source="~/snippets/csharp/System.Globalization/StringInfo/Overview/StringInfo.cs" interactive="try-dotnet" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StringInfo/vb/stringinfo.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Globalization/StringInfo/Overview/stringinfo.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -733,7 +733,7 @@ A grapheme cluster is a sequence of one or more Unicode code points that should
  The following example demonstrates calling the <xref:System.Globalization.StringInfo.GetTextElementEnumerator%2A> method. This example is part of a larger example provided for the <xref:System.Globalization.StringInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/StringInfo/Overview/StringInfo.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StringInfo/vb/stringinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/StringInfo/Overview/stringinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -945,7 +945,7 @@ A grapheme cluster is a sequence of one or more Unicode code points that should
  The following example demonstrates calling the <xref:System.Globalization.StringInfo.ParseCombiningCharacters%2A> method. This code example is part of a larger example provided for the <xref:System.Globalization.StringInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/StringInfo/Overview/StringInfo.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StringInfo/vb/stringinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/StringInfo/Overview/stringinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/TextInfo.xml b/xml/System.Globalization/TextInfo.xml
index 1fe4364ccc5..290843bdafe 100644
--- a/xml/System.Globalization/TextInfo.xml
+++ b/xml/System.Globalization/TextInfo.xml
@@ -229,7 +229,7 @@ The user might use the regional and language options portion of Control Panel to
  The following code example demonstrates the <xref:System.Globalization.TextInfo.Clone%2A> and <xref:System.Globalization.TextInfo.ReadOnly%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/TextInfo/Clone/ro.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.textinfo.clone/vb/ro.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/TextInfo/Clone/ro.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -886,7 +886,7 @@ The <xref:System.Globalization.TextInfo.LCID%2A> property always reflects a spec
  The following code example demonstrates the <xref:System.Globalization.TextInfo.Clone%2A> and <xref:System.Globalization.TextInfo.ReadOnly%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/TextInfo/Clone/ro.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.glob.textinfo.clone/vb/ro.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/TextInfo/Clone/ro.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO.IsolatedStorage/IsolatedStorageFile.xml b/xml/System.IO.IsolatedStorage/IsolatedStorageFile.xml
index 84221849b4a..5778ca9c028 100644
--- a/xml/System.IO.IsolatedStorage/IsolatedStorageFile.xml
+++ b/xml/System.IO.IsolatedStorage/IsolatedStorageFile.xml
@@ -83,7 +83,7 @@
  The following code example illustrates how to create files and directories in an isolated store. First, a store that is isolated by user, domain, and assembly is retrieved and placed in the `isoStore` variable. The <xref:System.IO.IsolatedStorage.IsolatedStorageFile.CreateDirectory%2A> method is then called to create directories, and two instances of the <xref:System.IO.IsolatedStorage.IsolatedStorageFileStream> class create files in these directories.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.IsolatedStorage/IsolatedStorageFile/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/conceptual.isolatedstorage/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.IsolatedStorage/IsolatedStorageFile/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.IO.MemoryMappedFiles/MemoryMappedFile.xml b/xml/System.IO.MemoryMappedFiles/MemoryMappedFile.xml
index a357af7b45b..e941b243bff 100644
--- a/xml/System.IO.MemoryMappedFiles/MemoryMappedFile.xml
+++ b/xml/System.IO.MemoryMappedFiles/MemoryMappedFile.xml
@@ -72,7 +72,7 @@
  The following example creates a memory-mapped view of a part of an extremely large file and manipulates a portion of it.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.createfromfile/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -137,7 +137,7 @@
  The following example uses the <xref:System.IO.MemoryMappedFiles.MemoryMappedFile.CreateFromFile%2A> method to create a memory-mapped file, and then creates a memory-mapped view to a portion of an extremely large file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.createfromfile/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1633,7 +1633,7 @@ Process C says: True
  The following example creates a view of a memory-mapped file and edits it. This code example is part of a larger example provided for the <xref:System.IO.MemoryMappedFiles.MemoryMappedFile> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.createfromfile/vb/program.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2173,7 +2173,7 @@ Process C says: True
  The following example opens a memory-mapped file named `ImgA` that has already been created from a file on disk (as shown in the example for the <xref:System.IO.MemoryMappedFiles.MemoryMappedFile.CreateFromFile%28System.String%29> method).
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.MemoryMappedFiles/MemoryMappedFile/OpenExisting/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.openexisting/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/OpenExisting/program.vb" id="Snippet1":::
 
  **Opening a Non-Persisted Memory-Mapped File**
 
diff --git a/xml/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.xml b/xml/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.xml
index 47e619174eb..027d77a95f2 100644
--- a/xml/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.xml
+++ b/xml/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.xml
@@ -62,7 +62,7 @@
  This code example is part of a larger example provided for the <xref:System.IO.MemoryMappedFiles.MemoryMappedFile> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/memorymappedfiles.memorymappedfile.createfromfile/vb/program.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.MemoryMappedFiles/MemoryMappedFile/Overview/program.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.IO.Ports/SerialPort.xml b/xml/System.IO.Ports/SerialPort.xml
index 5106d9e1cb7..3a875c69e70 100644
--- a/xml/System.IO.Ports/SerialPort.xml
+++ b/xml/System.IO.Ports/SerialPort.xml
@@ -1310,7 +1310,7 @@
  The following code example uses the <xref:System.IO.Ports.SerialPort.GetPortNames%2A> method to display serial port names to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Ports/SerialPort/GetPortNames/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.Ports.GetPortNames/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Ports/SerialPort/GetPortNames/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/Directory.xml b/xml/System.IO/Directory.xml
index 41cd2e75d14..8bf83f949f0 100644
--- a/xml/System.IO/Directory.xml
+++ b/xml/System.IO/Directory.xml
@@ -227,7 +227,7 @@ The following example creates and deletes the specified directory:
 
 :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/CreateDirectory/dir_createdir.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/CreateDirectory/dir_createdir.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_CreateDir/VB/dir_createdir.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/CreateDirectory/dir_createdir.vb" id="Snippet1":::
 
 To create the directory *C:\Users\User1\Public\Html* when the current directory is *C:\Users\User1*, use any of the following calls to ensure that the backslash is interpreted properly:
 
@@ -1964,7 +1964,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/Exists/directorylisting.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/Exists/directorylisting.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Recursive file finder/VB/directorylisting.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/Exists/directorylisting.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2180,7 +2180,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/GetCreationTime/dir_getcreation.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/GetCreationTime/dir_getcreation.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_GetCreation/VB/dir_getcreation.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/GetCreationTime/dir_getcreation.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2347,7 +2347,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/GetCurrentDirectory/dir_getcurdir.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/GetCurrentDirectory/dir_getcurdir.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_GetCurDir/VB/dir_getcurdir.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/GetCurrentDirectory/dir_getcurdir.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2440,7 +2440,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/Exists/directorylisting.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/Exists/directorylisting.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Recursive file finder/VB/directorylisting.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/Exists/directorylisting.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2541,7 +2541,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/GetDirectories/dir_getdirs2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/GetDirectories/dir_getdirs2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_GetDirs2/VB/dir_getdirs2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/GetDirectories/dir_getdirs2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2731,7 +2731,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/GetDirectories/dir_getdirs3.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/GetDirectories/dir_getdirs3.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_GetDirs2/VB/dir_getdirs3.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/GetDirectories/dir_getdirs3.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2925,7 +2925,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/Exists/directorylisting.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/Exists/directorylisting.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Recursive file finder/VB/directorylisting.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/Exists/directorylisting.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3030,7 +3030,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/GetFiles/dir_getfiles2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/GetFiles/dir_getfiles2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_GetFiles2/VB/dir_getfiles2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/GetFiles/dir_getfiles2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3735,7 +3735,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/GetLastAccessTime/dir_getlastaccess.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/GetLastAccessTime/dir_getlastaccess.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_GetLastAccess/VB/dir_getlastaccess.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/GetLastAccessTime/dir_getlastaccess.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3915,7 +3915,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/GetLastWriteTime/dir_getlastwrite.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/GetLastWriteTime/dir_getlastwrite.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_GetLastWrite/VB/dir_getlastwrite.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/GetLastWriteTime/dir_getlastwrite.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4754,7 +4754,7 @@ There are too many levels of symbolic links.</exception>
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/SetLastAccessTime/dir_setlastaccess.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/SetLastAccessTime/dir_setlastaccess.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_SetLastAccess/VB/dir_setlastaccess.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/SetLastAccessTime/dir_setlastaccess.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4928,7 +4928,7 @@ There are too many levels of symbolic links.</exception>
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Directory/SetLastWriteTime/dir_setlastwrite.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/Directory/SetLastWriteTime/dir_setlastwrite.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Dir_SetLastWrite/VB/dir_setlastwrite.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Directory/SetLastWriteTime/dir_setlastwrite.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/DirectoryInfo.xml b/xml/System.IO/DirectoryInfo.xml
index 3416596fc4c..0b085cc8945 100644
--- a/xml/System.IO/DirectoryInfo.xml
+++ b/xml/System.IO/DirectoryInfo.xml
@@ -101,13 +101,13 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Overview/dirinfo class example.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Overview/dirinfo class example.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirInfo Class Example/VB/dirinfo class example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Overview/dirinfo class example.vb" id="Snippet1":::
 
  The following example demonstrates how to copy a directory and its contents.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Overview/copydir.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Overview/copydir.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.DirectoryInfo-CopyDir/vb/CopyDir.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Overview/CopyDir.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -189,7 +189,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/.ctor/dirinfo ctor.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/.ctor/dirinfo ctor.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirInfo Ctor/VB/dirinfo ctor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/.ctor/dirinfo ctor.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -271,7 +271,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Create/dirinfo create.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Create/dirinfo create.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirInfo Create/VB/dirinfo create.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Create/dirinfo create.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -436,7 +436,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/CreateSubdirectory/directoryinfocreatesub.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/CreateSubdirectory/directoryinfocreatesub.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinfocreatesub/VB/directoryinfocreatesub.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/CreateSubdirectory/directoryinfocreatesub.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -605,7 +605,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Delete/dirinfo delete1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Delete/dirinfo delete1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirInfo Delete1/VB/dirinfo delete1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Delete/dirinfo delete1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -694,7 +694,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Delete/directoryinfodelete.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Delete/directoryinfodelete.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinfodelete/VB/directoryinfodelete.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Delete/directoryinfodelete.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1994,7 +1994,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Exists/copydirectory.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Exists/copydirectory.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirectoryInfo Usage Example/VB/copydirectory.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Exists/copydirectory.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2101,7 +2101,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetAccessControl/sample.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetAccessControl/sample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.DiretoryInfo.GetAccessControl-SetAccessControl/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetAccessControl/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2255,7 +2255,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetDirectories/directoryinfogetdirectories.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetDirectories/directoryinfogetdirectories.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinfogetdirectories/VB/directoryinfogetdirectories.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetDirectories/directoryinfogetdirectories.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2354,7 +2354,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetDirectories/dirinfo getdirs2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetDirectories/dirinfo getdirs2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirInfo GetDirs2/VB/dirinfo getdirs2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetDirectories/dirinfo getdirs2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2656,7 +2656,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinfogetfiles/VB/directoryinfogetfiles2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2784,7 +2784,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinfogetfiles/VB/directoryinfogetfiles2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3026,7 +3026,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinfogetfiles/VB/directoryinfogetfiles2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetFiles/directoryinfogetfiles2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3133,7 +3133,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetFileSystemInfos/fsizesort.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetFileSystemInfos/fsizesort.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FSizeSort/VB/fsizesort.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetFileSystemInfos/fsizesort.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3242,7 +3242,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetFileSystemInfos/dirinfo getfilesysinfos2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetFileSystemInfos/dirinfo getfilesysinfos2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirInfo GetFileSysInfos2/VB/dirinfo getfilesysinfos2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetFileSystemInfos/dirinfo getfilesysinfos2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3510,7 +3510,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/MoveTo/directoryinfomoveto.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/MoveTo/directoryinfomoveto.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinfomoveto/VB/directoryinfomoveto.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/MoveTo/directoryinfomoveto.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3685,7 +3685,7 @@ The following example refers to the parent directory of a specified directory.
 
 :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Parent/directoryinfoparent.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Parent/directoryinfoparent.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinfoparent/VB/directoryinfoparent.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Parent/directoryinfoparent.vb" id="Snippet1":::
 
           ]]></format>
         </remarks>
@@ -3752,7 +3752,7 @@ The following example refers to the parent directory of a specified directory.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Root/directoryinforoot2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Root/directoryinforoot2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/directoryinforoot/VB/directoryinforoot2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Root/directoryinforoot2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3831,7 +3831,7 @@ The following example refers to the parent directory of a specified directory.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetAccessControl/sample.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/GetAccessControl/sample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.DiretoryInfo.GetAccessControl-SetAccessControl/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetAccessControl/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/DirectoryNotFoundException.xml b/xml/System.IO/DirectoryNotFoundException.xml
index 6fe9e5e71b5..5b4bbb379f6 100644
--- a/xml/System.IO/DirectoryNotFoundException.xml
+++ b/xml/System.IO/DirectoryNotFoundException.xml
@@ -72,7 +72,7 @@
  The following example shows how to force and recover from a <xref:System.IO.DirectoryNotFoundException>.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryNotFoundException/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirectoryNotFoundException/VB/DirectoryNotFoundexception.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryNotFoundException/Overview/DirectoryNotFoundexception.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -144,7 +144,7 @@
  The following code example demonstrates how to call the <xref:System.IO.DirectoryNotFoundException.%23ctor%2A> constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryNotFoundException/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DirectoryNotFoundException/VB/DirectoryNotFoundexception.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryNotFoundException/Overview/DirectoryNotFoundexception.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/ErrorEventArgs.xml b/xml/System.IO/ErrorEventArgs.xml
index 4774d085a1c..baa344f8ff6 100644
--- a/xml/System.IO/ErrorEventArgs.xml
+++ b/xml/System.IO/ErrorEventArgs.xml
@@ -67,7 +67,7 @@
  The following example shows how to create a FileSystemWatcher to monitor file changes (creates, deletes, renames, changes) occurring on a disk drive. The example also shows how to properly receive error notifications.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/ErrorEventHandler.xml b/xml/System.IO/ErrorEventHandler.xml
index f7dcdbe665f..a7f49de9c66 100644
--- a/xml/System.IO/ErrorEventHandler.xml
+++ b/xml/System.IO/ErrorEventHandler.xml
@@ -64,7 +64,7 @@
  The following code example shows how to create a `FileSystemWatcher` object to monitor file changes (creates, deletes, renames, changes) occurring on a disk drive. The example also shows how to properly receive error notifications.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/File.xml b/xml/System.IO/File.xml
index 58488c1784f..94b89c16130 100644
--- a/xml/System.IO/File.xml
+++ b/xml/System.IO/File.xml
@@ -107,7 +107,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Overview/file class example.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Overview/file class example.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Class Example/VB/file class example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Overview/file class example.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -1282,7 +1282,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/AppendText/file_appendtext.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/AppendText/file_appendtext.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File_AppendText/VB/file_appendtext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/AppendText/file_appendtext.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1380,7 +1380,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Copy/program.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Copy/program.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/filecopydelete/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Copy/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1485,7 +1485,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Copy/program.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Copy/program.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/filecopydelete/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Copy/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1612,7 +1612,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Create/file create1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Create/file create1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Create1/VB/file create1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Create/file create1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1715,7 +1715,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Create/file create2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Create/file create2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Create2/VB/file create2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Create/file create2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2030,7 +2030,7 @@ An I/O error occurred.</exception>
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/CreateText/file createtext.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/CreateText/file createtext.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File CreateText/VB/file createtext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/CreateText/file createtext.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2131,7 +2131,7 @@ An I/O error occurred.</exception>
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Decrypt/sample.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Decrypt/sample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.File.Encrypt-Decrypt/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Decrypt/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2231,7 +2231,7 @@ An I/O error occurred.</exception>
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Copy/program.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Copy/program.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/filecopydelete/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Copy/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2341,7 +2341,7 @@ An I/O error occurred.</exception>
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Decrypt/sample.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Decrypt/sample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.File.Encrypt-Decrypt/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Decrypt/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2456,7 +2456,7 @@ Don't use the <xref:System.IO.File.Exists%2A> method for path validation; this m
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Exists/program.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Exists/program.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Exists/VB/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Exists/program.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2711,7 +2711,7 @@ Don't use the <xref:System.IO.File.Exists%2A> method for path validation; this m
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/GetAttributes/file getattributes.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/GetAttributes/file getattributes.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File GetAttributes/VB/file getattributes.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/GetAttributes/file getattributes.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3104,7 +3104,7 @@ Don't use the <xref:System.IO.File.Exists%2A> method for path validation; this m
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/GetLastAccessTime/file getlastaccess.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/GetLastAccessTime/file getlastaccess.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File GetLastAccess/VB/file getlastaccess.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/GetLastAccessTime/file getlastaccess.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3357,7 +3357,7 @@ Don't use the <xref:System.IO.File.Exists%2A> method for path validation; this m
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/GetLastWriteTime/file getlastwrite.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/GetLastWriteTime/file getlastwrite.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File GetLastWrite/VB/file getlastwrite.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/GetLastWriteTime/file getlastwrite.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3674,7 +3674,7 @@ The following example moves a file.
 
 :::code language="csharp" source="~/snippets/csharp/System.IO/File/Move/file move.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Move/file move.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Move/VB/file move.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.IO/File/Move/file move.vb" id="Snippet1":::
 
           ]]></format>
         </remarks>
@@ -3764,7 +3764,7 @@ The following example moves a file.
 
 :::code language="csharp" source="~/snippets/csharp/System.IO/File/Move/file move.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Move/file move.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Move/VB/file move.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.IO/File/Move/file move.vb" id="Snippet1":::
 
           ]]></format>
         </remarks>
@@ -3874,7 +3874,7 @@ The following example moves a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Open/file open1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Open/file open1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Open1/VB/file open1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Open/file open1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4030,7 +4030,7 @@ The following example moves a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Open/file open2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Open/file open2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Open2/VB/file open2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Open/file open2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4142,7 +4142,7 @@ The following example moves a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Open/file open3.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Open/file open3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File Open3/VB/file open3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Open/file open3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4317,7 +4317,7 @@ The following example moves a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/OpenRead/file openread.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/OpenRead/file openread.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File OpenRead/VB/file openread.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/OpenRead/file openread.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4412,7 +4412,7 @@ The following example moves a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/OpenText/file opentext.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/OpenText/file opentext.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File OpenText/VB/file opentext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/OpenText/file opentext.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4505,7 +4505,7 @@ The following example moves a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/OpenWrite/file openwrite.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/OpenWrite/file openwrite.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File OpenWrite/VB/file openwrite.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/OpenWrite/file openwrite.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5664,7 +5664,7 @@ The following example moves a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Replace/sample.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Replace/sample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.File.Replace/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Replace/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5778,7 +5778,7 @@ The caller does not have the required permission.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/Replace/sample.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/Replace/sample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.File.Replace/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/Replace/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6086,7 +6086,7 @@ It is not possible to change the compression status of a <xref:System.IO.File> o
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/GetAttributes/file getattributes.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/GetAttributes/file getattributes.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File GetAttributes/VB/file getattributes.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/GetAttributes/file getattributes.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6473,7 +6473,7 @@ It is not possible to change the compression status of a <xref:System.IO.File> o
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/SetLastAccessTime/file setlastaccess.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/SetLastAccessTime/file setlastaccess.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File SetLastAccess/VB/file setlastaccess.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/SetLastAccessTime/file setlastaccess.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6726,7 +6726,7 @@ It is not possible to change the compression status of a <xref:System.IO.File> o
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/File/SetLastWriteTime/file setlastwrite.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/File/SetLastWriteTime/file setlastwrite.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/File SetLastWrite/VB/file setlastwrite.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/File/SetLastWriteTime/file setlastwrite.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/FileInfo.xml b/xml/System.IO/FileInfo.xml
index deac4a40d7d..4979f1df4ba 100644
--- a/xml/System.IO/FileInfo.xml
+++ b/xml/System.IO/FileInfo.xml
@@ -124,7 +124,7 @@
  When the properties are first retrieved, <xref:System.IO.FileInfo> calls the <xref:System.IO.FileSystemInfo.Refresh%2A> method and caches information about the file. On subsequent calls, you must call <xref:System.IO.FileSystemInfo.Refresh%2A> to get the latest copy of the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Overview/finfo class.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo Class/VB/finfo class.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Overview/finfo class.vb" id="Snippet1":::
 
  This example produces output similar to the following.
 
@@ -205,12 +205,12 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example uses this constructor to create two files, which are then written to, read from, copied, and deleted.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/.ctor/finfo ctor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo Ctor/VB/finfo ctor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/.ctor/finfo ctor.vb" id="Snippet1":::
 
  The following example opens an existing file or creates a file, appends text to the file, and displays the results.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/.ctor/fileinfomain.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/fileinfomain/VB/fileinfomain.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/.ctor/fileinfomain.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -284,12 +284,12 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example appends text to a file and reads from the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/AppendText/finfo appendtext.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo AppendText/VB/finfo appendtext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/AppendText/finfo appendtext.vb" id="Snippet1":::
 
  The following example demonstrates appending text to the end of a file and also displays the result of the append operation to the console. The first time this routine is called, the file is created if it does not exist. After that, the specified text is appended to the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/AppendText/fileinfoappendtext.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/fileinfoappendtext/VB/fileinfoappendtext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/AppendText/fileinfoappendtext.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -372,12 +372,12 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example demonstrates both overloads of the `CopyTo` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/CopyTo/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo CopyTo2/VB/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/CopyTo/program.vb" id="Snippet1":::
 
  The following example demonstrates copying one file to another file, throwing an exception if the destination file already exists.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/CopyTo/fileinfocopyto1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileInfoCopyTo1/VB/fileinfocopyto1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/CopyTo/fileinfocopyto1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -462,12 +462,12 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example demonstrates both overloads of the `CopyTo` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/CopyTo/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo CopyTo2/VB/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/CopyTo/program.vb" id="Snippet1":::
 
  The following example demonstrates copying one file to another file, specifying whether to overwrite a file that already exists.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/CopyTo/fileinfocopyto.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/fileinfocopyto/VB/fileinfocopyto.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/CopyTo/fileinfocopyto.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -551,12 +551,12 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example creates a reference to a file, and then creates the file on disk using `FileInfo.Create()`.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Create/fileinfodelete.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/fileinfodelete/VB/fileinfodelete.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Create/fileinfodelete.vb" id="Snippet1":::
 
  The following example creates a file, adds some text to it, and reads from the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Create/finfo create.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo Create/VB/finfo create.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Create/finfo create.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -628,7 +628,7 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example demonstrates the `CreateText` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/CreateText/finfo createtext.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo CreateText/VB/finfo createtext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/CreateText/finfo createtext.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -708,7 +708,7 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following code example uses the <xref:System.IO.FileInfo.Encrypt%2A> method and the <xref:System.IO.FileInfo.Decrypt%2A> method to encrypt and then decrypt a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Decrypt/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Encrypt-Decrypt/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Decrypt/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -789,12 +789,12 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example demonstrates the `Delete` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Delete/finfo delete.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo Delete/VB/finfo delete.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Delete/finfo delete.vb" id="Snippet1":::
 
  The following example creates, closes, and deletes a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Create/fileinfodelete.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/fileinfodelete/VB/fileinfodelete.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Create/fileinfodelete.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -876,7 +876,7 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example opens or creates a file, determines its full path, and determines and displays the full contents of the directory.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Directory/fileinfodirectory.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/fileinfodirectory/VB/fileinfodirectory.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Directory/fileinfodirectory.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1031,7 +1031,7 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following code example uses the <xref:System.IO.FileInfo.Encrypt%2A> method and the <xref:System.IO.FileInfo.Decrypt%2A> method to encrypt a file and then decrypt it.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Decrypt/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Encrypt-Decrypt/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Decrypt/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1115,7 +1115,7 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following code example uses the <xref:System.IO.FileInfo.Exists%2A> property ensure a file exists before opening it. You can use this technique to throw a custom exception when the file is not found.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Exists/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Exists/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Exists/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1176,7 +1176,7 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following code example uses the <xref:System.IO.FileInfo.GetAccessControl%2A> method and the <xref:System.IO.FileInfo.SetAccessControl%2A> method to add and then remove an access control list (ACL) entry from a file. You must supply a valid user or group account to run this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/GetAccessControl/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.GetAccessControl-SetAccessControl/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/GetAccessControl/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1311,7 +1311,7 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example creates a temporary file, uses the <xref:System.IO.FileInfo.IsReadOnly> property to first check and then set its read-only status, and finally marks it as read-write in order to delete it.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/IsReadOnly/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.isReadOnly/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/IsReadOnly/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1400,7 +1400,7 @@ C:\Users\userName\AppData\Local\Temp\tmp70CB.tmp was successfully deleted.
  The following example displays the size of the specified files.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Length/filelength.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileLength/VB/filelength.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Length/filelength.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1633,7 +1633,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example uses the `Name` property to display the names of files in the current directory.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Name/fileinfoname.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/fileinfoname/VB/fileinfoname.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Name/fileinfoname.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1712,7 +1712,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example opens a file, adds some information to the file, and reads the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Open/finfo open1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo Open1/VB/finfo open1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Open/finfo open1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1833,7 +1833,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example opens a file as read-only and reads from the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Open/finfo open2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo Open2/VB/finfo open2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Open/finfo open2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1915,7 +1915,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example demonstrates opening a file for reading and writing, but disallowing access to other users or processes.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Open/fileinfoopen.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/fileinfoopen/VB/fileinfoopen.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Open/fileinfoopen.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1995,7 +1995,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example opens a file as read-only and reads from it.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/OpenRead/finfo openread.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo OpenRead/VB/finfo openread.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/OpenRead/finfo openread.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2066,7 +2066,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example reads text from a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/OpenText/file opentext.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo OpenText/VB/file opentext.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/OpenText/file opentext.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2145,7 +2145,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example opens a file for writing and then reads from the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/OpenWrite/file openwrite.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FInfo OpenWrite/VB/file openwrite.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/OpenWrite/file openwrite.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2247,7 +2247,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example uses the <xref:System.IO.File.Replace%2A> method to replace a file with another file and create a backup of the replaced file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Replace/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Replace/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Replace/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2344,7 +2344,7 @@ The following example demonstrates moving a file to a different location and ren
  The following example uses the <xref:System.IO.File.Replace%2A> method to replace a file with another file and create a backup of the replaced file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/Replace/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.Replace/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/Replace/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2430,7 +2430,7 @@ The following example demonstrates moving a file to a different location and ren
  The following code example uses the <xref:System.IO.FileInfo.GetAccessControl%2A> method and the <xref:System.IO.FileInfo.SetAccessControl%2A> method to add and then remove an ACL entry from a file. You must supply a valid user or group account to run this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileInfo/GetAccessControl/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileInfo.GetAccessControl-SetAccessControl/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileInfo/GetAccessControl/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/FileOptions.xml b/xml/System.IO/FileOptions.xml
index 8cb1f61425b..2d42d1b5948 100644
--- a/xml/System.IO/FileOptions.xml
+++ b/xml/System.IO/FileOptions.xml
@@ -81,7 +81,7 @@
  The following example shows how to use the Asynchronous value when creating a file stream.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileOptions/Overview/example2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor2/VB/example2.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileOptions/Overview/example2.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/FileStream.xml b/xml/System.IO/FileStream.xml
index 509ef897f76..79bb7e25a55 100644
--- a/xml/System.IO/FileStream.xml
+++ b/xml/System.IO/FileStream.xml
@@ -75,12 +75,12 @@
 
         :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/fstream class.cs" id="Snippet1":::
         :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/Overview/fstream class.fs" id="Snippet1":::
-        :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FStream Class/VB/fstream class.vb" id="Snippet1":::
+        :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/fstream class.vb" id="Snippet1":::
 
         The following example shows how to write to a file asynchronously. This code runs in a WPF app that has a TextBlock named UserInput and a button hooked up to a Click event handler that is named Button_Click. The file path needs to be changed to a file that exists on the computer.
 
         :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/example3.cs" id="Snippet3":::
-        :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example3.vb" id="Snippet3":::
+        :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/example3.vb" id="Snippet3":::
       ]]></format>
     </example>
     <altmember cref="T:System.IO.File" />
@@ -1481,7 +1481,7 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/.ctor/example.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/.ctor/example.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor1/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/.ctor/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1700,7 +1700,7 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileOptions/Overview/example.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileOptions/Overview/example.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.FileStream.ctor2/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileOptions/Overview/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2075,7 +2075,7 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/CanSeek/fstream canseek.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/CanSeek/fstream canseek.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FStream CanSeek/VB/fstream canseek.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/CanSeek/fstream canseek.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2143,7 +2143,7 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/CanWrite/fstream canwrite.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/CanWrite/fstream canwrite.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FStream CanWrite/VB/fstream canwrite.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/CanWrite/fstream canwrite.vb" id="Snippet1":::
 
  The following is an example using the `CanWrite` property. The output of this code is "MyFile.txt is writable." To get the output message "MyFile.txt can be both written to and read from.", change the `FileAccess` parameter to `ReadWrite` in the `FileStream` constructor.
 
@@ -3555,7 +3555,7 @@ Use <xref:System.IO.BinaryReader> for reading primitive data types.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Read/fsread.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/Read/fsread.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FSRead/VB/fsread.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Read/fsread.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3630,7 +3630,7 @@ The following example shows how to read from a file asynchronously.
 
 :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/example4.cs" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/Overview/example4.fs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example4.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/example4.vb" id="Snippet4":::
 
           ]]></format>
         </remarks>
@@ -3717,7 +3717,7 @@ The following example shows how to read from a file asynchronously.
 
 :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/example4.cs" id="Snippet4":::
 :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/Overview/example4.fs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example4.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/example4.vb" id="Snippet4":::
 
 ]]></format>
         </remarks>
@@ -4490,7 +4490,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to write asynchronously to a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/example3.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example3.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/example3.vb" id="Snippet3":::
 
 ]]></format>
         </remarks>
diff --git a/xml/System.IO/FileSystemEventArgs.xml b/xml/System.IO/FileSystemEventArgs.xml
index 23254c5a63a..d54944f9fb2 100644
--- a/xml/System.IO/FileSystemEventArgs.xml
+++ b/xml/System.IO/FileSystemEventArgs.xml
@@ -67,7 +67,7 @@ The <xref:System.IO.FileSystemEventArgs> class is passed as a parameter to event
  The following example shows how to create a <xref:System.IO.FileSystemWatcher> to monitor file changes (creates, deletes, renames, changes) occurring on a disk drive. The example also shows how to properly receive error notifications.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -195,7 +195,7 @@ The <xref:System.IO.FileSystemEventArgs> class is passed as a parameter to event
  The following example demonstrates the <xref:System.IO.FileSystemEventArgs.ChangeType%2A> property. This code example is part of a larger example provided for the <xref:System.IO.FileSystemEventArgs> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -259,7 +259,7 @@ This property returns the same path that `FileSystemWatcher` is initialized with
 The following example demonstrates the <xref:System.IO.FileSystemEventArgs.FullPath%2A> property. This code example is part of a larger example provided for the <xref:System.IO.FileSystemEventArgs> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/FileSystemEventHandler.xml b/xml/System.IO/FileSystemEventHandler.xml
index 1f31c45d624..22c2811b3fb 100644
--- a/xml/System.IO/FileSystemEventHandler.xml
+++ b/xml/System.IO/FileSystemEventHandler.xml
@@ -64,7 +64,7 @@
  The following example shows how to create a FileSystemWatcher to monitor file changes (creates, deletes, renames, changes) occurring on a disk drive. The example also shows how to properly receive error notifications.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/FileSystemInfo.xml b/xml/System.IO/FileSystemInfo.xml
index d44efda9109..d35eef8128c 100644
--- a/xml/System.IO/FileSystemInfo.xml
+++ b/xml/System.IO/FileSystemInfo.xml
@@ -105,7 +105,7 @@
  The following example shows how to loop through all the files and directories, querying some information about each entry.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemInfo/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemInfo/VB/FileSystemInfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemInfo/Overview/FileSystemInfo.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -336,7 +336,7 @@
  The following example demonstrates the <xref:System.IO.FileSystemInfo.Attributes%2A> property. This code example is part of a larger example provided for the <xref:System.IO.FileSystemInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemInfo/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemInfo/VB/FileSystemInfo.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemInfo/Overview/FileSystemInfo.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -493,7 +493,7 @@ On Unix platforms that do not support creation or birth time, this property retu
  The following example demonstrates the <xref:System.IO.FileSystemInfo.CreationTime%2A> property. This code example is part of a larger example provided for the <xref:System.IO.FileSystemInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemInfo/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemInfo/VB/FileSystemInfo.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemInfo/Overview/FileSystemInfo.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -852,7 +852,7 @@ The `Extension` property returns the <xref:System.IO.FileSystemInfo> extension,
  The following example demonstrates the <xref:System.IO.FileSystemInfo.FullName%2A> property. This code example is part of a larger example provided for the <xref:System.IO.FileSystemInfo> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemInfo/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemInfo/VB/FileSystemInfo.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemInfo/Overview/FileSystemInfo.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/InternalBufferOverflowException.xml b/xml/System.IO/InternalBufferOverflowException.xml
index 59663cc89ed..08bffa61455 100644
--- a/xml/System.IO/InternalBufferOverflowException.xml
+++ b/xml/System.IO/InternalBufferOverflowException.xml
@@ -66,7 +66,7 @@
  The following example shows how to create a FileSystemWatcher to monitor file changes (creates, deletes, renames, changes) occurring on a disk drive. The example also shows how to properly receive error notifications.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/Path.xml b/xml/System.IO/Path.xml
index a8ec6014ac3..4d8af6788be 100644
--- a/xml/System.IO/Path.xml
+++ b/xml/System.IO/Path.xml
@@ -117,7 +117,7 @@ For more information on file path formats on Windows, see [File path formats on
  The following example demonstrates some of the main members of the `Path` class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Path/Overview/path class.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Path Class/VB/path class.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Path/Overview/path class.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -509,7 +509,7 @@ If any element in `paths` but the last one is not a drive and does not end with
  The following example demonstrates using the `Combine` method on Windows.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Path/Combine/pathcombine.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/pathcombine/VB/pathcombine.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Path/Combine/pathcombine.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1656,7 +1656,7 @@ The following example defines a variable, `basePath`, to represent an applicatio
  The following example demonstrates the <xref:System.IO.Path.GetInvalidFileNameChars%2A> method and the <xref:System.IO.Path.GetInvalidPathChars%2A> method to retrieve invalid characters.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Path/GetInvalidFileNameChars/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.Path.GetInvalidFile-PathChars/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Path/GetInvalidFileNameChars/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1716,7 +1716,7 @@ The following example defines a variable, `basePath`, to represent an applicatio
  The following example demonstrates the <xref:System.IO.Path.GetInvalidFileNameChars%2A> method and the <xref:System.IO.Path.GetInvalidPathChars%2A> method to retrieve invalid characters.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Path/GetInvalidFileNameChars/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.Path.GetInvalidFile-PathChars/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Path/GetInvalidFileNameChars/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/RenamedEventArgs.xml b/xml/System.IO/RenamedEventArgs.xml
index c599ba0a173..0200183340b 100644
--- a/xml/System.IO/RenamedEventArgs.xml
+++ b/xml/System.IO/RenamedEventArgs.xml
@@ -60,7 +60,7 @@
  The following example shows how to create a `FileSystemWatcher` to monitor file changes (creates, deletes, renames, changes) occurring on a disk drive. The example also shows how to properly receive error notifications.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -191,7 +191,7 @@ This property returns the same path that `FileSystemWatcher` is initialized with
 The following example demonstrates the <xref:System.IO.RenamedEventArgs.OldFullPath%2A> property. This code example is part of a larger example provided for the <xref:System.IO.RenamedEventArgs> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/RenamedEventHandler.xml b/xml/System.IO/RenamedEventHandler.xml
index a2ca73c06d3..4c56f571091 100644
--- a/xml/System.IO/RenamedEventHandler.xml
+++ b/xml/System.IO/RenamedEventHandler.xml
@@ -64,7 +64,7 @@
  The following example shows how to create a FileSystemWatcher to monitor file changes (creates, deletes, renames, changes) occurring on a disk drive. The example also shows how to properly receive error notifications.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/Stream.xml b/xml/System.IO/Stream.xml
index bf907514474..2967451f4c6 100644
--- a/xml/System.IO/Stream.xml
+++ b/xml/System.IO/Stream.xml
@@ -131,7 +131,7 @@
  The following example demonstrates how to use two <xref:System.IO.FileStream> objects to asynchronously copy the files from one directory to another directory. The <xref:System.IO.FileStream> class derives from the <xref:System.IO.Stream> class. Notice that the <xref:System.Web.UI.WebControls.Button.Click> event handler for the <xref:System.Windows.Controls.Button> control is marked with the `async` modifier because it calls an asynchronous method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/example.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -944,7 +944,7 @@
  The following example demonstrates how to use two <xref:System.IO.FileStream> objects to asynchronously copy the files from one directory to another. The <xref:System.IO.FileStream> class derives from the <xref:System.IO.Stream> class.  Notice that the <xref:System.Web.UI.WebControls.Button.Click> event handler for the <xref:System.Windows.Controls.Button> control is marked with the `async` modifier because it calls an asynchronous method
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/example.vb" id="Snippet1":::
 
 ]]></format>
         </remarks>
@@ -2285,7 +2285,7 @@
  The following example shows how to read from a file asynchronously. The example uses the <xref:System.IO.FileStream> class, which derives from the <xref:System.IO.Stream> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/example4.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/example4.vb" id="Snippet4":::
 
 ]]></format>
         </remarks>
@@ -3437,7 +3437,7 @@ This member is an explicit interface member implementation. It can be used only
  The following example shows how to write asynchronously to a file. The example uses the <xref:System.IO.FileStream> class, which derives from the <xref:System.IO.Stream> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Overview/example3.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Asynchronous_File_IO_async/vb/example3.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Overview/example3.vb" id="Snippet3":::
 
 ]]></format>
         </remarks>
diff --git a/xml/System.IO/StreamReader.xml b/xml/System.IO/StreamReader.xml
index 6db6a6f29f5..920320ed58d 100644
--- a/xml/System.IO/StreamReader.xml
+++ b/xml/System.IO/StreamReader.xml
@@ -110,7 +110,7 @@
  The following example uses an instance of <xref:System.IO.StreamReader> to read text from a file. The constructor used in this example is not supported for use in Windows Store Apps.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/Overview/readtextfile.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ReadTextFile/VB/readtextfile.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/Overview/readtextfile.vb" id="Snippet1":::
 
  The following example instantiates a <xref:System.IO.StreamReader> object and calls its <xref:System.IO.StreamReader.ReadAsync%2A> method to read a file asynchronously.
 
@@ -203,7 +203,7 @@
  The following code example demonstrates this <xref:System.IO.StreamReader> constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/.ctor/strmreader ctor1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmReader Ctor1/VB/strmreader ctor1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/.ctor/strmreader ctor1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -287,7 +287,7 @@
  The following code example demonstrates this <xref:System.IO.StreamReader> constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/.ctor/strmreader ctor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmReader Ctor2/VB/strmreader ctor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/.ctor/strmreader ctor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1456,7 +1456,7 @@ Following a call to <xref:System.IO.StreamReader.Close%2A>, any operations on th
  The following code example gets the encoding of the specified <xref:System.IO.StreamReader> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/CurrentEncoding/strmreader currentencoding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmReader CurrentEncoding/VB/strmreader currentencoding.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/CurrentEncoding/strmreader currentencoding.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1796,7 +1796,7 @@ Following a call to <xref:System.IO.StreamReader.Close%2A>, any operations on th
  The following code example reads lines from a file until the end of the file is reached.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/Peek/strmreader peek.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmReader Peek/VB/strmreader peek.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/Peek/strmreader peek.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1887,12 +1887,12 @@ Following a call to <xref:System.IO.StreamReader.Close%2A>, any operations on th
  The following code example demonstrates a simple use of the <xref:System.IO.StreamReader.Read%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/Read/strmreader read1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmReader Read1/VB/strmreader read1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/Read/strmreader read1.vb" id="Snippet1":::
 
  The following code example demonstrates reading a single character using the <xref:System.IO.StreamReader.Read> method overload, formatting the ASCII integer output as decimal and hexadecimal.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/Read/strmrdrread.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmRdrRead/VB/strmrdrread.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/Read/strmrdrread.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2032,7 +2032,7 @@ Following a call to <xref:System.IO.StreamReader.Close%2A>, any operations on th
  The following code example reads five characters at a time until the end of the file is reached.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/Read/strmreader read2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmReader Read2/VB/strmreader read2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/Read/strmreader read2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2498,7 +2498,7 @@ Following a call to <xref:System.IO.StreamReader.Close%2A>, any operations on th
  The following code example reads lines from a file until the end of the file is reached.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/ReadLine/strmreader readline.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmReader ReadLine/VB/strmreader readline.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/ReadLine/strmreader readline.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2718,7 +2718,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following code example reads all the way to the end of a file in one operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamReader/ReadToEnd/strmreader readtoend.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrmReader ReadToEnd/VB/strmreader readtoend.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamReader/ReadToEnd/strmreader readtoend.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/StreamWriter.xml b/xml/System.IO/StreamWriter.xml
index 1e1dce4eb1d..7935a269a57 100644
--- a/xml/System.IO/StreamWriter.xml
+++ b/xml/System.IO/StreamWriter.xml
@@ -105,7 +105,7 @@
  The following example shows how to use a <xref:System.IO.StreamWriter> object to write a file that lists the directories on the C drive, and then uses a <xref:System.IO.StreamReader> object to read and display each directory name. A good practice is to use these objects in a `using` statement so that the unmanaged resources are correctly disposed. The `using` statement automatically calls <xref:System.IDisposable.Dispose%2A> on the object when the code that is using it has completed. The constructor used in this example is not supported for use in Windows Store Apps.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamWriter/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/streamreadwrite/vb/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamWriter/Overview/module1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/WaitForChangedResult.xml b/xml/System.IO/WaitForChangedResult.xml
index e59d0c2a066..9d8ede1b198 100644
--- a/xml/System.IO/WaitForChangedResult.xml
+++ b/xml/System.IO/WaitForChangedResult.xml
@@ -56,7 +56,7 @@
 ## Examples  
  This example shows how to use a <xref:System.IO.FileSystemWatcher> synchronously by having it wait for a specific file change notification to occur.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WaitForChangedResult/VB/WaitforChangedResult.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/WaitForChangedResult/Overview/WaitforChangedResult.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -188,7 +188,7 @@
 ## Examples  
  The following example demonstrates the <xref:System.IO.WaitForChangedResult.Name%2A> property. This code example is part of a larger example provided for the <xref:System.IO.WaitForChangedResult> structure.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WaitForChangedResult/VB/WaitforChangedResult.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/WaitForChangedResult/Overview/WaitforChangedResult.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/WatcherChangeTypes.xml b/xml/System.IO/WatcherChangeTypes.xml
index 0aba77b92dd..48b8ab82c24 100644
--- a/xml/System.IO/WatcherChangeTypes.xml
+++ b/xml/System.IO/WatcherChangeTypes.xml
@@ -61,7 +61,7 @@
  The following example shows how to create a FileSystemWatcher to monitor file changes (creates, deletes, renames, changes) occurring on a disk drive. The example also shows how to properly receive error notifications.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/filesystemwatcher.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FileSystemWatcher/VB/FileSystemWatcher.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/FileSystemWatcher.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection.Emit/AssemblyBuilder.xml b/xml/System.Reflection.Emit/AssemblyBuilder.xml
index 212c3298a15..270baef5e3f 100644
--- a/xml/System.Reflection.Emit/AssemblyBuilder.xml
+++ b/xml/System.Reflection.Emit/AssemblyBuilder.xml
@@ -91,7 +91,7 @@ The following code example shows how to define and use a dynamic assembly. The e
 
 :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/AssemblyBuilder/Overview/24895.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Reflection.Emit/AssemblyBuilder/Overview/24895.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilderClass/vb/24895.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/Overview/24895.vb" id="Snippet1":::
       ]]></format>
     </example>
     <altmember cref="Overload:System.AppDomain.DefineDynamicAssembly" />
@@ -961,7 +961,7 @@ The following code example shows how to define and use a dynamic assembly. The e
  The following example uses the <xref:System.Reflection.Emit.AssemblyBuilder.DefineResource%2A> method to get a resource writer. The example uses the resource writer to add three resource strings.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/AssemblyBuilder/DefineResource/assemblybuilder_defineresource.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder.DefineResource Example 2/VB/assemblybuilder_defineresource.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineResource/assemblybuilder_defineresource.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1112,7 +1112,7 @@ The following code example shows how to define and use a dynamic assembly. The e
  The following code sample creates and attaches an array of bytes representing an unmanaged resource to a dynamic assembly, using `DefineUnmanagedResource`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/assemblybuilder_defineunmanagedresource2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource2/VB/assemblybuilder_defineunmanagedresource2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/assemblybuilder_defineunmanagedresource2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1167,7 +1167,7 @@ The following code example shows how to define and use a dynamic assembly. The e
  The example below demonstrates a call to `DefineUnmanagedResource`, passing an external resource file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/assemblybuilder_defineunmanagedresource.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineUnmanagedResource/VB/assemblybuilder_defineunmanagedresource.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/DefineUnmanagedResource/assemblybuilder_defineunmanagedresource.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1241,7 +1241,7 @@ The following code example shows how to define and use a dynamic assembly. The e
  The example below illustrates the usage of `DefineVersionInfoResource`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineVersionInfoResource/VB/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1304,7 +1304,7 @@ The following code example shows how to define and use a dynamic assembly. The e
  The example below illustrates the usage of `DefineVersionInfoResource`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineVersionInfoResource/VB/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3321,7 +3321,7 @@ The following code example shows how to define and use a dynamic assembly. The e
  The following code sample illustrates the use of `SetCustomAttribute` within <xref:System.Reflection.Emit.AssemblyBuilder>, using a <xref:System.Reflection.Emit.CustomAttributeBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/AssemblyBuilder/SetCustomAttribute/assemblybuilder_setcustomattribute1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_SetCustomAttribute1/VB/assemblybuilder_setcustomattribute1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/SetCustomAttribute/assemblybuilder_setcustomattribute1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3399,7 +3399,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample illustrates the use of `SetCustomAttribute` to attach a custom attribute to a dynamically generated assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/AssemblyBuilder/SetCustomAttribute/assemblybuilder_setcustomattribute2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_SetCustomAttribute2/VB/assemblybuilder_setcustomattribute2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/SetCustomAttribute/assemblybuilder_setcustomattribute2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/ConstructorBuilder.xml b/xml/System.Reflection.Emit/ConstructorBuilder.xml
index ac128d7da99..d51d1b620e8 100644
--- a/xml/System.Reflection.Emit/ConstructorBuilder.xml
+++ b/xml/System.Reflection.Emit/ConstructorBuilder.xml
@@ -178,7 +178,7 @@
  The following code sample illustrates the use of `AddDeclarativeSecurity`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ConstructorBuilder/AddDeclarativeSecurity/constructorbuilder_attributes_4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_Attributes_4/VB/constructorbuilder_attributes_4.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/AddDeclarativeSecurity/constructorbuilder_attributes_4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -238,7 +238,7 @@
  The following code sample illustrates the use of `Attributes`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ConstructorBuilder/AddDeclarativeSecurity/constructorbuilder_attributes_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_Attributes_4/VB/constructorbuilder_attributes_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/AddDeclarativeSecurity/constructorbuilder_attributes_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -339,7 +339,7 @@
  The following code sample illustrates the use of `DeclaringType`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ConstructorBuilder/AddDeclarativeSecurity/constructorbuilder_attributes_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_Attributes_4/VB/constructorbuilder_attributes_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/AddDeclarativeSecurity/constructorbuilder_attributes_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -772,7 +772,7 @@
  The following code sample illustrates the use of `GetMethodImplementationFlags`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_GetModule_4/VB/constructorbuilder_getmodule_4.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -870,7 +870,7 @@
  The code sample illustrates the use of `GetParameters`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_GetModule_4/VB/constructorbuilder_getmodule_4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -915,7 +915,7 @@
  This code sample illustrates the use of `GetToken`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_GetModule_4/VB/constructorbuilder_getmodule_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1402,7 +1402,7 @@
  The following code sample illustrates the use of `Name`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ConstructorBuilder/Name/constructorbuilder_name_5.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_Name_5/VB/constructorbuilder_name_5.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/Name/constructorbuilder_name_5.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1564,7 +1564,7 @@
  The following code sample illustrates the use of `SetCustomAttribute` of the context of a <xref:System.Reflection.Emit.ConstructorBuilder>, passing a <xref:System.Reflection.Emit.CustomAttributeBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ConstructorBuilder/SetCustomAttribute/constructorbuilder_setcustomattribute1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetCustomAttribute1/VB/constructorbuilder_setcustomattribute1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetCustomAttribute/constructorbuilder_setcustomattribute1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1638,7 +1638,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample illustrates the use of `SetCustomAttribute` of the context of a <xref:System.Reflection.Emit.ConstructorBuilder>, passing a byte blob.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ConstructorBuilder/SetCustomAttribute/constructorbuilder_setcustomattribute2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetCustomAttribute2/VB/constructorbuilder_setcustomattribute2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetCustomAttribute/constructorbuilder_setcustomattribute2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1732,7 +1732,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample illustrates the use of `SetImplementationFlags`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ConstructorBuilder/SetImplementationFlags/constructorbuilder_setimplementationflags.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetImplementationFlags/VB/constructorbuilder_setimplementationflags.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetImplementationFlags/constructorbuilder_setimplementationflags.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1862,7 +1862,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample illustrates the use of `SetSymCustomAttributes`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ConstructorBuilder/SetSymCustomAttribute/constructorbuilder_setsymcustomattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_SetSymCustomAttribute/VB/constructorbuilder_setsymcustomattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ConstructorBuilder/SetSymCustomAttribute/constructorbuilder_setsymcustomattribute.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/DynamicMethod.xml b/xml/System.Reflection.Emit/DynamicMethod.xml
index 4c06196d25f..7e8b6b044a3 100644
--- a/xml/System.Reflection.Emit/DynamicMethod.xml
+++ b/xml/System.Reflection.Emit/DynamicMethod.xml
@@ -58,7 +58,7 @@
 The following code example creates a dynamic method that takes two parameters. The example emits a simple function body that prints the first parameter to the console, and the example uses the second parameter as the return value of the method. The example completes the method by creating a delegate, invokes the delegate with different parameters, and finally invokes the dynamic method using the <xref:System.Reflection.Emit.DynamicMethod.Invoke%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet1":::
       ]]></format>
     </example>
     <related type="Article" href="/dotnet/framework/reflection-and-codedom/how-to-define-and-execute-dynamic-methods">How to: Define and Execute Dynamic Methods</related>
@@ -361,7 +361,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example creates a dynamic method that takes two parameters. The example emits a simple function body that prints the first parameter to the console, and the example uses the second parameter as the return value of the method. The example completes the method by creating a delegate, invokes the delegate with different parameters, and finally invokes the dynamic method using the <xref:System.Reflection.Emit.DynamicMethod.Invoke%28System.Object%2CSystem.Reflection.BindingFlags%2CSystem.Reflection.Binder%2CSystem.Object%5B%5D%2CSystem.Globalization.CultureInfo%29> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ctor1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -479,7 +479,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The `UseLikeStatic` delegate is invoked, passing in the instance of `Example` that is bound to the `UseLikeInstance` delegate. Then the `UseLikeInstance` delegate is invoked, so that both delegates act on the same instance of `Example`. The changes in the values of the internal field are displayed after each call. Finally, a `UseLikeInstance` delegate is bound to an instance of `DerivedFromExample`, and the delegate calls are repeated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ClosedOver/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -977,7 +977,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the method attributes of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -1032,7 +1032,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the calling convention of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
@@ -1118,7 +1118,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example creates a dynamic method that takes two parameters. The example emits a simple function body that prints the first parameter to the console, and the example uses the second parameter as the return value of the method. The example completes the method by creating a delegate, invokes the delegate with different parameters, and finally invokes the dynamic method using the <xref:System.Reflection.Emit.DynamicMethod.Invoke%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ctor1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1226,7 +1226,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The `UseLikeStatic` delegate is invoked, passing in the instance of `Example` that is bound to the `UseLikeInstance` delegate. Then the `UseLikeInstance` delegate is invoked, so that both delegates act on the same instance of `Example`. The changes in the values of the internal field are displayed after each call. Finally, a `UseLikeInstance` delegate is bound to an instance of `DerivedFromExample`, and the delegate calls are repeated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ClosedOver/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1295,7 +1295,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the declaring type of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -1360,7 +1360,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example shows how to define parameter information for a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet33":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet33":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet33":::
 
  ]]></format>
         </remarks>
@@ -1665,7 +1665,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example creates a dynamic method that takes two parameters. The example emits a simple function body that prints the first parameter to the console, and the example uses the second parameter as the return value of the method. The example completes the method by creating a delegate, invokes the delegate with different parameters, and finally invokes the dynamic method using the <xref:System.Reflection.Emit.DynamicMethod.Invoke%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.ctor1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1734,7 +1734,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example demonstrates this method overload. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1839,7 +1839,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the parameters of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -1896,7 +1896,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the <xref:System.Reflection.Emit.DynamicMethod.InitLocals%2A> property of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet24":::
 
  ]]></format>
         </remarks>
@@ -1981,7 +1981,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example invokes a dynamic method with exact binding, using the US-English culture. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2432,7 +2432,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the <xref:System.Reflection.Emit.DynamicMethod.Module%2A> property of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet26":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet26":::
 
  ]]></format>
         </remarks>
@@ -2489,7 +2489,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the name of a dynamic method. This code example is part of a larger example provided for  the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet27":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet27":::
 
  ]]></format>
         </remarks>
@@ -2551,7 +2551,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the reflected type of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
@@ -2653,7 +2653,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the return type of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet30":::
 
  ]]></format>
         </remarks>
@@ -2708,7 +2708,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example shows how to display the custom attributes of the return type of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet31":::
 
  ]]></format>
         </remarks>
@@ -2765,7 +2765,7 @@ The following code example creates a dynamic method that takes two parameters. T
  The following code example displays the <xref:System.Reflection.Emit.DynamicMethod.ToString%2A> method of a dynamic method. This code example is part of a larger example provided for the <xref:System.Reflection.Emit.DynamicMethod> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/DynamicMethod/Overview/source.cs" id="Snippet32":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection.DynamicMethod.All/VB/source.vb" id="Snippet32":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/DynamicMethod/Overview/source.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/EnumBuilder.xml b/xml/System.Reflection.Emit/EnumBuilder.xml
index 16e5034413c..5f534019f50 100644
--- a/xml/System.Reflection.Emit/EnumBuilder.xml
+++ b/xml/System.Reflection.Emit/EnumBuilder.xml
@@ -102,7 +102,7 @@
 >  Prior to the .NET Framework version 2.0, this code example does not produce a correct enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/Overview/modulebuilder_defineenum.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineEnum/VB/modulebuilder_defineenum.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Overview/modulebuilder_defineenum.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -179,7 +179,7 @@
  The following code sample demonstrates the use of the `Assembly` property to reference the parent assembly of the current `EnumBuilder`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_5/VB/enumbuilder_properties_5.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -244,7 +244,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
 The following code sample demonstrates the use of the `AssemblyQualifiedName` property to reference the qualified parent assembly name of the current `EnumBuilder`.
 
 :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.cs" id="Snippet2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_5/VB/enumbuilder_properties_5.vb" id="Snippet2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.vb" id="Snippet2":::
           ]]></format>
         </example>
       </Docs>
@@ -626,7 +626,7 @@ The following code sample demonstrates the use of the `AssemblyQualifiedName` pr
 >  Prior to the .NET Framework version 2.0, this code example does not produce a correct enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/Overview/modulebuilder_defineenum.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineEnum/VB/modulebuilder_defineenum.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Overview/modulebuilder_defineenum.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1081,7 +1081,7 @@ The following code sample demonstrates the use of the `AssemblyQualifiedName` pr
  The following code sample illustrates the use of `GetCustomAttribute` in the context of <xref:System.Reflection.Emit.EnumBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_SetCustomAttribute2/VB/enumbuilder_setcustomattribute2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1141,7 +1141,7 @@ The following code sample demonstrates the use of the `AssemblyQualifiedName` pr
  The following code sample illustrates the use of `GetCustomAttribute` in the context of <xref:System.Reflection.Emit.EnumBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_SetCustomAttribute1/VB/enumbuilder_setcustomattribute1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2404,7 +2404,7 @@ The following code sample demonstrates the use of the `AssemblyQualifiedName` pr
  The following code sample demonstrates the use of the `GUID` property to reference the associated <xref:System.Guid> of the current `EnumBuilder`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/GUID/enumbuilder_properties_4.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_4.cs/VB/enumbuilder_properties_4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GUID/enumbuilder_properties_4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3490,7 +3490,7 @@ The following code sample demonstrates the use of the `AssemblyQualifiedName` pr
  The following code sample demonstrates the use of the `Module` property to reference the parent module of the current `EnumBuilder`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_5/VB/enumbuilder_properties_5.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3541,7 +3541,7 @@ The following code sample demonstrates the use of the `AssemblyQualifiedName` pr
  The following code sample demonstrates the use of the `Name` property to reference the name of the current `EnumBuilder`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_5/VB/enumbuilder_properties_5.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3599,7 +3599,7 @@ The following code sample demonstrates the use of the `AssemblyQualifiedName` pr
  The following code sample demonstrates the use of the `Namespace` property to reference the associated namespace of the current `EnumBuilder`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_Properties_5/VB/enumbuilder_properties_5.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Assembly/enumbuilder_properties_5.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -3711,7 +3711,7 @@ The following code sample demonstrates the use of the `AssemblyQualifiedName` pr
  The following code sample illustrates the use of `SetCustomAttribute` in the context of <xref:System.Reflection.Emit.EnumBuilder>, passing a <xref:System.Reflection.Emit.CustomAttributeBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_SetCustomAttribute2/VB/enumbuilder_setcustomattribute2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3785,7 +3785,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample illustrates the use of `SetCustomAttribute` in the context of <xref:System.Reflection.Emit.EnumBuilder>, passing a byte blob.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EnumBuilder_SetCustomAttribute2/VB/enumbuilder_setcustomattribute2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/GetCustomAttributes/enumbuilder_setcustomattribute2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/FieldBuilder.xml b/xml/System.Reflection.Emit/FieldBuilder.xml
index 827940ee522..86a1857a619 100644
--- a/xml/System.Reflection.Emit/FieldBuilder.xml
+++ b/xml/System.Reflection.Emit/FieldBuilder.xml
@@ -89,7 +89,7 @@
  The following example illustrates the use of the `FieldBuilder` class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/FieldBuilder/Overview/FieldBuilder.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_Class_Name/FieldBuilder.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Overview/FieldBuilder.vb":::
 
  ]]></format>
     </remarks>
@@ -166,7 +166,7 @@
  The following code sample illustrates the use of `Attributes`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/FieldBuilder/Attributes/fieldbuilder_reflectedtype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_ReflectedType/VB/fieldbuilder_reflectedtype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Attributes/fieldbuilder_reflectedtype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -667,7 +667,7 @@
  The following code sample illustrates the use of `Name`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/FieldBuilder/Overview/FieldBuilder.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_Class_Name/FieldBuilder.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Overview/FieldBuilder.vb":::
 
  ]]></format>
         </remarks>
@@ -727,7 +727,7 @@
  The following code sample illustrates the use of `ReflectedType`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/FieldBuilder/Attributes/fieldbuilder_reflectedtype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_ReflectedType/VB/fieldbuilder_reflectedtype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/Attributes/fieldbuilder_reflectedtype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -894,7 +894,7 @@
  The following code sample illustrates the use of `SetCustomAttribute` in the context of <xref:System.Reflection.Emit.FieldBuilder>, using a <xref:System.Reflection.Emit.CustomAttributeBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/FieldBuilder/SetCustomAttribute/fieldbuilder_setcustomattributes.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_SetCustomAttributes/VB/fieldbuilder_setcustomattributes.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/SetCustomAttribute/fieldbuilder_setcustomattributes.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -969,7 +969,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample illustrates the use of `SetCustomAttribute` in the context of <xref:System.Reflection.Emit.FieldBuilder>, using a byte blob.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/FieldBuilder/SetCustomAttribute/fieldbuilder_setcustomattributes.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_SetCustomAttributes/VB/fieldbuilder_setcustomattributes.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/SetCustomAttribute/fieldbuilder_setcustomattributes.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1062,7 +1062,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample illustrates the use of `SetMarshal`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/FieldBuilder/SetMarshal/fieldbuilder_setoffset.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_SetOffset/VB/fieldbuilder_setoffset.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/SetMarshal/fieldbuilder_setoffset.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1125,7 +1125,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample illustrates the use of `SetOffset`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/FieldBuilder/SetMarshal/fieldbuilder_setoffset.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldBuilder_SetOffset/VB/fieldbuilder_setoffset.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/FieldBuilder/SetMarshal/fieldbuilder_setoffset.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/GenericTypeParameterBuilder.xml b/xml/System.Reflection.Emit/GenericTypeParameterBuilder.xml
index b18e5c419a4..b7e72e74581 100644
--- a/xml/System.Reflection.Emit/GenericTypeParameterBuilder.xml
+++ b/xml/System.Reflection.Emit/GenericTypeParameterBuilder.xml
@@ -82,7 +82,7 @@
  The following code example creates a generic type with two type parameters, and saves them in the assembly GenericEmitExample1.dll. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to view the generated types. For a more detailed explanation of the steps involved in defining a dynamic generic type, see [How to: Define a Generic Type with Reflection Emit](/dotnet/framework/reflection-and-codedom/how-to-define-a-generic-type-with-reflection-emit).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EmitGenericType/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -3309,7 +3309,7 @@
  The following code example creates a dynamic module, an abstract generic type named `Sample` with one type parameter, `T`, and an abstract method named `TestMethod`. `TestMethod` takes a `ref` parameter (`ByRef` in Visual Basic) of type `T`, a pointer to type `T`, and an array of `T`. This method returns a two-dimensional array of `T`. The code example saves the dynamic module to disk, so you can examine it using the MSIL Disassembler (Ildasm.exe).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MakeXxxGenericTypeParameterBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3376,7 +3376,7 @@
  The following code example creates a dynamic module, an abstract generic type named `Sample` with one type parameter, `T`, and an abstract method named `TestMethod`. `TestMethod` takes a `ref` parameter (`ByRef` in Visual Basic) of type `T`, a pointer to type `T`, and an array of `T`. This method returns a two-dimensional array of `T`. The code example saves the dynamic module to disk, so you can examine it using the MSIL Disassembler (Ildasm.exe).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MakeXxxGenericTypeParameterBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3436,7 +3436,7 @@
  The following code example creates a dynamic module, an abstract generic type named `Sample` with one type parameter, `T`, and an abstract method named `TestMethod`. `TestMethod` takes a `ref` parameter (`ByRef` in Visual Basic) of type `T`, a pointer to type `T`, and an array of `T`. This method returns a two-dimensional array of `T`. The code example saves the dynamic module to disk, so you can examine it using the MSIL Disassembler (Ildasm.exe).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MakeXxxGenericTypeParameterBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3556,7 +3556,7 @@
  The following code example creates a dynamic module, an abstract generic type named `Sample` with one type parameter, `T`, and an abstract method named `TestMethod`. `TestMethod` takes a `ref` parameter (`ByRef` in Visual Basic) of type `T`, a pointer to type `T`, and an array of `T`. This method returns a two-dimensional array of `T`. The code example saves the dynamic module to disk, so you can examine it using the MSIL Disassembler (Ildasm.exe).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MakeXxxGenericTypeParameterBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/MakeArrayType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3844,7 +3844,7 @@
  The following code example creates a generic type with two type parameters, the second of which has a base type constraint, and saves them in the assembly GenericEmitExample1.dll. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to view the generated types. For a more detailed explanation of the steps involved in defining a dynamic generic type, see [How to: Define a Generic Type with Reflection Emit](/dotnet/framework/reflection-and-codedom/how-to-define-a-generic-type-with-reflection-emit).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EmitGenericType/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4095,7 +4095,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code example creates a generic type with two type parameters, the first of which is constrained to have a parameterless constructor and to be a reference type, and saves them in the assembly GenericEmitExample1.dll. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to view the generated types. For a more detailed explanation of the steps involved in defining a dynamic generic type, see [How to: Define a Generic Type with Reflection Emit](/dotnet/framework/reflection-and-codedom/how-to-define-a-generic-type-with-reflection-emit).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EmitGenericType/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4205,7 +4205,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code example creates a generic type with two type parameters, the second of which has two interface constraints, and saves them in the assembly GenericEmitExample1.dll. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to view the generated types. For a more detailed explanation of the steps involved in defining a dynamic generic type, see [How to: Define a Generic Type with Reflection Emit](/dotnet/framework/reflection-and-codedom/how-to-define-a-generic-type-with-reflection-emit).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EmitGenericType/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/ILGenerator.xml b/xml/System.Reflection.Emit/ILGenerator.xml
index 67b0a7d149b..2e426dd4b25 100644
--- a/xml/System.Reflection.Emit/ILGenerator.xml
+++ b/xml/System.Reflection.Emit/ILGenerator.xml
@@ -362,7 +362,7 @@
  The following code sample illustrates the use of `BeginFaultBlock`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/BeginFaultBlock/ilgenerator_beginfaultblock.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ILGenerator_BeginFaultBlock/VB/ilgenerator_beginfaultblock.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginFaultBlock/ilgenerator_beginfaultblock.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -422,7 +422,7 @@
  The following code sample illustrates the use of `BeginFinallyBlock`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/BeginFinallyBlock/ilgenerator_beginfinallyblock_2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ILGenerator_BeginFinallyBlock_2/VB/ilgenerator_beginfinallyblock_2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginFinallyBlock/ilgenerator_beginfinallyblock_2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@
  The following code sample illustrates the use of `BeginScope` and `EndScope`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/BeginScope/ilgenerator_begin_endscope.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ILGenerator_Begin_EndScope/VB/ilgenerator_begin_endscope.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginScope/ilgenerator_begin_endscope.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -592,7 +592,7 @@
  The following code example demonstrates the use of the `DeclareLocal` method. This code is part of a larger code example for the <xref:System.Reflection.Emit.LocalBuilder> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/LocalBuilder_Sample_SetLocalSymInfo/VB/localbuilder_sample_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2401,7 +2401,7 @@ The following code example emits two methods, a `varargs` method and a method th
  The following code sample illustrates the use of `BeginScope` and `EndScope`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/BeginScope/ilgenerator_begin_endscope.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ILGenerator_Begin_EndScope/VB/ilgenerator_begin_endscope.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/BeginScope/ilgenerator_begin_endscope.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/LocalBuilder.xml b/xml/System.Reflection.Emit/LocalBuilder.xml
index bbfe6ac0799..fcbac474a89 100644
--- a/xml/System.Reflection.Emit/LocalBuilder.xml
+++ b/xml/System.Reflection.Emit/LocalBuilder.xml
@@ -92,7 +92,7 @@
  The following example creates a `static` method (`Shared` in Visual Basic) named `Function1` that returns a string and has a parameter of type <xref:System.Int32>. In the body of the method, the code example creates <xref:System.Reflection.Emit.LocalBuilder> objects representing two local variables, and sets symbol information for the local variables. The method does not do anything significant, but the method body demonstrates storing a parameter to a local variable, storing a literal string to a local variable, and loading a local variable.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/LocalBuilder_Sample_SetLocalSymInfo/VB/localbuilder_sample_4.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -262,7 +262,7 @@
  The following code sample illustrates the use of `LocalType`. This code is part of a larger example for the <xref:System.Reflection.Emit.LocalBuilder> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/LocalBuilder_Sample_SetLocalSymInfo/VB/localbuilder_sample_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -321,7 +321,7 @@
  The following code sample illustrates the use of the <xref:System.Reflection.Emit.LocalBuilder.SetLocalSymInfo%2A> method. This code is part of a larger example for the <xref:System.Reflection.Emit.LocalBuilder> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/LocalBuilder_Sample_SetLocalSymInfo/VB/localbuilder_sample_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -385,7 +385,7 @@
  The following code sample illustrates the use of the <xref:System.Reflection.Emit.LocalBuilder.SetLocalSymInfo%2A> method. This code is part of a larger example for the <xref:System.Reflection.Emit.LocalBuilder> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/LocalBuilder_Sample_SetLocalSymInfo/VB/localbuilder_sample_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ILGenerator/DeclareLocal/localbuilder_sample_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/MethodBuilder.xml b/xml/System.Reflection.Emit/MethodBuilder.xml
index 5099a726feb..83675ab1eb7 100644
--- a/xml/System.Reflection.Emit/MethodBuilder.xml
+++ b/xml/System.Reflection.Emit/MethodBuilder.xml
@@ -430,7 +430,7 @@ The following example uses the <xref:System.Reflection.Emit.MethodBuilder> class
  The following code illustrates the use of the `Type` property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DeclaringType/methodbuilderclass.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBuilderClass_TypeSample/VB/methodbuilderclass.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DeclaringType/methodbuilderclass.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -507,7 +507,7 @@ The following example uses the <xref:System.Reflection.Emit.MethodBuilder> class
 >  This code example generates a simple method body that merely returns a null reference. For a code example with a more fully developed method body that creates and uses generic types, see [How to: Define a Generic Method with Reflection Emit](/dotnet/framework/reflection-and-codedom/how-to-define-a-generic-method-with-reflection-emit).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1667,7 +1667,7 @@ The following example uses the <xref:System.Reflection.Emit.MethodBuilder> class
  The following code example displays the status of a method. This code is part of a larger example provided for the <xref:System.Reflection.Emit.MethodBuilder.DefineGenericParameters%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1724,7 +1724,7 @@ The following example uses the <xref:System.Reflection.Emit.MethodBuilder> class
  The following code example displays the status of a method. This code is part of a larger example provided for the <xref:System.Reflection.Emit.MethodBuilder.DefineGenericParameters%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1938,7 +1938,7 @@ The following example uses the <xref:System.Reflection.Emit.MethodBuilder> class
 >  For another code example that uses <xref:System.Reflection.Emit.MethodBuilder.MakeGenericMethod%2A>, see <xref:System.Reflection.Emit.MethodBuilder.DefineGenericParameters%2A>. <xref:System.Reflection.Emit.MethodBuilder.MakeGenericMethod%2A> is also used extensively when emitting code that uses generic types. See [How to: Define a Generic Method with Reflection Emit](/dotnet/framework/reflection-and-codedom/how-to-define-a-generic-method-with-reflection-emit).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/MakeGenericMethod/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBuilder.MakeGenericMethod/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/MakeGenericMethod/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2801,9 +2801,9 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  This code is part of a larger example provided for the <xref:System.Reflection.Emit.MethodBuilder.DefineGenericParameters%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2875,9 +2875,9 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  This code is part of a larger example provided for the <xref:System.Reflection.Emit.MethodBuilder.DefineGenericParameters%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2998,7 +2998,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  When the code example is run, it saves the emitted assembly as TypeBuilderGetFieldExample.exe. You can run TypeBuilderGetFieldExample.exe, and you can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to compare the emitted code with the code for the `Sample` class that is compiled into the code example itself.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/SetSignature/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.GetField_Generic/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/SetSignature/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/ModuleBuilder.xml b/xml/System.Reflection.Emit/ModuleBuilder.xml
index d5a822832b3..d78b959a5c0 100644
--- a/xml/System.Reflection.Emit/ModuleBuilder.xml
+++ b/xml/System.Reflection.Emit/ModuleBuilder.xml
@@ -86,7 +86,7 @@
  The following code sample demonstrates the use of `ModuleBuilder` to create a dynamic module. Note that the ModuleBuilder is created by calling <xref:System.Reflection.Emit.AssemblyBuilder.DefineDynamicModule%2A> in <xref:System.Reflection.Emit.AssemblyBuilder>, rather than through a constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/Overview/modulebuilder.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_Class/VB/modulebuilder.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/Overview/modulebuilder.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -212,7 +212,7 @@
  The following sample illustrates the use of `CreateGlobalFunctions` to create a static global method from a <xref:System.Reflection.Emit.MethodBuilder> implemented with <xref:System.Reflection.Emit.ModuleBuilder.DefineGlobalMethod%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/CreateGlobalFunctions/modulebuilder_createglobalfunctions.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_CreateGlobalFunctions/VB/modulebuilder_createglobalfunctions.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/CreateGlobalFunctions/modulebuilder_createglobalfunctions.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
  The following code sample illustrates the use of `DefineDocument` to attach an external symbol document (in this case, a raw IL file) to a dynamic module.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineDocument/VB/modulebuilder_definedocument.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics.SymbolStore/ISymbolDocumentWriter/Overview/modulebuilder_definedocument.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -450,7 +450,7 @@
 >  Prior to the .NET Framework version 2.0, this code example does not produce a correct enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/EnumBuilder/Overview/modulebuilder_defineenum.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineEnum/VB/modulebuilder_defineenum.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/EnumBuilder/Overview/modulebuilder_defineenum.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -584,7 +584,7 @@
  The following example illustrates the use of `DefineGlobalMethod` to create a type-independent method tied to the current <xref:System.Reflection.Emit.ModuleBuilder>. After building the global method, <xref:System.Reflection.Emit.ModuleBuilder.CreateGlobalFunctions%2A> must be called in order to complete it.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/CreateGlobalFunctions/modulebuilder_createglobalfunctions.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_CreateGlobalFunctions/VB/modulebuilder_createglobalfunctions.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/CreateGlobalFunctions/modulebuilder_createglobalfunctions.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -678,7 +678,7 @@
  The following code sample illustrates the use of `DefineGlobalMethod` to create a type-independent method tied to the current <xref:System.Reflection.Emit.ModuleBuilder>. After building the global method, <xref:System.Reflection.Emit.ModuleBuilder.CreateGlobalFunctions%2A> must be called in order to complete it.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/CreateGlobalFunctions/modulebuilder_createglobalfunctions.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_CreateGlobalFunctions/VB/modulebuilder_createglobalfunctions.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/CreateGlobalFunctions/modulebuilder_createglobalfunctions.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -963,7 +963,7 @@
  The following example uses the <xref:System.Reflection.Emit.ModuleBuilder.DefineInitializedData%2A> method to define an initialized data field in the `.sdata` section of the portable executable (PE) file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineInitializedData/modulebuilder_defineinitializeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineInitializedData/VB/modulebuilder_defineinitializeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineInitializedData/modulebuilder_defineinitializeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1073,7 +1073,7 @@
  After running the example, you can run the emitted assembly. The code in the emitted assembly's `Main` method reads the embedded manifest resource and prints the byte values to the console. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to view the information in the assembly manifest.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineManifestResource/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DefineManifestResource/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineManifestResource/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1196,7 +1196,7 @@
 >  To get a non-zero return value, you must add <xref:System.Reflection.MethodImplAttributes.PreserveSig?displayProperty=nameWithType> to the method implementation flags after you create the <xref:System.Reflection.Emit.MethodBuilder>, by using the <xref:System.Reflection.Emit.MethodBuilder.GetMethodImplementationFlags%2A?displayProperty=nameWithType> and <xref:System.Reflection.Emit.MethodBuilder.SetImplementationFlags%2A?displayProperty=nameWithType> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefinePInvokeMethod/modulebuilder_definepinvokemethod1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefinePInvokeMethod1/VB/modulebuilder_definepinvokemethod1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefinePInvokeMethod/modulebuilder_definepinvokemethod1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1310,7 +1310,7 @@
  This example uses a different overload of the <xref:System.Reflection.Emit.ModuleBuilder.DefinePInvokeMethod%2A> method, but the technique is the same.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefinePInvokeMethod/modulebuilder_definepinvokemethod1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefinePInvokeMethod1/VB/modulebuilder_definepinvokemethod1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefinePInvokeMethod/modulebuilder_definepinvokemethod1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1440,7 +1440,7 @@
  The following example illustrates the use of `DefineResource` to add an external resource to the current <xref:System.Reflection.Emit.ModuleBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineResource/modulebuilder_defineresource1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineResource1/VB/modulebuilder_defineresource1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineResource/modulebuilder_defineresource1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1501,7 +1501,7 @@
  The following example illustrates the use of DefineResource to add an external resource to the current <xref:System.Reflection.Emit.ModuleBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineResource/modulebuilder_defineresource2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_DefineResource2/VB/modulebuilder_defineresource2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineResource/modulebuilder_defineresource2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2584,7 +2584,7 @@
  The following example demonstrates how to use <xref:System.Reflection.Emit.ModuleBuilder.GetArrayMethod%2A> to obtain the <xref:System.Reflection.MethodInfo> corresponding to a method that returns an array value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/GetArrayMethod/modulebuilder_getarraymethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_GetArrayMethod/VB/modulebuilder_getarraymethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/GetArrayMethod/modulebuilder_getarraymethod.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2703,7 +2703,7 @@
  The following example demonstrates how to use <xref:System.Reflection.Emit.ModuleBuilder.GetArrayMethod%2A> to obtain the <xref:System.Reflection.Emit.MethodToken> corresponding to a method that returns an array value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/GetArrayMethod/modulebuilder_getarraymethod.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ModuleBuilder_GetArrayMethod/VB/modulebuilder_getarraymethod.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/GetArrayMethod/modulebuilder_getarraymethod.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/PropertyBuilder.xml b/xml/System.Reflection.Emit/PropertyBuilder.xml
index 5b19d9e2da6..b9d3a7f6f85 100644
--- a/xml/System.Reflection.Emit/PropertyBuilder.xml
+++ b/xml/System.Reflection.Emit/PropertyBuilder.xml
@@ -1458,7 +1458,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample demonstrates how to attach a dynamic method to a `get` property created with `PropertyBuilder` using `SetGetMethod`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/PropertyBuilder/SetGetMethod/propertybuilder_setgetmethod_4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PropertyBuilder_SetGetMethod_4/VB/propertybuilder_setgetmethod_4.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/PropertyBuilder/SetGetMethod/propertybuilder_setgetmethod_4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1551,7 +1551,7 @@ For information on how to format `binaryAttribute`, see the metadata specificati
  The following code sample demonstrates how to attach a dynamic method to a `set` property created with `PropertyBuilder` using `SetSetMethod`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/PropertyBuilder/SetGetMethod/propertybuilder_setgetmethod_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PropertyBuilder_SetGetMethod_4/VB/propertybuilder_setgetmethod_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/PropertyBuilder/SetGetMethod/propertybuilder_setgetmethod_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/TypeBuilder.xml b/xml/System.Reflection.Emit/TypeBuilder.xml
index 833458c6add..9f732f7c0de 100644
--- a/xml/System.Reflection.Emit/TypeBuilder.xml
+++ b/xml/System.Reflection.Emit/TypeBuilder.xml
@@ -91,7 +91,7 @@
 The following code example shows how to define and use a dynamic assembly. The example assembly contains one type, `MyDynamicType`, that has a private field, a property that gets and sets the private field, constructors that initialize the private field, and a method that multiplies a user-supplied number by the private field value and returns the result.
 
 :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/AssemblyBuilder/Overview/24895.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilderClass/vb/24895.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/AssemblyBuilder/Overview/24895.vb" id="Snippet1":::
 
 The following code sample demonstrates how to build a type dynamically by using `TypeBuilder`.
 
@@ -180,7 +180,7 @@ The following code sample demonstrates how to build a type dynamically by using
  The following example demonstrates the use of the `AddDeclarativeSecurity` method to add a security demand for <xref:System.Security.Permissions.SecurityPermission> with the <xref:System.Security.Permissions.SecurityPermissionFlag.ControlEvidence?displayProperty=nameWithType> flag to a dynamic type named `MyDynamicClass`, in an assembly named EmittedExample.dll. The example produces no console output; after you run it, you can use [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to examine EmittedExample.dll. In `MyDynamicClass`, open the `.class public auto ansi` statement to see the declarative permission.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/AddDeclarativeSecurity/typebuilder_adddeclarativesecurity.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_AddDeclarativeSecurity/VB/typebuilder_adddeclarativesecurity.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/AddDeclarativeSecurity/typebuilder_adddeclarativesecurity.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -259,7 +259,7 @@ The following code sample demonstrates how to build a type dynamically by using
  The following code sample demonstrates the implementation of an interface on a dynamically created type using `AddInterfaceImplementation`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/AddInterfaceImplementation/typebuilder_sample_4.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_Sample_4/VB/typebuilder_sample_4.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/AddInterfaceImplementation/typebuilder_sample_4.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -872,7 +872,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code sample demonstrates the use of `DefineConstructor` to set a constructor's particular signature and attributes on a dynamic type and return a corresponding <xref:System.Reflection.Emit.ConstructorBuilder> for MSIL population.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/AddInterfaceImplementation/typebuilder_sample_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_Sample_4/VB/typebuilder_sample_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/AddInterfaceImplementation/typebuilder_sample_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1106,7 +1106,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code sample demonstrates the use of `DefineConstructor` to set a constructor's particular signature and attributes on a dynamic type and return a corresponding <xref:System.Reflection.Emit.ConstructorBuilder> for MSIL population.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/AddInterfaceImplementation/typebuilder_sample_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_Sample_4/VB/typebuilder_sample_4.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/AddInterfaceImplementation/typebuilder_sample_4.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1520,7 +1520,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code example creates a generic type with two type parameters and saves them in the assembly GenericEmitExample1.dll. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to view the generated types. For a more detailed explanation of the steps involved in defining a dynamic generic type, see [How to: Define a Generic Type with Reflection Emit](/dotnet/framework/reflection-and-codedom/how-to-define-a-generic-type-with-reflection-emit).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EmitGenericType/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/GenericTypeParameterBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1749,11 +1749,11 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  This code example is part of a larger example provided for the <xref:System.Reflection.Emit.MethodBuilder.DefineGenericParameters%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GenericMethodBuilder/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/DefineGenericParameters/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1910,7 +1910,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code sample demonstrates the use of `DefineMethod` to set a constructor's particular signature and attributes on a dynamic type and to return a corresponding <xref:System.Reflection.Emit.MethodBuilder> for MSIL population.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/DefineMethod/typebuilder_definenestedtype1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefineNestedType1/VB/typebuilder_definenestedtype1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineMethod/typebuilder_definenestedtype1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2000,7 +2000,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code sample demonstrates the use of `DefineMethod` to set a constructor's particular signature and attributes on a dynamic type and to return a corresponding <xref:System.Reflection.Emit.MethodBuilder> for MSIL population.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/DefineMethod/typebuilder_definenestedtype1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefineNestedType1/VB/typebuilder_definenestedtype1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineMethod/typebuilder_definenestedtype1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2314,7 +2314,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The code example creates an instance of the emitted class. It obtains a <xref:System.Reflection.MethodInfo> object for `I.M()`, and uses it to invoke the emitted class's explicit interface implementation. It then obtains a <xref:System.Reflection.MethodInfo> object for `A.M()`, and uses it to invoke the emitted class's override of that method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/DefineMethodOverride/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.DefineMethodOverride/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineMethodOverride/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3198,7 +3198,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  When the example is run, it executes the `PInvoke` method. It also saves the dynamic assembly as PInvokeTest.dll. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to examine the `MyType` class and the `static` (`Shared` in Visual Basic) `PInvoke` method it contains. You can compile a Visual Basic or C# program that uses the static `MyType.GetTickCount` method by including a reference to the DLL when you run csc.exe or vbc.exe; for example, `/r:PInvokeTest.dll`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/DefinePInvokeMethod/100656_fix.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefinePInvokeMethod_Fix/VB/100656_fix.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefinePInvokeMethod/100656_fix.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3324,7 +3324,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  When the example is run, it executes the `PInvoke` method. It also saves the dynamic assembly as PInvokeTest.dll. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to examine the `MyType` class and the `static` (`Shared` in Visual Basic) `PInvoke` method it contains. You can compile a Visual Basic or C# program that uses the static `MyType.GetTickCount` method by including a reference to the DLL when you run csc.exe or vbc.exe; for example, `/r:PInvokeTest.dll`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/DefinePInvokeMethod/100656_fix.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefinePInvokeMethod_Fix/VB/100656_fix.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefinePInvokeMethod/100656_fix.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3489,7 +3489,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  When the example is run, it executes the `PInvoke` method. It also saves the dynamic assembly as PInvokeTest.dll. You can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to examine the `MyType` class and the `static` (`Shared` in Visual Basic) `PInvoke` method it contains. You can compile a Visual Basic or C# program that uses the static `MyType.GetTickCount` method by including a reference to the DLL when you run csc.exe or vbc.exe; for example, `/r:PInvokeTest.dll`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/DefinePInvokeMethod/100656_fix.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefinePInvokeMethod_Fix/VB/100656_fix.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefinePInvokeMethod/100656_fix.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4207,7 +4207,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code sample demonstrates how to create an initialization constructor using `DefineTypeInitializer`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/DefineTypeInitializer/typebuilder_properties.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_Properties1/VB/typebuilder_properties.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineTypeInitializer/typebuilder_properties.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -4305,7 +4305,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code sample demonstrates the use of `DefineUninitializedData` to create an uninitialized data field in a dynamic type:
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/DefineUninitializedData/typebuilder_defineuninitializeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_DefineUninitializedData/VB/typebuilder_defineuninitializeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/DefineUninitializedData/typebuilder_defineuninitializeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4668,7 +4668,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  When the code example is run, it saves the emitted assembly as TypeBuilderGetFieldExample.exe. You can run TypeBuilderGetFieldExample.exe, and you can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to compare the emitted code with the code for the `Sample` class that is compiled into the code example itself.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/SetSignature/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.GetField_Generic/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/SetSignature/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5334,7 +5334,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  When the code example is run, it saves the emitted assembly as TypeBuilderGetFieldExample.exe. You can run TypeBuilderGetFieldExample.exe, and you can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to compare the emitted code with the code for the `Sample` class that is compiled into the code example itself.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/SetSignature/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.GetField_Generic/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/SetSignature/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5931,7 +5931,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  When the code example is run, it saves the emitted assembly as TypeBuilderGetFieldExample.exe. You can run TypeBuilderGetFieldExample.exe, and you can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to compare the emitted code with the code for the `Sample` class that is compiled into the code example itself.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodBuilder/SetSignature/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder.GetField_Generic/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodBuilder/SetSignature/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7762,7 +7762,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code example creates a dynamic module, an abstract type named `Sample`, and an abstract method named `TestMethod`. `TestMethod` takes a `ref` parameter (`ByRef` in Visual Basic) of type `Sample`, a pointer to type `Sample`, and an array of type `Sample`. It returns a two-dimensional array of type `Sample`. The code example saves the dynamic module to disk, so you can examine it with the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MakeXxxTypeBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7829,7 +7829,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code example creates a dynamic module, an abstract type named `Sample`, and an abstract method named `TestMethod`. `TestMethod` takes a `ref` parameter (`ByRef` in Visual Basic) of type `Sample`, a pointer to type `Sample`, and an array of type `Sample`. It returns a two-dimensional array of type `Sample`. The code example saves the dynamic module to disk, so you can examine it with the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MakeXxxTypeBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7892,7 +7892,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code example creates a dynamic module, an abstract type named `Sample`, and an abstract method named `TestMethod`. `TestMethod` takes a `ref` parameter (`ByRef` in Visual Basic) of type `Sample`, a pointer to type `Sample`, and an array of type `Sample`. It returns a two-dimensional array of type `Sample`. The code example saves the dynamic module to disk, so you can examine it with the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MakeXxxTypeBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8046,7 +8046,7 @@ See <xref:System.Reflection.AssemblyName> for a description of the format of the
  The following code example creates a dynamic module, an abstract type named `Sample`, and an abstract method named `TestMethod`. `TestMethod` takes a `ref` parameter (`ByRef` in Visual Basic) of type `Sample`, a pointer to type `Sample`, and an array of type `Sample`. It returns a two-dimensional array of type `Sample`. The code example saves the dynamic module to disk, so you can examine it with the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MakeXxxTypeBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/TypeBuilder/MakeArrayType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/Assembly.xml b/xml/System.Reflection/Assembly.xml
index 7bce7cb6e6b..1cd15d0bf59 100644
--- a/xml/System.Reflection/Assembly.xml
+++ b/xml/System.Reflection/Assembly.xml
@@ -154,7 +154,7 @@
  The code example also demonstrates the use of the <xref:System.Reflection.Assembly.GetName%2A> method to obtain an <xref:System.Reflection.AssemblyName> object that can be used to parse the full name of the assembly. The example displays the version number of the assembly, the <xref:System.Reflection.Assembly.CodeBase%2A> property, and the <xref:System.Reflection.Assembly.EntryPoint%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyClass/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -1165,7 +1165,7 @@ In .NET 5 and later versions, for bundled assemblies, this property throws an ex
  The following example retrieves the display name of the currently executing assembly, and the display name of the assembly that contains the <xref:System.Int32> type (`int` in C#, `Integer` in Visual Basic).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/FullName/Example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Assembly.FullName/VB/Example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/FullName/Example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1741,7 +1741,7 @@ In .NET 5 and later versions, for bundled assemblies, this property throws an ex
  The following code sample defines a number of classes with various access levels, and calls <xref:System.Reflection.Assembly.GetExportedTypes%2A> to display the ones that are visible from outside the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/GetExportedTypes/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Assembly.GetExportedTypes/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/GetExportedTypes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2966,7 +2966,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following code example demonstrates calling the <xref:System.Reflection.Assembly.GetReferencedAssemblies%2A> method. This code example is part of a larger example provided for the <xref:System.Reflection.Assembly> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection/VB/Reflection.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4210,7 +4210,7 @@ To load the correct assembly, it's recommended to call the `Load` method by pass
  The following example loads an assembly given its fully qualified name, and lists all the types contained in the specified assembly. For information about how to obtain the fully qualified assembly name, see [Assembly Names](/dotnet/standard/assembly/names).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/Load/load1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Assembly.Load1/VB/load1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/Load/load1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/AssemblyCompanyAttribute.xml b/xml/System.Reflection/AssemblyCompanyAttribute.xml
index 778d4d83bf4..6769e78d381 100644
--- a/xml/System.Reflection/AssemblyCompanyAttribute.xml
+++ b/xml/System.Reflection/AssemblyCompanyAttribute.xml
@@ -74,7 +74,7 @@
  The following example shows how to apply attributes, including the <xref:System.Reflection.AssemblyCompanyAttribute> attribute, to a dynamic assembly. The example saves the assembly to disk, and the attribute value can be viewed by using the **Windows File Properties** dialog.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineVersionInfoResource/VB/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/AssemblyCopyrightAttribute.xml b/xml/System.Reflection/AssemblyCopyrightAttribute.xml
index 35cbc27903e..ce9ba0ea973 100644
--- a/xml/System.Reflection/AssemblyCopyrightAttribute.xml
+++ b/xml/System.Reflection/AssemblyCopyrightAttribute.xml
@@ -74,7 +74,7 @@
  The following example shows how to apply attributes, including the <xref:System.Reflection.AssemblyCopyrightAttribute> attribute, to a dynamic assembly. The example saves the assembly to disk, and the attribute value can be viewed by using the **Windows File Properties** dialog.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineVersionInfoResource/VB/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/AssemblyDelaySignAttribute.xml b/xml/System.Reflection/AssemblyDelaySignAttribute.xml
index a23130a7ada..7863f721134 100644
--- a/xml/System.Reflection/AssemblyDelaySignAttribute.xml
+++ b/xml/System.Reflection/AssemblyDelaySignAttribute.xml
@@ -83,7 +83,7 @@ sn -k TestPublicKey.snk
  Compile the example as a .dll. If you compile from the command line, use the `/t:library` option.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyDelaySignAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyDelaySignAttribute/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyDelaySignAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/AssemblyFlagsAttribute.xml b/xml/System.Reflection/AssemblyFlagsAttribute.xml
index a1f617c1deb..360c3031c0f 100644
--- a/xml/System.Reflection/AssemblyFlagsAttribute.xml
+++ b/xml/System.Reflection/AssemblyFlagsAttribute.xml
@@ -79,7 +79,7 @@
  The following code example shows how to apply the <xref:System.Reflection.AssemblyFlagsAttribute> to an assembly, and how to read the flags at run time. The example also creates an instance of the attribute, and uses the <xref:System.Reflection.AssemblyFlagsAttribute.AssemblyFlags%2A> property to display the flags. For an example of how to apply the <xref:System.Reflection.AssemblyFlagsAttribute> to a dynamic assembly, see the <xref:System.Reflection.AssemblyName.Flags%2A?displayProperty=nameWithType> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyFlagsAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyFlagsAttribute/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyFlagsAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -208,7 +208,7 @@
  The following code example shows how to apply the <xref:System.Reflection.AssemblyFlagsAttribute> to an assembly, and how to read the flags at run time. The example also creates an instance of the attribute, and uses the <xref:System.Reflection.AssemblyFlagsAttribute.AssemblyFlags%2A> property to display the flags. For an example of how to apply the <xref:System.Reflection.AssemblyFlagsAttribute> to a dynamic assembly, see the <xref:System.Reflection.AssemblyName.Flags%2A?displayProperty=nameWithType> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyFlagsAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyFlagsAttribute/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyFlagsAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -336,7 +336,7 @@
  The following code example shows how to apply the <xref:System.Reflection.AssemblyFlagsAttribute> to an assembly, and how to read the flags at run time. The example also creates an instance of the attribute, and uses the <xref:System.Reflection.AssemblyFlagsAttribute.AssemblyFlags%2A> property to display the flags. For an example of how to apply the <xref:System.Reflection.AssemblyFlagsAttribute> to a dynamic assembly, see the <xref:System.Reflection.AssemblyName.Flags%2A?displayProperty=nameWithType> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyFlagsAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyFlagsAttribute/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyFlagsAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/AssemblyKeyFileAttribute.xml b/xml/System.Reflection/AssemblyKeyFileAttribute.xml
index d1092701b8a..8aa1396fd65 100644
--- a/xml/System.Reflection/AssemblyKeyFileAttribute.xml
+++ b/xml/System.Reflection/AssemblyKeyFileAttribute.xml
@@ -90,7 +90,7 @@ sn -k TestPublicKey.snk
  Compile the example as a .dll. If you compile from the command line, use the `/t:library` option.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyDelaySignAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyDelaySignAttribute/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyDelaySignAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/AssemblyName.xml b/xml/System.Reflection/AssemblyName.xml
index 827bb1673fd..be57e58a1f4 100644
--- a/xml/System.Reflection/AssemblyName.xml
+++ b/xml/System.Reflection/AssemblyName.xml
@@ -183,7 +183,7 @@ ExampleAssembly, Version=1.0.0.0, Culture=en, PublicKeyToken=a5d015c7d5a0b012
  This example shows how to use various reflection classes to analyze the metadata contained in an assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection/VB/Reflection.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -256,7 +256,7 @@ ExampleAssembly, Version=1.0.0.0, Culture=en, PublicKeyToken=a5d015c7d5a0b012
  The following example creates a dynamic assembly named `MyAssembly.exe` and saves it to your hard disk. After running the example, you can use the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler) to examine the assembly metadata.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/.ctor/assemblyname_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_Constructor/VB/assemblyname_constructor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/.ctor/assemblyname_constructor.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -323,7 +323,7 @@ ExampleAssembly, Version=1.0.0.0, Culture=en, PublicKeyToken=a5d015c7d5a0b012
  The following example creates an instance of <xref:System.Reflection.AssemblyName> from a display name. The individual elements of the display name are output to the console as properties of the <xref:System.Reflection.AssemblyName> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_Constructor_2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -461,7 +461,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.CodeBase%2A> property is used to specify the directory where the assembly is saved.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_CodeBase/VB/assemblyname_codebase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -567,7 +567,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.CultureInfo%2A> property is used to specify the culture, which is part of the assembly's display name.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_CodeBase/VB/assemblyname_codebase.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -733,7 +733,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.Flags%2A> property is used to specify that the assembly has a public key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/Flags/assemblyname_keypair.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_KeyPair/VB/assemblyname_keypair.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/Flags/assemblyname_keypair.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -813,7 +813,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the code example sets the <xref:System.Reflection.AssemblyName.Name%2A>, <xref:System.Reflection.AssemblyName.Version%2A>, <xref:System.Reflection.AssemblyName.CultureInfo%2A>, and <xref:System.Reflection.AssemblyName.KeyPair%2A> properties, which together comprise an assembly's full name, or display name. The <xref:System.Reflection.AssemblyName.FullName%2A> property is then used to retrieve the display name.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_CodeBase/VB/assemblyname_codebase.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -883,7 +883,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example gets the <xref:System.Reflection.AssemblyName> for an assembly on disk. It will not run unless you replace the string "MyAssembly.exe" with the file name of an assembly (including the path, if necessary) on your hard disk. Alternatively, you can compile this example as "MyAssembly.exe".
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/GetAssemblyName/assemblyname_getassemblyname.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_GetAssemblyName/VB/assemblyname_getassemblyname.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/GetAssemblyName/assemblyname_getassemblyname.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1020,7 +1020,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.SetPublicKey%2A> method is used to give the assembly a public key. The <xref:System.Reflection.AssemblyName.GetPublicKey%2A> method is then used to retrieve the public key, which is displayed to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/Flags/assemblyname_keypair.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_KeyPair/VB/assemblyname_keypair.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/Flags/assemblyname_keypair.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1086,7 +1086,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.SetPublicKeyToken%2A> method is used to set the assembly's public key token. The <xref:System.Reflection.AssemblyName.GetPublicKeyToken%2A> method is then used to retrieve the public key token, which is displayed to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/Flags/assemblyname_keypair.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_KeyPair/VB/assemblyname_keypair.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/Flags/assemblyname_keypair.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1153,7 +1153,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.HashAlgorithm%2A> property is used to set the hash algorithm for the assembly manifest.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_CodeBase/VB/assemblyname_codebase.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/CodeBase/assemblyname_codebase.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1217,7 +1217,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.KeyPair%2A> property is used to set the assembly's public and private cryptographic keys.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/Flags/assemblyname_keypair.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_KeyPair/VB/assemblyname_keypair.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/Flags/assemblyname_keypair.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1283,7 +1283,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.Name%2A> property is used to set the simple name of the dynamic assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/.ctor/assemblyname_constructor.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_Constructor/VB/assemblyname_constructor.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/.ctor/assemblyname_constructor.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1526,7 +1526,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.SetPublicKey%2A> method is used to give the assembly a public key. The <xref:System.Reflection.AssemblyName.GetPublicKey%2A> method is then used to retrieve the public key, which is displayed to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/SetPublicKey/assemblyname_setpublickey.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_SetPublicKey/VB/assemblyname_setpublickey.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/SetPublicKey/assemblyname_setpublickey.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1592,7 +1592,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.SetPublicKeyToken%2A> method is used to set the assembly's public key token. The <xref:System.Reflection.AssemblyName.GetPublicKeyToken%2A> method is then used to retrieve the public key token, which is displayed to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/SetPublicKey/assemblyname_setpublickey.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_SetPublicKey/VB/assemblyname_setpublickey.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/SetPublicKey/assemblyname_setpublickey.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1865,7 +1865,7 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example gets an <xref:System.Reflection.AssemblyName> object for a hypothetical `MyAssembly.exe` assembly, and then uses the <xref:System.Reflection.AssemblyName.ToString%2A> method to retrieve the full assembly name, or display name.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/GetAssemblyName/assemblyname_getassemblyname.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_GetAssemblyName/VB/assemblyname_getassemblyname.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/GetAssemblyName/assemblyname_getassemblyname.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1932,14 +1932,14 @@ mylib, Version=1.2.1900.0, Culture=neutral, PublicKeyToken=a14f3033def15840
  The following example retrieves and displays the version numbers of the currently executing assembly and the assembly that contains the <xref:System.String> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/Version/Example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName.Version/vb/Example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/Version/Example.vb" id="Snippet1":::
 
  **Example 2**
 
  The following example emits a dynamic assembly and saves it to the current directory. When the assembly is created, the <xref:System.Reflection.AssemblyName.Version%2A> property is used to specify version information for the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyName/.ctor/assemblyname_constructor.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyName_Constructor/VB/assemblyname_constructor.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyName/.ctor/assemblyname_constructor.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/AssemblyTitleAttribute.xml b/xml/System.Reflection/AssemblyTitleAttribute.xml
index d45fe32de59..da6d44cae75 100644
--- a/xml/System.Reflection/AssemblyTitleAttribute.xml
+++ b/xml/System.Reflection/AssemblyTitleAttribute.xml
@@ -81,7 +81,7 @@
  The following example shows how to add attributes, including the <xref:System.Reflection.AssemblyTitleAttribute> attribute, to a dynamic assembly. The example saves the assembly to disk, and the attribute value can be viewed by using the **Windows File Properties** dialog box.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyBuilder_DefineVersionInfoResource/VB/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AssemblyCompanyAttribute/Overview/assemblybuilder_defineversioninforesource.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/Binder.xml b/xml/System.Reflection/Binder.xml
index eb856b0b16a..78356196ab0 100644
--- a/xml/System.Reflection/Binder.xml
+++ b/xml/System.Reflection/Binder.xml
@@ -76,7 +76,7 @@
  The following example implements and demonstrates all members of the `Binder` class. The private method `CanConvertFrom` finds compatible types for a given type.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Binder/Overview/binder.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Binder_1/VB/binder.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Binder/Overview/binder.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/BindingFlags.xml b/xml/System.Reflection/BindingFlags.xml
index 83c7d6001c1..293e39b2190 100644
--- a/xml/System.Reflection/BindingFlags.xml
+++ b/xml/System.Reflection/BindingFlags.xml
@@ -164,7 +164,7 @@ When the `BindingFlags.ExactBinding` binding flag is used, reflection models the
  The following example demonstrates many of the binding flags.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/BindingFlags/Overview/bindingflagssample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/BindingFlags/VB/bindingflagssample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/BindingFlags/Overview/bindingflagssample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/CallingConventions.xml b/xml/System.Reflection/CallingConventions.xml
index ad89922f6d9..a8d4c1a8115 100644
--- a/xml/System.Reflection/CallingConventions.xml
+++ b/xml/System.Reflection/CallingConventions.xml
@@ -81,7 +81,7 @@
 
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetConstructor/type_getconstructor3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor3/VB/type_getconstructor3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetConstructor/type_getconstructor3.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/ConstructorInfo.xml b/xml/System.Reflection/ConstructorInfo.xml
index 5af12cb016a..c446515f14a 100644
--- a/xml/System.Reflection/ConstructorInfo.xml
+++ b/xml/System.Reflection/ConstructorInfo.xml
@@ -106,7 +106,7 @@
  The following example uses `ConstructorInfo` with <xref:System.Type.GetConstructor%2A> and <xref:System.Reflection.BindingFlags> to find the constructors that match the specified search criteria.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetConstructor/type_getconstructor3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor3/VB/type_getconstructor3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetConstructor/type_getconstructor3.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/CustomAttributeData.xml b/xml/System.Reflection/CustomAttributeData.xml
index eb2ddd181a0..1f9f5373736 100644
--- a/xml/System.Reflection/CustomAttributeData.xml
+++ b/xml/System.Reflection/CustomAttributeData.xml
@@ -112,7 +112,7 @@
  The attribute that is applied to the type demonstrates array properties, with both positional and named arguments.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -290,7 +290,7 @@
  The <xref:System.Reflection.CustomAttributeData.Constructor%2A> property is used in the `ShowAttributeData` method that displays custom attribute data. In this code example, the <xref:System.Reflection.ConstructorInfo> returned by this property is used to display a text string that describes the constructor, demonstrating that the property returns the constructor that would initialize the attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -370,7 +370,7 @@
  The <xref:System.Reflection.CustomAttributeData.ConstructorArguments%2A> property is used in the `ShowAttributeData` method that displays custom attribute data. In this code example, this property is used to display the list of arguments passed to the constructor that initialized the attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -506,7 +506,7 @@
  The <xref:System.Reflection.CustomAttributeData.GetCustomAttributes%2A> method is used in `Main()` to get the custom attributes applied to the assembly. The return value of the method is passed to the `ShowAttributeData` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -585,7 +585,7 @@
  The <xref:System.Reflection.CustomAttributeData.GetCustomAttributes%2A> method is used in `Main()` to get the custom attributes that were applied to a type and to a test method (<xref:System.Type> derives from <xref:System.Reflection.MemberInfo>). The return value of <xref:System.Reflection.CustomAttributeData.GetCustomAttributes%2A> is passed to the `ShowAttributeData` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -721,7 +721,7 @@
  The <xref:System.Reflection.CustomAttributeData.GetCustomAttributes%2A> method is used in `Main()` to retrieve the custom attributes applied to a parameter of a test method. The return value of <xref:System.Reflection.CustomAttributeData.GetCustomAttributes%2A> is passed to the `ShowAttributeData` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -844,7 +844,7 @@
  The <xref:System.Reflection.CustomAttributeData.NamedArguments%2A> property is used in the `ShowAttributeData` method that displays custom attribute data. In this code example, this property is used to display the list of named arguments specified for the attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -912,7 +912,7 @@
  In this example, the <xref:System.Reflection.CustomAttributeData.ToString%2A> method is used in the `ShowAttributeData` method, to identify the attribute whose data is being displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/CustomAttributeNamedArgument.xml b/xml/System.Reflection/CustomAttributeNamedArgument.xml
index f4526ca0793..f55128b175d 100644
--- a/xml/System.Reflection/CustomAttributeNamedArgument.xml
+++ b/xml/System.Reflection/CustomAttributeNamedArgument.xml
@@ -110,7 +110,7 @@
  The attribute that is applied to the type demonstrates array properties, with both positional and named arguments.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -741,7 +741,7 @@
  The <xref:System.Reflection.CustomAttributeNamedArgument.TypedValue%2A> property is used in the `ShowAttributeData` method that displays custom attribute data, to obtain the types and values of named attributes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/CustomAttributeTypedArgument.xml b/xml/System.Reflection/CustomAttributeTypedArgument.xml
index 0406895d26e..55483949ab0 100644
--- a/xml/System.Reflection/CustomAttributeTypedArgument.xml
+++ b/xml/System.Reflection/CustomAttributeTypedArgument.xml
@@ -111,7 +111,7 @@
  The attribute that is applied to the type demonstrates array properties, with both positional and named arguments.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -305,7 +305,7 @@
  The <xref:System.Reflection.CustomAttributeTypedArgument.ArgumentType%2A> property is used in the `ShowValueOrArray` method that displays custom attribute data, to display the types of attributes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -685,7 +685,7 @@
  The <xref:System.Reflection.CustomAttributeTypedArgument.Value%2A> property is used in the `ShowValueOrArray` method that displays custom attribute data, to display the values of attributes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/CustomAttributeData/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CustomAttributeData/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/CustomAttributeData/Overview/source.vb" id="Snippet1":::
 
  <xref:System.Reflection.CustomAttributeTypedArgument.ArgumentType%2A> &#124; <xref:System.Reflection.Assembly.ReflectionOnlyLoad%2A>
 
diff --git a/xml/System.Reflection/DefaultMemberAttribute.xml b/xml/System.Reflection/DefaultMemberAttribute.xml
index 913a96b25bf..d4e1c9ee8f6 100644
--- a/xml/System.Reflection/DefaultMemberAttribute.xml
+++ b/xml/System.Reflection/DefaultMemberAttribute.xml
@@ -80,7 +80,7 @@
  The following example uses the <xref:System.Reflection.DefaultMemberAttribute> attribute to make the `Age` property the default member of the `MyClass` class.
   
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetDefaultMembers/type_getdefaultmembers.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetDefaultMembers/VB/type_getdefaultmembers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetDefaultMembers/type_getdefaultmembers.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/EventAttributes.xml b/xml/System.Reflection/EventAttributes.xml
index 233521c07b9..5c6a9020d25 100644
--- a/xml/System.Reflection/EventAttributes.xml
+++ b/xml/System.Reflection/EventAttributes.xml
@@ -85,7 +85,7 @@
  The following example uses reflection emit to create a type with two events. It uses None to specify that the events have no attributes.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/EventAttributes/Overview/typebuilder_getevents1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeBuilder_GetEvents1/VB/typebuilder_getevents1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/EventAttributes/Overview/typebuilder_getevents1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/EventInfo.xml b/xml/System.Reflection/EventInfo.xml
index c20f469199c..9314e5bdeb0 100644
--- a/xml/System.Reflection/EventInfo.xml
+++ b/xml/System.Reflection/EventInfo.xml
@@ -115,7 +115,7 @@
  The following code gets an <xref:System.Reflection.EventInfo> object for the <xref:System.Windows.Forms.Control.Click> event of the <xref:System.Windows.Forms.Button> class.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetEvent/type_getevent1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/type_getevent1/VB/type_getevent1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetEvent/type_getevent1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -246,7 +246,7 @@ You might use the `AddEventHandler` method when you load a type after the progra
  After the dynamic type is created, the example gets a <xref:System.Reflection.MethodInfo> for the finished method and uses it to create a delegate instance. This instance is passed to the <xref:System.Reflection.EventInfo.AddEventHandler%2A> method to hook up the event. The program then pauses to allow the event to be raised.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/EventInfo/AddEventHandler/source.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AddEventHandler/vb/source.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/EventInfo/AddEventHandler/source.vb":::
 
  ]]></format>
         </remarks>
@@ -493,7 +493,7 @@ Note: In <see href="https://learn.microsoft.com/previous-versions/br230232(v=vs.
  The example defines a delegate named `MyDelegate` and an event named `ev` of type `MyDelegate`. The code in the `Main` method discovers the event signature by getting the delegate type of the event, getting the `Invoke` method of the delegate type, and then retrieving and displaying the parameters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/EventInfo/EventHandlerType/eventarg.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventArg/VB/eventarg.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/EventInfo/EventHandlerType/eventarg.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/ExceptionHandlingClause.xml b/xml/System.Reflection/ExceptionHandlingClause.xml
index 408fdaf31bd..c056294900f 100644
--- a/xml/System.Reflection/ExceptionHandlingClause.xml
+++ b/xml/System.Reflection/ExceptionHandlingClause.xml
@@ -74,13 +74,13 @@
  This code is part of a larger example located in the <xref:System.Reflection.MethodBody> class topic.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
     </remarks>
@@ -187,13 +187,13 @@
  This code is part of a larger example located in the <xref:System.Reflection.MethodBody> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -309,13 +309,13 @@
  This code is part of a larger example located in the <xref:System.Reflection.MethodBody> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -377,13 +377,13 @@
  This code is part of a larger example located in the <xref:System.Reflection.MethodBody> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -444,13 +444,13 @@
  This code is part of a larger example located in the <xref:System.Reflection.MethodBody> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -553,13 +553,13 @@
  This code is part of a larger example located in the <xref:System.Reflection.MethodBody> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -620,13 +620,13 @@
  This code is part of a larger example located in the <xref:System.Reflection.MethodBody> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/ExceptionHandlingClauseOptions.xml b/xml/System.Reflection/ExceptionHandlingClauseOptions.xml
index fb849e4c2bf..c6c68a06f22 100644
--- a/xml/System.Reflection/ExceptionHandlingClauseOptions.xml
+++ b/xml/System.Reflection/ExceptionHandlingClauseOptions.xml
@@ -67,13 +67,13 @@
  This code is part of a larger example provided for the <xref:System.Reflection.MethodBody> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/FieldInfo.xml b/xml/System.Reflection/FieldInfo.xml
index 3d41595584a..0b0f0d3ff56 100644
--- a/xml/System.Reflection/FieldInfo.xml
+++ b/xml/System.Reflection/FieldInfo.xml
@@ -105,7 +105,7 @@
  The following example uses the <xref:System.Type.GetFields%2A?displayProperty=nameWithType> method to get the field-related information from the <xref:System.Reflection.FieldInfo> class, and then displays field attributes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/Overview/fieldinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo/VB/fieldinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/Overview/fieldinfo.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -335,7 +335,7 @@
  The following example retrieves MyClass.MyField field information and displays the field associated with the field handle.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/FieldHandle/fieldinfo_fieldhandle.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_FieldHandle/VB/fieldinfo_fieldhandle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/FieldHandle/fieldinfo_fieldhandle.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -487,7 +487,7 @@
  The following code example uses the <xref:System.Type.GetFields%2A?displayProperty=nameWithType> method to get <xref:System.Reflection.FieldInfo> objects for the fields of a type, gets a <xref:System.RuntimeFieldHandle> structure for each field, and then retrieves the <xref:System.Reflection.FieldInfo> objects from the handles using this overload of the <xref:System.Reflection.FieldInfo.GetFieldFromHandle%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/GetFieldFromHandle/fieldinfo_getfieldfromhandle.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetFieldFromHandle/VB/fieldinfo_getfieldfromhandle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/GetFieldFromHandle/fieldinfo_getfieldfromhandle.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -580,7 +580,7 @@
 - If the runtime type handle is not from a compatible construction, an exception is thrown. In this case, a value type is specified for `T`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/GetFieldFromHandle/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetFieldFromHandle2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/GetFieldFromHandle/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -960,12 +960,12 @@
  The following example uses the <xref:System.Reflection.FieldInfo.GetValue%2A> method to retrieve the value of a static field. Note that the value of the `obj` argument is `null`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/GetValue/getfldval.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetFldVal/VB/getfldval.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/GetValue/getfldval.vb" id="Snippet1":::
 
  The following example retrieves an array of <xref:System.Reflection.FieldInfo> objects that represents the fields of the `FieldsClass` type, and then calls the <xref:System.Reflection.FieldInfo.GetValue%2A> to display the value of each field for the `fieldsInst` object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/GetValue/fieldinfo_getvalue.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_GetValue/VB/fieldinfo_getvalue.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/GetValue/fieldinfo_getvalue.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1526,7 +1526,7 @@ Myfieldb - B readonly field, IsInitOnly = True
  The following example gets the field information of the fields of MyClass, determines if the fields can be serialized, and displays the results.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsNotSerialized/fieldinfo_isnotserialized.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsNotSerialized/VB/fieldinfo_isnotserialized.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsNotSerialized/fieldinfo_isnotserialized.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1585,7 +1585,7 @@ Myfieldb - B readonly field, IsInitOnly = True
  The following example creates a class and displays the name, field and <xref:System.Reflection.FieldInfo.IsPinvokeImpl%2A> property value of the field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsPinvokeImpl/fieldinfo_ispinvokeimpl.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsPInvokeImpl/VB/fieldinfo_ispinvokeimpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsPinvokeImpl/fieldinfo_ispinvokeimpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1656,7 +1656,7 @@ Myfieldb - B readonly field, IsInitOnly = True
  The following example returns a value indicating whether or not the field of the class is private.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsPrivate/fieldinfo_isprivate.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsPrivate/VB/fieldinfo_isprivate.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsPrivate/fieldinfo_isprivate.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1991,7 +1991,7 @@ Myfieldb - B readonly field, IsInitOnly = True
  The following example returns a value indicating whether or not the fields in the class contain a SpecialName attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetFields/fieldinfo_isspecialname.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsSpecialName/VB/fieldinfo_isspecialname.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetFields/fieldinfo_isspecialname.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2355,7 +2355,7 @@ This method cannot be used to set values of static, init-only (`readonly` in C#)
  The following example sets the value of a field, gets and displays the value, modifies the field, and displays the result.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/SetValue/fieldinfo_setvalue.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_SetValue/VB/fieldinfo_setvalue.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/SetValue/fieldinfo_setvalue.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/LocalVariableInfo.xml b/xml/System.Reflection/LocalVariableInfo.xml
index 99c7eda069e..01475891902 100644
--- a/xml/System.Reflection/LocalVariableInfo.xml
+++ b/xml/System.Reflection/LocalVariableInfo.xml
@@ -86,13 +86,13 @@
  This code example is part of a larger example provided for the <xref:System.Reflection.MethodBody> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet6":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/MemberInfo.xml b/xml/System.Reflection/MemberInfo.xml
index 8b2e320593a..1f8a7959f10 100644
--- a/xml/System.Reflection/MemberInfo.xml
+++ b/xml/System.Reflection/MemberInfo.xml
@@ -114,7 +114,7 @@
  This example shows how to use various reflection classes to analyze the metadata contained in an assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection/VB/Reflection.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -426,7 +426,7 @@
  The following example defines a custom attribute and associates the attribute with `MyClass.MyMethod`, retrieves the attribute at run time, and displays the result.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MemberInfo/GetCustomAttributes/memberinfo_getcustomattributes1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MemberInfo_GetCustomAttributes1/VB/memberinfo_getcustomattributes1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MemberInfo/GetCustomAttributes/memberinfo_getcustomattributes1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -802,7 +802,7 @@ For more information, see [How to use and debug assembly unloadability in .NET C
  The following example determines whether the specified attribute is applied to the specified member.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MemberInfo/IsDefined/memberinfo_getcustomattribute_isdefined.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MemberInfo_GetCustomAttribute_IsDefined/VB/memberinfo_getcustomattribute_isdefined.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MemberInfo/IsDefined/memberinfo_getcustomattribute_isdefined.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/MethodBase.xml b/xml/System.Reflection/MethodBase.xml
index fe0446a09ce..f4b1098e47d 100644
--- a/xml/System.Reflection/MethodBase.xml
+++ b/xml/System.Reflection/MethodBase.xml
@@ -672,7 +672,7 @@
 >  Not all computer languages can generate <xref:System.Reflection.ExceptionHandlingClauseOptions.Filter?displayProperty=nameWithType> clauses. The Visual Basic example shows a filter clause, using a Visual Basic `When` expression, which is omitted from the examples for other languages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -884,7 +884,7 @@
  The following example defines a constructor in a dynamic assembly and then uses the <xref:System.Reflection.MethodBase.GetMethodImplementationFlags%2A> method to display the method implementation flags that are set by default.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ConstructorBuilder_GetModule_4/VB/constructorbuilder_getmodule_4.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/GetMethodImplementationFlags/constructorbuilder_getmodule_4.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -948,7 +948,7 @@
  The example defines a delegate named `MyDelegate` and an event named `ev` of type `MyDelegate`. The code in the `Main` method discovers the event signature by getting the delegate type of the event, getting the `Invoke` method of the delegate type, and then retrieving and displaying the parameters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/EventInfo/EventHandlerType/eventarg.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/EventArg/VB/eventarg.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/EventInfo/EventHandlerType/eventarg.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1217,7 +1217,7 @@ This method dynamically invokes the method reflected by this instance on `obj`,
  The following example demonstrates all members of the <xref:System.Reflection.Binder?displayProperty=nameWithType> class using an overload of <xref:System.Type.InvokeMember%2A?displayProperty=nameWithType>. The private method `CanConvertFrom` finds compatible types for a given type. For another example of invoking members in a custom binding scenario, see [Dynamically Loading and Using Types](/dotnet/framework/reflection-and-codedom/dynamically-loading-and-using-types).
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Binder/Overview/binder.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Binder_1/VB/binder.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Binder/Overview/binder.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/MethodBody.xml b/xml/System.Reflection/MethodBody.xml
index b414b6c7dcd..90bf0358d62 100644
--- a/xml/System.Reflection/MethodBody.xml
+++ b/xml/System.Reflection/MethodBody.xml
@@ -78,7 +78,7 @@
 
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -182,13 +182,13 @@
  This code example is part of a larger example provided for the <xref:System.Reflection.MethodBody> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -312,9 +312,9 @@
  This code example is part of a larger example provided for the <xref:System.Reflection.MethodBody> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -427,13 +427,13 @@
  This code example is part of a larger example provided for the <xref:System.Reflection.MethodBody> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -492,9 +492,9 @@
  This code example is part of a larger example provided for the <xref:System.Reflection.MethodBody> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Reflection/ExceptionHandlingClause/Overview/source.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodBody/VB/source.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Reflection/ExceptionHandlingClause/Overview/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/MethodInfo.xml b/xml/System.Reflection/MethodInfo.xml
index 54c3a901042..f595eee54f1 100644
--- a/xml/System.Reflection/MethodInfo.xml
+++ b/xml/System.Reflection/MethodInfo.xml
@@ -655,7 +655,7 @@ For a list of the invariant conditions for other terms used in generic reflectio
  This example is part of a larger example provided for the <xref:System.Reflection.MethodInfo.MakeGenericMethod%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/DeclaringMethod/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodInfo.Generics/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/DeclaringMethod/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -757,11 +757,11 @@ End Class
  This example is part of a larger example provided for the <xref:System.Reflection.MethodInfo.MakeGenericMethod%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/DeclaringMethod/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodInfo.Generics/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/DeclaringMethod/source.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System/Type/DeclaringMethod/source.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodInfo.Generics/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System/Type/DeclaringMethod/source.vb" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System/Type/DeclaringMethod/source.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodInfo.Generics/VB/source.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System/Type/DeclaringMethod/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1187,7 +1187,7 @@ End Class
 - Retrieves the generic method definition from the constructed method and compares it to the original definition.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/DeclaringMethod/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodInfo.Generics/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/DeclaringMethod/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/Module.xml b/xml/System.Reflection/Module.xml
index be4c8e17472..71c7cb8be7c 100644
--- a/xml/System.Reflection/Module.xml
+++ b/xml/System.Reflection/Module.xml
@@ -3101,7 +3101,7 @@
  The metadata token values are hard-coded as an enumeration. If you change this code example, the token values are likely to change. To determine the new token values, compile the code and use Ildasm.exe with the **/TOKENS** option to examine the assembly. The tokens can be found at the points of call. Insert the new values into the enumeration, and recompile the example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Module/ResolveMethod/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Module.MethodResolve/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Module/ResolveMethod/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3224,7 +3224,7 @@
  The metadata token values are hard-coded as an enumeration. If you change this code example, the token values are likely to change. To determine the new token values, compile the code and use Ildasm.exe with the **/TOKENS** option to examine the assembly. The tokens can be found at the points of call. Insert the new values into the enumeration, and recompile the example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Module/ResolveMethod/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Module.MethodResolve/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Module/ResolveMethod/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/ObfuscateAssemblyAttribute.xml b/xml/System.Reflection/ObfuscateAssemblyAttribute.xml
index 8349bdf1e60..a112475ec1e 100644
--- a/xml/System.Reflection/ObfuscateAssemblyAttribute.xml
+++ b/xml/System.Reflection/ObfuscateAssemblyAttribute.xml
@@ -73,7 +73,7 @@
  For a code example that shows the use of <xref:System.Reflection.ObfuscateAssemblyAttribute> with <xref:System.Reflection.ObfuscationAttribute>, see the <xref:System.Reflection.ObfuscationAttribute> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscateAssemblyAttribute/vb/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -133,7 +133,7 @@
  The following code example shows how the attribute constructor specifies that an assembly is private. The <xref:System.Reflection.ObfuscateAssemblyAttribute.StripAfterObfuscation%2A> property is `false`, to prevent the obfuscation tool from stripping the attribute after processing.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscateAssemblyAttribute/vb/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@
  The following code example shows how the attribute constructor sets the <xref:System.Reflection.ObfuscateAssemblyAttribute.AssemblyIsPrivate%2A> property to `true`, to specify that an assembly is private. The <xref:System.Reflection.ObfuscateAssemblyAttribute.StripAfterObfuscation%2A> property is `false`, to prevent the obfuscation tool from stripping the attribute after processing.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscateAssemblyAttribute/vb/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -253,7 +253,7 @@
  The following code example shows the <xref:System.Reflection.ObfuscateAssemblyAttribute> attribute with the <xref:System.Reflection.ObfuscateAssemblyAttribute.StripAfterObfuscation%2A> property set to `false`, to prevent the obfuscation tool from stripping the attribute after processing.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscateAssemblyAttribute/vb/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscateAssemblyAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/ObfuscationAttribute.xml b/xml/System.Reflection/ObfuscationAttribute.xml
index 14e81c63058..8d2d72f4170 100644
--- a/xml/System.Reflection/ObfuscationAttribute.xml
+++ b/xml/System.Reflection/ObfuscationAttribute.xml
@@ -87,7 +87,7 @@
  The code example includes code to display the attributes and their properties. You can also examine the attributes by opening the DLL with the [Ildasm.exe (IL Disassembler)](/dotnet/framework/tools/ildasm-exe-il-disassembler).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscationAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscationAttribute/vb/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscationAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -192,7 +192,7 @@
  This code is part of a larger example that can be compiled and executed. See the <xref:System.Reflection.ObfuscationAttribute> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscationAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscationAttribute/vb/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscationAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
  This code is part of a larger example that can be compiled and executed. See the <xref:System.Reflection.ObfuscationAttribute> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscationAttribute/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscationAttribute/vb/source.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscationAttribute/Overview/source.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -315,7 +315,7 @@
  This code is part of a larger example that can be compiled and executed. See the <xref:System.Reflection.ObfuscationAttribute> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscationAttribute/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscationAttribute/vb/source.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscationAttribute/Overview/source.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -376,7 +376,7 @@
  This code is part of a larger example that can be compiled and executed. See the <xref:System.Reflection.ObfuscationAttribute> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ObfuscationAttribute/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObfuscationAttribute/vb/source.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ObfuscationAttribute/Overview/source.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/ParameterInfo.xml b/xml/System.Reflection/ParameterInfo.xml
index c2829b3fb0a..4559e0917f4 100644
--- a/xml/System.Reflection/ParameterInfo.xml
+++ b/xml/System.Reflection/ParameterInfo.xml
@@ -126,7 +126,7 @@
  This example shows how to use various reflection classes to analyze the metadata contained in an assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection/VB/Reflection.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -231,7 +231,7 @@
  The following example defines a method with three parameters. It uses the <xref:System.Reflection.ParameterInfo.Attributes%2A> property to get the attributes of the second parameter and display them at the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ParameterInfo/Attributes/parameterinfo_attributes1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_Attributes1/VB/parameterinfo_attributes1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterInfo/Attributes/parameterinfo_attributes1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -592,7 +592,7 @@
  When the example is run, it uses the <xref:System.Reflection.ParameterInfo.GetCustomAttributes%28System.Boolean%29> method to retrieve the custom attributes that have been applied to all parameters of all methods in `MyClass`, and displays them at the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ParameterInfo/GetCustomAttributes/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_GetCustomAttributes/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterInfo/GetCustomAttributes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1047,7 +1047,7 @@
  When the example is run, it uses the <xref:System.Reflection.ParameterInfo.IsDefined%2A> method to test all parameters of all methods in the example class. It then displays the parameters that have `MyAttribute` or `MyDerivedAttribute`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ParameterInfo/IsDefined/parameterinfo_getcustomattribute_isdefined.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_GetCustomAttribute_IsDefined/VB/parameterinfo_getcustomattribute_isdefined.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterInfo/IsDefined/parameterinfo_getcustomattribute_isdefined.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1128,7 +1128,7 @@
  After executing `DefineMethod`, the example searches the assemblies that are currently loaded until it finds the dynamic assembly. It loads `MyType` from the assembly, gets a <xref:System.Reflection.MethodInfo> object for the `MyMethod` method, and examines the parameters. The example uses the <xref:System.Reflection.ParameterInfo.IsIn%2A>, <xref:System.Reflection.ParameterInfo.IsOut%2A>, and <xref:System.Reflection.ParameterInfo.IsOptional%2A> properties to display information about the parameters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ParameterInfo/IsIn/parameterinfo_isin_isout_isoptional.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_IsIn_IsOut_IsOptional/VB/parameterinfo_isin_isout_isoptional.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterInfo/IsIn/parameterinfo_isin_isout_isoptional.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1261,7 +1261,7 @@
  After executing `DefineMethod`, the example searches the assemblies that are currently loaded until it finds the dynamic assembly. It loads `MyType` from the assembly, gets a <xref:System.Reflection.MethodInfo> object for the `MyMethod` method, and examines the parameters. The example uses the <xref:System.Reflection.ParameterInfo.IsIn%2A>, <xref:System.Reflection.ParameterInfo.IsOut%2A>, and <xref:System.Reflection.ParameterInfo.IsOptional%2A> properties to display information about the parameters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ParameterInfo/IsIn/parameterinfo_isin_isout_isoptional.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParameterInfo_IsIn_IsOut_IsOptional/VB/parameterinfo_isin_isout_isoptional.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterInfo/IsIn/parameterinfo_isin_isout_isoptional.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/PropertyInfo.xml b/xml/System.Reflection/PropertyInfo.xml
index 1befca75f65..e2d9c47e6ce 100644
--- a/xml/System.Reflection/PropertyInfo.xml
+++ b/xml/System.Reflection/PropertyInfo.xml
@@ -119,7 +119,7 @@
 > This example generates about 55,000 lines of data, which you can redirect to a text file at the command prompt, as follows: **example.exe > propertyinfo.txt**
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Reflection/VB/Reflection.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/GetReferencedAssemblies/Reflection.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -2097,7 +2097,7 @@ Console.WriteLine("CurrCult: " +
  The following example declares a class named `Example` with one `static` (`Shared` in Visual Basic) and one instance property. The example uses the <xref:System.Reflection.PropertyInfo.SetValue%28System.Object%2CSystem.Object%29> method to change the original property values and displays the original and final values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/SetValue/example2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PropertyInfo.SetValue/vb/example2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/example2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2212,7 +2212,7 @@ Note: In <see href="https://learn.microsoft.com/previous-versions/br230232(v=vs.
 - In C#, the indexed instance property is a default property called an indexer, and the name is never used when accessing the property in code. By default, the name of the property is `Item`, and you must use that name when you search for the property with reflection. You can use the <xref:System.Runtime.CompilerServices.IndexerNameAttribute> attribute to give the indexer a different name. In this example, the name is `IndexedInstanceProperty`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/SetValue/Example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/PropertyInfo.SetValue/vb/Example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/Example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/StrongNameKeyPair.xml b/xml/System.Reflection/StrongNameKeyPair.xml
index 453cd477ca4..3163a8254c2 100644
--- a/xml/System.Reflection/StrongNameKeyPair.xml
+++ b/xml/System.Reflection/StrongNameKeyPair.xml
@@ -81,7 +81,7 @@
  The following code example shows how to open a Company.keys file (produced by running the [Sn.exe (Strong Name Tool)](/dotnet/framework/tools/sn-exe-strong-name-tool) with the **-k** switch), read the public key from the file, and display the key in the console window.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/StrongNameKeyPair/Overview/strongnamekeypairx.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StrongNameKeyPairX/VB/StrongNameKeyPairX.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/StrongNameKeyPair/Overview/StrongNameKeyPairX.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/TypeFilter.xml b/xml/System.Reflection/TypeFilter.xml
index 40d96436c5d..cbc1b37d427 100644
--- a/xml/System.Reflection/TypeFilter.xml
+++ b/xml/System.Reflection/TypeFilter.xml
@@ -95,7 +95,7 @@
 ## Examples
  This example shows how to define a method matching the <xref:System.Reflection.TypeFilter> delegate prototype allowing you to use reflection to filter or return a subset of matching entries.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeFilter/VB/Typefilter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/TypeFilter/Overview/Typefilter.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Resources/ResXResourceWriter.xml b/xml/System.Resources/ResXResourceWriter.xml
index b997e4d3d1d..9964f1667cd 100644
--- a/xml/System.Resources/ResXResourceWriter.xml
+++ b/xml/System.Resources/ResXResourceWriter.xml
@@ -62,7 +62,7 @@
  The following example creates a .resx file named `CarResources.resx` that stores six strings, an icon, and two application-defined objects (two `Automobile` objects). Note that the `Automobile` class, which is defined and instantiated in the example, is tagged with the <xref:System.SerializableAttribute> attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System.Resources/ResXResourceWriter/Overview/create1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.resx/vb/create1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Resources/ResXResourceWriter/Overview/create1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -666,7 +666,7 @@
  The following example creates a .resx file named `CarResources.resx` that stores six strings, an icon, and two application-defined objects (two `Automobile` objects). To store the icon and the `Automobile` objects, it calls the <xref:System.Resources.ResXResourceWriter.AddResource%28System.String%2CSystem.Object%29> method. Note that the `Automobile` class, which is defined and instantiated in the example, is tagged with the <xref:System.SerializableAttribute> attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System.Resources/ResXResourceWriter/Overview/create1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.resx/vb/create1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Resources/ResXResourceWriter/Overview/create1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -732,7 +732,7 @@
  The following example creates a .resx file named `CarResources.resx` that stores six strings, an icon, and two application-defined objects (two `Automobile` objects). To store the strings, it calls the <xref:System.Resources.ResXResourceWriter.AddResource%28System.String%2CSystem.String%29> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Resources/ResXResourceWriter/Overview/create1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.resx/vb/create1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Resources/ResXResourceWriter/Overview/create1.vb" id="Snippet1":::
 
  Note that the `Automobile` class, which is defined and instantiated in the example, is tagged with the <xref:System.SerializableAttribute> attribute.
 
diff --git a/xml/System.Resources/ResourceManager.xml b/xml/System.Resources/ResourceManager.xml
index 971d88f891c..785c5b3f220 100644
--- a/xml/System.Resources/ResourceManager.xml
+++ b/xml/System.Resources/ResourceManager.xml
@@ -1112,12 +1112,12 @@ If you change the value of the `createIfNotExists` argument to `false`, the meth
  The following example uses the <xref:System.Resources.ResourceManager.GetStream%28System.String%29> method to retrieve a bitmap that is used in an app's opening splash window. The following source code from a file named CreateResources.cs (for C#) or CreateResources.vb (for Visual Basic) generates a .resx file named AppResources.resx that contains the serialized image. In this case, the image is loaded from a file named SplashScreen.jpg; you can modify the file name to substitute your own image.
 
  :::code language="csharp" source="~/snippets/csharp/System.Resources/ResourceManager/Overview/createresources.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.retrieving/vb/createresources.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Resources/ResourceManager/GetStream/createresources.vb" id="Snippet4":::
 
  The following code from a file named GetStream.cs (for C#) or GetStream.vb (for Visual Basic) then retrieves the resource and displays the image in a <xref:System.Windows.Forms.PictureBox?displayProperty=nameWithType> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Resources/ResourceManager/Overview/getstream.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/conceptual.resources.retrieving/vb/getstream.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Resources/ResourceManager/GetStream/getstream.vb" id="Snippet5":::
 
  You can use the following batch file to build the C# example. For Visual Basic, change `csc` to `vbc`, and change the extension of the source code file from `.cs` to `.vb`.
 
diff --git a/xml/System.Runtime.CompilerServices/AsyncStateMachineAttribute.xml b/xml/System.Runtime.CompilerServices/AsyncStateMachineAttribute.xml
index 35ad4204f42..6527fd512a1 100644
--- a/xml/System.Runtime.CompilerServices/AsyncStateMachineAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/AsyncStateMachineAttribute.xml
@@ -80,7 +80,7 @@
 - Obtains an attribute object for the method and attribute type by using `MethodInfo.GetCustomAttribute`. If `GetCustomAttribute` returns `Nothing` (Visual Basic) or `null` (C#), the method doesn't contain the attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/AsyncStateMachineAttribute/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/runtime.compilerservices.asyncstatemachineattribute/vb/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/AsyncStateMachineAttribute/Overview/module1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.CompilerServices/CompilationRelaxationsAttribute.xml b/xml/System.Runtime.CompilerServices/CompilationRelaxationsAttribute.xml
index 23295a37284..b6172ded4c7 100644
--- a/xml/System.Runtime.CompilerServices/CompilationRelaxationsAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/CompilationRelaxationsAttribute.xml
@@ -84,7 +84,7 @@
  The following example demonstrates how to apply the <xref:System.Runtime.CompilerServices.CompilationRelaxationsAttribute>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/CompilationRelaxationsAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.CompilationRelaxationsAttribute/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/CompilationRelaxationsAttribute/Overview/example.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute.xml b/xml/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute.xml
index 14b37476617..3c146d96bcf 100644
--- a/xml/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute.xml
@@ -74,7 +74,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.CompilerGlobalScopeAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.CompilerGlobalScopeAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -121,7 +121,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.CompilerGlobalScopeAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.CompilerGlobalScopeAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.CompilerServices/DefaultDependencyAttribute.xml b/xml/System.Runtime.CompilerServices/DefaultDependencyAttribute.xml
index 983ae93ec4f..e4b6f0177f6 100644
--- a/xml/System.Runtime.CompilerServices/DefaultDependencyAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/DefaultDependencyAttribute.xml
@@ -71,7 +71,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.DefaultDependencyAttribute> attribute to an assembly to specify that the dependency is likely to be loaded.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/DefaultDependencyAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DefaultDependencyAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/DefaultDependencyAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -124,7 +124,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.DefaultDependencyAttribute> attribute to an assembly to specify that the dependency is likely to be loaded.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/DefaultDependencyAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DefaultDependencyAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/DefaultDependencyAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.CompilerServices/DependencyAttribute.xml b/xml/System.Runtime.CompilerServices/DependencyAttribute.xml
index 675f498f141..82a8c808b4f 100644
--- a/xml/System.Runtime.CompilerServices/DependencyAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/DependencyAttribute.xml
@@ -73,7 +73,7 @@
  The following example specifies that the native image generation service always binds to `AssemblyA` and sometimes binds to `AssemblyB`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/DependencyAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DependencyAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/DependencyAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -133,7 +133,7 @@
  The following example specifies that the native image generation service always binds to `AssemblyA` and sometimes binds to `AssemblyB`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/DependencyAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DependencyAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/DependencyAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.CompilerServices/DiscardableAttribute.xml b/xml/System.Runtime.CompilerServices/DiscardableAttribute.xml
index 0d06a1d3837..0966a30c686 100644
--- a/xml/System.Runtime.CompilerServices/DiscardableAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/DiscardableAttribute.xml
@@ -67,7 +67,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.DiscardableAttribute> attribute to a type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/DiscardableAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DiscardableAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/DiscardableAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -114,7 +114,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.DiscardableAttribute> attribute to a type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/DiscardableAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.DiscardableAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/DiscardableAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.CompilerServices/IteratorStateMachineAttribute.xml b/xml/System.Runtime.CompilerServices/IteratorStateMachineAttribute.xml
index 78e29eab65c..8017283ff03 100644
--- a/xml/System.Runtime.CompilerServices/IteratorStateMachineAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/IteratorStateMachineAttribute.xml
@@ -82,7 +82,7 @@
 
 - Obtains an attribute object for the method and attribute type by using `MethodInfo.GetCustomAttribute`. If `GetCustomAttribute` returns `Nothing` (Visual Basic), the method doesn't contain the attribute.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/runtime.compilerservices.asyncstatemachineattribute/vb/module2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/AsyncStateMachineAttribute/Overview/module2.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.CompilerServices/RuntimeHelpers.xml b/xml/System.Runtime.CompilerServices/RuntimeHelpers.xml
index 3ecb5f5950a..8a4a40fb2f0 100644
--- a/xml/System.Runtime.CompilerServices/RuntimeHelpers.xml
+++ b/xml/System.Runtime.CompilerServices/RuntimeHelpers.xml
@@ -70,7 +70,7 @@
  The following example shows how to reliably set handles by using the <xref:System.Runtime.CompilerServices.RuntimeHelpers.PrepareConstrainedRegions%2A> method. To reliably set a handle to a specified pre-existing handle, you must ensure that the allocation of the native handle and the subsequent recording of that handle within a <xref:System.Runtime.InteropServices.SafeHandle> object is atomic. Any failure between these operations (such as a thread abort or out-of-memory exception) will result in the native handle being leaked.  You can use the <xref:System.Runtime.CompilerServices.RuntimeHelpers.PrepareConstrainedRegions%2A> method to make sure that the handle is not leaked.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/RuntimeHelpers/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SafeHandle-RuntimeHelpers.PrepareConstrainedRegions/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -339,7 +339,7 @@ This method is intended for compiler use rather than use directly in code. `T` m
  The following example demonstrates how to compare two objects by using the <xref:System.Runtime.CompilerServices.RuntimeHelpers.Equals%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/RuntimeHelpers/Equals/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.RuntimeHelpers.Equals/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/Equals/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -552,7 +552,7 @@ This method is intended for compiler use rather than use directly in code. `T` m
  The following example demonstrates how to box a value class by using the <xref:System.Runtime.CompilerServices.RuntimeHelpers.GetObjectValue%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/RuntimeHelpers/GetObjectValue/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.RuntimeHelpers.GetObjectValue/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/GetObjectValue/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -904,7 +904,7 @@ This method is intended for compiler use rather than use directly in code. `T` m
  The following example shows how to reliably set handles by using the <xref:System.Runtime.CompilerServices.RuntimeHelpers.PrepareConstrainedRegions%2A> method. To reliably set a handle to a specified pre-existing handle, you must ensure that the allocation of the native handle and the subsequent recording of that handle within a <xref:System.Runtime.InteropServices.SafeHandle> object is atomic. Any failure between these operations (such as a thread abort or out-of-memory exception) will result in the native handle being leaked. You can use the <xref:System.Runtime.CompilerServices.RuntimeHelpers.PrepareConstrainedRegions%2A> method to make sure that the handle is not leaked.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/RuntimeHelpers/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SafeHandle-RuntimeHelpers.PrepareConstrainedRegions/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/RuntimeHelpers/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.CompilerServices/StringFreezingAttribute.xml b/xml/System.Runtime.CompilerServices/StringFreezingAttribute.xml
index 42a72b45e2f..188c3641c74 100644
--- a/xml/System.Runtime.CompilerServices/StringFreezingAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/StringFreezingAttribute.xml
@@ -73,7 +73,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.StringFreezingAttribute> to an assembly.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/StringFreezingAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.StringFreezingAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/StringFreezingAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -119,7 +119,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.StringFreezingAttribute> to an assembly.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/StringFreezingAttribute/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.StringFreezingAttribute/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/StringFreezingAttribute/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.CompilerServices/SuppressIldasmAttribute.xml b/xml/System.Runtime.CompilerServices/SuppressIldasmAttribute.xml
index a27333c45fa..d5d162a1512 100644
--- a/xml/System.Runtime.CompilerServices/SuppressIldasmAttribute.xml
+++ b/xml/System.Runtime.CompilerServices/SuppressIldasmAttribute.xml
@@ -68,7 +68,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.SuppressIldasmAttribute> attribute to an assembly.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/SuppressIldasmAttribute/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.SuppressIldasmAttribute/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/SuppressIldasmAttribute/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -119,7 +119,7 @@
  The following code example demonstrates how to apply the <xref:System.Runtime.CompilerServices.SuppressIldasmAttribute> attribute to an assembly.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.CompilerServices/SuppressIldasmAttribute/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.CompilerServices.SuppressIldasmAttribute/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.CompilerServices/SuppressIldasmAttribute/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.ConstrainedExecution/CriticalFinalizerObject.xml b/xml/System.Runtime.ConstrainedExecution/CriticalFinalizerObject.xml
index f26303ca9b9..c1fc3dd4c59 100644
--- a/xml/System.Runtime.ConstrainedExecution/CriticalFinalizerObject.xml
+++ b/xml/System.Runtime.ConstrainedExecution/CriticalFinalizerObject.xml
@@ -64,7 +64,7 @@
  The following code example shows the use of the <xref:Microsoft.Win32.SafeHandles.SafeFileHandle> class to provide critical finalization for the standard input and output streams. The <xref:Microsoft.Win32.SafeHandles.SafeFileHandle>, derived from the <xref:System.Runtime.InteropServices.SafeHandle> class, is passed to the file stream in the <xref:System.IO.FileStream> constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.ConstrainedExecution/CriticalFinalizerObject/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SafeHandle.SafeFileHandle/vb/program.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.ConstrainedExecution/CriticalFinalizerObject/Overview/program.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/CallingConvention.xml b/xml/System.Runtime.InteropServices/CallingConvention.xml
index ce4a62cb07b..672046d1e66 100644
--- a/xml/System.Runtime.InteropServices/CallingConvention.xml
+++ b/xml/System.Runtime.InteropServices/CallingConvention.xml
@@ -74,7 +74,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Interop CallingConvention/CPP/callingconv.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/CallingConvention/Overview/callingconv.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Interop CallingConvention/VB/callingconv.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/CallingConvention/Overview/callingconv.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ClassInterfaceType.xml b/xml/System.Runtime.InteropServices/ClassInterfaceType.xml
index 134ceb530e4..f474ee104f1 100644
--- a/xml/System.Runtime.InteropServices/ClassInterfaceType.xml
+++ b/xml/System.Runtime.InteropServices/ClassInterfaceType.xml
@@ -74,7 +74,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ClassInterfaceType/cpp/ClassInterfaceType.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ClassInterfaceType/Overview/ClassInterfaceType.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ClassInterfaceType/VB/ClassInterfaceType.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ClassInterfaceType/Overview/ClassInterfaceType.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ComImportAttribute.xml b/xml/System.Runtime.InteropServices/ComImportAttribute.xml
index 8e02de069f8..220c3ca301c 100644
--- a/xml/System.Runtime.InteropServices/ComImportAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ComImportAttribute.xml
@@ -79,7 +79,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ImprovedInteropSnippets/CPP/codefile2.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile2.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile2.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/DllImportAttribute.xml b/xml/System.Runtime.InteropServices/DllImportAttribute.xml
index 9bd3dab7571..44b231c0b99 100644
--- a/xml/System.Runtime.InteropServices/DllImportAttribute.xml
+++ b/xml/System.Runtime.InteropServices/DllImportAttribute.xml
@@ -558,7 +558,7 @@ For additional information about using the platform invoke service to access fun
  The following code example uses the <xref:System.Runtime.InteropServices.DllImportAttribute> to import the unmanaged `SHAutoComplete` function once with the <xref:System.Runtime.InteropServices.DllImportAttribute.PreserveSig> field set to `true` and again with the <xref:System.Runtime.InteropServices.DllImportAttribute.PreserveSig> field set to `false`.  This code example causes the `SHAutoComplete` function to generate any errors with an exception one time and an `HRESULT` the next.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/DllImportAttribute/PreserveSig/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.PreserveSigAttribute/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/DllImportAttribute/PreserveSig/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.InteropServices/ImportedFromTypeLibAttribute.xml b/xml/System.Runtime.InteropServices/ImportedFromTypeLibAttribute.xml
index c1144eb82b3..224c8b4bcf3 100644
--- a/xml/System.Runtime.InteropServices/ImportedFromTypeLibAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ImportedFromTypeLibAttribute.xml
@@ -69,7 +69,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ImprovedInteropSnippets/CPP/codefile3.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile3.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile3.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile3.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/InAttribute.xml b/xml/System.Runtime.InteropServices/InAttribute.xml
index ca15043df5c..fba7eb42960 100644
--- a/xml/System.Runtime.InteropServices/InAttribute.xml
+++ b/xml/System.Runtime.InteropServices/InAttribute.xml
@@ -93,7 +93,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Interop InOutParameters/CPP/inout.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/InAttribute/Overview/inout.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Interop InOutParameters/VB/inout.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/InAttribute/Overview/inout.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/LCIDConversionAttribute.xml b/xml/System.Runtime.InteropServices/LCIDConversionAttribute.xml
index 04bbc73180f..5d219bfca7d 100644
--- a/xml/System.Runtime.InteropServices/LCIDConversionAttribute.xml
+++ b/xml/System.Runtime.InteropServices/LCIDConversionAttribute.xml
@@ -68,7 +68,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/LCIDConversionAttributeSample2/CPP/lcidattrsample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/LCIDConversionAttribute/Overview/lcidattrsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/LCIDConversionAttributeSample2/VB/lcidattrsample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/LCIDConversionAttribute/Overview/lcidattrsample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/LayoutKind.xml b/xml/System.Runtime.InteropServices/LayoutKind.xml
index 7ad976d62bb..877ca7ff19f 100644
--- a/xml/System.Runtime.InteropServices/LayoutKind.xml
+++ b/xml/System.Runtime.InteropServices/LayoutKind.xml
@@ -75,7 +75,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/LayoutKind/CPP/layoutkind.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/LayoutKind/Overview/layoutkind.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/LayoutKind/VB/layoutkind.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/LayoutKind/Overview/layoutkind.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/Marshal.xml b/xml/System.Runtime.InteropServices/Marshal.xml
index 42ba0e3a475..da8004fe148 100644
--- a/xml/System.Runtime.InteropServices/Marshal.xml
+++ b/xml/System.Runtime.InteropServices/Marshal.xml
@@ -83,7 +83,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Marshal/cpp/marshal.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Overview/Marshal.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Marshal/VB/Marshal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Overview/Marshal.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -319,7 +319,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Marshal/cpp/marshal.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Overview/Marshal.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Marshal/VB/Marshal.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Overview/Marshal.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -741,7 +741,7 @@
  The following example copies an array to unmanaged memory by using the <xref:System.Runtime.InteropServices.Marshal.Copy%28System.Byte%5B%5D%2CSystem.Int32%2CSystem.IntPtr%2CSystem.Int32%29> overload, and then copies the unmanaged array back to managed memory by using the <xref:System.Runtime.InteropServices.Marshal.Copy%28System.IntPtr%2CSystem.Byte%5B%5D%2CSystem.Int32%2CSystem.Int32%29> overload.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-byte/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -821,7 +821,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-char/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -901,7 +901,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-double/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -981,7 +981,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int16/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1061,7 +1061,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1141,7 +1141,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample5.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int64/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1221,7 +1221,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-byte/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1300,7 +1300,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-char/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1379,7 +1379,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-double/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1458,7 +1458,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int16/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1537,7 +1537,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1616,7 +1616,7 @@
  The following example copies an array to unmanaged memory and then copies the unmanaged array back to managed memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Copy/sample5.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.Copy-int64/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Copy/sample5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2699,7 +2699,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Marshal/cpp/marshal.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Overview/Marshal.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Marshal/VB/Marshal.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Overview/Marshal.vb" id="Snippet4":::
 
  The following example demonstrates how to convert the contents of a managed <xref:System.String> class to unmanaged memory and then dispose of the unmanaged memory when done.
 
@@ -4268,7 +4268,7 @@ The code retrieves a reference to an instance of Microsoft Word successfully. Ho
  The following example demonstrates how to retrieve an HRESULT corresponding to a Win32 error code using the <xref:System.Runtime.InteropServices.Marshal.GetHRForLastWin32Error%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/GetHRForLastWin32Error/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetHRForLastWin32Error/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetHRForLastWin32Error/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4441,7 +4441,7 @@ The code retrieves a reference to an instance of Microsoft Word successfully. Ho
  The following example demonstrates how to retrieve a pointer to the `ITypeInfo` interface for a type using the <xref:System.Runtime.InteropServices.Marshal.GetITypeInfoForType%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/GetITypeInfoForType/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetITypeInfoForType/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetITypeInfoForType/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4527,7 +4527,7 @@ The code retrieves a reference to an instance of Microsoft Word successfully. Ho
  The following example demonstrates how to retrieve an [IUnknown](/windows/win32/api/unknwn/nn-unknwn-iunknown) interface for a managed object using the <xref:System.Runtime.InteropServices.Marshal.GetIUnknownForObject%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/GetIUnknownForObject/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetIUnknownForObject-release/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetIUnknownForObject/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4582,7 +4582,7 @@ The code retrieves a reference to an instance of Microsoft Word successfully. Ho
  The following example demonstrates how to retrieve an `IUnknown` interface for a managed object using the <xref:System.Runtime.InteropServices.Marshal.GetIUnknownForObjectInContext%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/GetIUnknownForObjectInContext/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetIUnknownForObjectInContext-release/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetIUnknownForObjectInContext/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4793,7 +4793,7 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
  The following example calls the `GetLastWin32Error` method. The example first demonstrates calling the method with no error present and then demonstrates calling the method with an error present.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/GetLastWin32Error/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetLastWin32Error/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetLastWin32Error/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7848,7 +7848,7 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
  The following example creates a managed structure, transfers it to unmanaged memory, and then transfers it back to managed memory using the <xref:System.Runtime.InteropServices.Marshal.PtrToStructure%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/PtrToStructure/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.PtrToStructure-SizeOf/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/PtrToStructure/sample.vb" id="Snippet1":::
 
  The following example demonstrates how to marshal an unmanaged block of memory to a managed structure using the <xref:System.Runtime.InteropServices.Marshal.PtrToStructure%2A> method.
 
@@ -8200,7 +8200,7 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
  The following example creates a block of unmanaged memory, writes a byte to the unmanaged memory, reads the byte back from unmanaged memory, and then disposes the unmanaged memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/ReadByte/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.ReadByte - WriteByte/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/ReadByte/example.vb" id="Snippet1":::
 
  The following example demonstrates how to use the <xref:System.Runtime.InteropServices.Marshal.ReadByte%2A> method to read the value of an unmanaged character.
 
@@ -9723,7 +9723,7 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
  The following example demonstrates how to retrieve an `IUnknown` interface for a managed object using the <xref:System.Runtime.InteropServices.Marshal.GetIUnknownForObject%2A> method. The example then releases the interface pointer by calling the <xref:System.Runtime.InteropServices.Marshal.Release%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/GetIUnknownForObject/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.GetIUnknownForObject-release/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/GetIUnknownForObject/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9986,7 +9986,7 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
  The following example uses the <xref:System.Runtime.InteropServices.Marshal.SecureStringToCoTaskMemAnsi%2A> method to marshal and decrypt the contents of a <xref:System.Security.SecureString> object to a block of unmanaged memory. It then uses the <xref:System.Runtime.InteropServices.Marshal.ZeroFreeCoTaskMemAnsi%2A> method to zero out and dispose the unmanaged block.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemAnsi/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToCoTaskMemAnsi/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemAnsi/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10057,7 +10057,7 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
  The following example uses the <xref:System.Runtime.InteropServices.Marshal.SecureStringToCoTaskMemUnicode%2A> method to marshal and decrypt the contents of a <xref:System.Security.SecureString> object to a block of unmanaged memory. It then uses the <xref:System.Runtime.InteropServices.Marshal.ZeroFreeCoTaskMemUnicode%2A> method to zero out and dispose the unmanaged block.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemUnicode/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToCoTaskMemUnicode/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemUnicode/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10128,7 +10128,7 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
  The following example uses the <xref:System.Runtime.InteropServices.Marshal.SecureStringToGlobalAllocAnsi%2A> method to marshal and decrypt the contents of a <xref:System.Security.SecureString> object to a block of unmanaged memory. It then uses the <xref:System.Runtime.InteropServices.Marshal.ZeroFreeGlobalAllocAnsi%2A> method to zero out and dispose the unmanaged block.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocAnsi/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToHGlobalAnsi/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocAnsi/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10199,7 +10199,7 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
  The following example demonstrates how to use the <xref:System.Runtime.InteropServices.Marshal.SecureStringToGlobalAllocUnicode%2A> method with the unmanaged `LogonUser` function to perform impersonation with the <xref:System.Security.SecureString> class. The example then uses the <xref:System.Runtime.InteropServices.Marshal.ZeroFreeGlobalAllocUnicode%2A> method to zero out and free the unmanaged string reference.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocUnicode/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToHGlobalUni/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocUnicode/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10473,7 +10473,7 @@ The system error is based on the current operating system&mdash;that is, `errno`
  The following example creates a managed structure, transfers it to unmanaged memory, and then transfers it back to managed memory. This example uses the <xref:System.Runtime.InteropServices.Marshal.SizeOf%2A> method to determine how much unmanaged memory to allocate.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/PtrToStructure/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.PtrToStructure-SizeOf/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/PtrToStructure/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10557,7 +10557,7 @@ The system error is based on the current operating system&mdash;that is, `errno`
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Marshal/cpp/marshal.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Overview/Marshal.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Marshal/VB/Marshal.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Overview/Marshal.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -11355,7 +11355,7 @@ The system error is based on the current operating system&mdash;that is, `errno`
  The following example creates a managed structure, transfers it to unmanaged memory using the <xref:System.Runtime.InteropServices.Marshal.StructureToPtr%2A> method, and then transfers it back to managed memory using the <xref:System.Runtime.InteropServices.Marshal.PtrToStructure%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/PtrToStructure/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.PtrToStructure-SizeOf/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/PtrToStructure/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11525,7 +11525,7 @@ The system error is based on the current operating system&mdash;that is, `errno`
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Marshal/cpp/marshal.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Overview/Marshal.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Marshal/VB/Marshal.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Overview/Marshal.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -11584,7 +11584,7 @@ The system error is based on the current operating system&mdash;that is, `errno`
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Marshal/cpp/marshal.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/Overview/Marshal.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Marshal/VB/Marshal.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/Overview/Marshal.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -11984,7 +11984,7 @@ public static void ThrowExceptionForHR(interrorCode,IntPtrerrorInfo)
  The following example creates a block of unmanaged memory, writes a byte to the unmanaged memory, reads the byte back from unmanaged memory, and then disposes the unmanaged memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/ReadByte/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.ReadByte - WriteByte/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/ReadByte/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13607,7 +13607,7 @@ public static void ThrowExceptionForHR(interrorCode,IntPtrerrorInfo)
  The following example uses the <xref:System.Runtime.InteropServices.Marshal.SecureStringToCoTaskMemAnsi%2A> method to marshal and decrypt the contents of a <xref:System.Security.SecureString> object to a block of unmanaged memory. It then uses the <xref:System.Runtime.InteropServices.Marshal.ZeroFreeCoTaskMemAnsi%2A> method to zero out and dispose the unmanaged block.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemAnsi/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToCoTaskMemAnsi/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToCoTaskMemAnsi/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13790,7 +13790,7 @@ public static void ThrowExceptionForHR(interrorCode,IntPtrerrorInfo)
  The following example uses the <xref:System.Runtime.InteropServices.Marshal.SecureStringToGlobalAllocAnsi%2A> method to marshal and decrypt the contents of a <xref:System.Security.SecureString> object to a block of unmanaged memory. It then uses the <xref:System.Runtime.InteropServices.Marshal.ZeroFreeGlobalAllocAnsi%2A> method to zero out and dispose the unmanaged block.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocAnsi/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToHGlobalAnsi/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocAnsi/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13859,7 +13859,7 @@ public static void ThrowExceptionForHR(interrorCode,IntPtrerrorInfo)
  The following example demonstrates how to use the <xref:System.Runtime.InteropServices.Marshal.SecureStringToGlobalAllocUnicode%2A> method with the unmanaged `LogonUser` function to perform impersonation with the <xref:System.Security.SecureString> class. The example then uses the <xref:System.Runtime.InteropServices.Marshal.ZeroFreeGlobalAllocUnicode%2A> method to zero out and free the unmanaged string reference.
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocUnicode/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Runtime.InteropServices.Marshal.SecureStringToHGlobalUni/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/Marshal/SecureStringToGlobalAllocUnicode/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.InteropServices/OutAttribute.xml b/xml/System.Runtime.InteropServices/OutAttribute.xml
index c0a608d5ef0..b7452da44d5 100644
--- a/xml/System.Runtime.InteropServices/OutAttribute.xml
+++ b/xml/System.Runtime.InteropServices/OutAttribute.xml
@@ -80,7 +80,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Interop InOutParameters/CPP/inout.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/InAttribute/Overview/inout.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Interop InOutParameters/VB/inout.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/InAttribute/Overview/inout.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ProgIdAttribute.xml b/xml/System.Runtime.InteropServices/ProgIdAttribute.xml
index d55b0c54953..83663cfbd01 100644
--- a/xml/System.Runtime.InteropServices/ProgIdAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ProgIdAttribute.xml
@@ -72,7 +72,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ProgIdAttribute_Value/CPP/progidattribute_value.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ProgIdAttribute/Overview/progidattribute_value.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ProgIdAttribute_Value/VB/progidattribute_value.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ProgIdAttribute/Overview/progidattribute_value.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/RuntimeEnvironment.xml b/xml/System.Runtime.InteropServices/RuntimeEnvironment.xml
index 28a6fca5c29..8ea4c448d7b 100644
--- a/xml/System.Runtime.InteropServices/RuntimeEnvironment.xml
+++ b/xml/System.Runtime.InteropServices/RuntimeEnvironment.xml
@@ -64,7 +64,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RuntimeEnvironment/cpp/RuntimeEnvironment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RuntimeEnvironment/VB/RuntimeEnvironment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -152,7 +152,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RuntimeEnvironment/cpp/RuntimeEnvironment.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RuntimeEnvironment/VB/RuntimeEnvironment.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -211,7 +211,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RuntimeEnvironment/cpp/RuntimeEnvironment.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RuntimeEnvironment/VB/RuntimeEnvironment.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -475,7 +475,7 @@ The following table shows the supported combinations for `clsid` and `riid`.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RuntimeEnvironment/cpp/RuntimeEnvironment.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RuntimeEnvironment/VB/RuntimeEnvironment.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/RuntimeEnvironment/Overview/RuntimeEnvironment.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.InteropServices/StructLayoutAttribute.xml b/xml/System.Runtime.InteropServices/StructLayoutAttribute.xml
index 7bea82da91e..11f80f2a0ff 100644
--- a/xml/System.Runtime.InteropServices/StructLayoutAttribute.xml
+++ b/xml/System.Runtime.InteropServices/StructLayoutAttribute.xml
@@ -74,7 +74,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/StructLayoutAttribute/CPP/structlayoutattribute.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/StructLayoutAttribute/Overview/structlayoutattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StructLayoutAttribute/VB/structlayoutattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/StructLayoutAttribute/Overview/structlayoutattribute.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/TypeLibFuncAttribute.xml b/xml/System.Runtime.InteropServices/TypeLibFuncAttribute.xml
index 625930f7b75..de95357d1cc 100644
--- a/xml/System.Runtime.InteropServices/TypeLibFuncAttribute.xml
+++ b/xml/System.Runtime.InteropServices/TypeLibFuncAttribute.xml
@@ -67,7 +67,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ImprovedInteropSnippets/CPP/codefile5.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile5.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile5.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile5.vb" id="Snippet5":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/TypeLibTypeAttribute.xml b/xml/System.Runtime.InteropServices/TypeLibTypeAttribute.xml
index 58edcb37a9c..780a92891ff 100644
--- a/xml/System.Runtime.InteropServices/TypeLibTypeAttribute.xml
+++ b/xml/System.Runtime.InteropServices/TypeLibTypeAttribute.xml
@@ -67,7 +67,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ImprovedInteropSnippets/CPP/codefile4.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile4.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile4.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile4.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/TypeLibVarAttribute.xml b/xml/System.Runtime.InteropServices/TypeLibVarAttribute.xml
index fdcde7c45a5..59879eb37aa 100644
--- a/xml/System.Runtime.InteropServices/TypeLibVarAttribute.xml
+++ b/xml/System.Runtime.InteropServices/TypeLibVarAttribute.xml
@@ -67,7 +67,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/TypeLibVar/CPP/codefile6.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/TypeLibVarAttribute/Overview/codefile6.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeLibVar/VB/codefile6.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/TypeLibVarAttribute/Overview/codefile6.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/UnmanagedType.xml b/xml/System.Runtime.InteropServices/UnmanagedType.xml
index 11ba66ee4d9..9c08e6fba95 100644
--- a/xml/System.Runtime.InteropServices/UnmanagedType.xml
+++ b/xml/System.Runtime.InteropServices/UnmanagedType.xml
@@ -83,7 +83,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ImprovedInteropSnippets/CPP/codefile2.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile2.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/VarEnum.xml b/xml/System.Runtime.InteropServices/VarEnum.xml
index 9b5eeef14b8..6e603a03c97 100644
--- a/xml/System.Runtime.InteropServices/VarEnum.xml
+++ b/xml/System.Runtime.InteropServices/VarEnum.xml
@@ -80,7 +80,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ImprovedInteropSnippets/CPP/codefile2.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ImprovedInteropSnippets/VB/codefile2.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComImportAttribute/Overview/codefile2.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.Contexts/SynchronizationAttribute.xml b/xml/System.Runtime.Remoting.Contexts/SynchronizationAttribute.xml
index 8ce96849f60..40263d45350 100644
--- a/xml/System.Runtime.Remoting.Contexts/SynchronizationAttribute.xml
+++ b/xml/System.Runtime.Remoting.Contexts/SynchronizationAttribute.xml
@@ -62,7 +62,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncResult.NewExamples/CPP/ad.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/IsTransparentProxy/ad.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncResult.NewExamples/VB/ad.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/IsTransparentProxy/ad.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/AsyncResult.xml b/xml/System.Runtime.Remoting.Messaging/AsyncResult.xml
index 42eac0a56ce..8be4c622616 100644
--- a/xml/System.Runtime.Remoting.Messaging/AsyncResult.xml
+++ b/xml/System.Runtime.Remoting.Messaging/AsyncResult.xml
@@ -50,10 +50,10 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/TestMethod.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/waithandle.cpp" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/waithandle.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/WaitHandle.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/WaitHandle.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
@@ -99,10 +99,10 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/TestMethod.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/callback.cpp" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/callback.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/callback.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/callback.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -193,10 +193,10 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/TestMethod.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/callback.cpp" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/callback.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/callback.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/callback.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -247,10 +247,10 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/TestMethod.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/waithandle.cpp" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/waithandle.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/WaitHandle.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/WaitHandle.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -391,10 +391,10 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/TestMethod.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncDelegateExamples/cpp/polling.cpp" id="Snippet4":::
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/polling.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/polling.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/polling.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting/RemotingServices.xml b/xml/System.Runtime.Remoting/RemotingServices.xml
index 33ea4495884..4eecd3fdfec 100644
--- a/xml/System.Runtime.Remoting/RemotingServices.xml
+++ b/xml/System.Runtime.Remoting/RemotingServices.xml
@@ -915,7 +915,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AsyncResult.NewExamples/CPP/ad.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/IsTransparentProxy/ad.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncResult.NewExamples/VB/ad.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/IsTransparentProxy/ad.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1203,7 +1203,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RemotingServices.SetObjectUriForMarshal/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/MarshalByRefObject/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RemotingServices.SetObjectUriForMarshal/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MarshalByRefObject/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime/GCSettings.xml b/xml/System.Runtime/GCSettings.xml
index 3721cc43aa8..e266c489114 100644
--- a/xml/System.Runtime/GCSettings.xml
+++ b/xml/System.Runtime/GCSettings.xml
@@ -121,7 +121,7 @@ For information about server garbage collection, see [Workstation and Server Gar
  The following example indicates whether the host computer is using server or workstation garbage collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime/GCSettings/IsServerGC/isg.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.IsServerGC/VB/isg.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime/GCSettings/IsServerGC/isg.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.AccessControl/DirectorySecurity.xml b/xml/System.Security.AccessControl/DirectorySecurity.xml
index 928ee9b10e1..8f90066ec7d 100644
--- a/xml/System.Security.AccessControl/DirectorySecurity.xml
+++ b/xml/System.Security.AccessControl/DirectorySecurity.xml
@@ -61,7 +61,7 @@
  The following code example uses the <xref:System.Security.AccessControl.DirectorySecurity> class to add and then remove an access control list (ACL) entry from a directory. You must supply a valid user or group account to run this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/GetAccessControl/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IO.DiretoryInfo.GetAccessControl-SetAccessControl/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/GetAccessControl/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.AccessControl/FileSystemAuditRule.xml b/xml/System.Security.AccessControl/FileSystemAuditRule.xml
index 32fb5ebb733..84450ecfcf3 100644
--- a/xml/System.Security.AccessControl/FileSystemAuditRule.xml
+++ b/xml/System.Security.AccessControl/FileSystemAuditRule.xml
@@ -68,7 +68,7 @@
  The following code example uses the <xref:System.Security.AccessControl.FileSystemAuditRule> class to add and then remove an audit rule from a file.  You must supply a valid user or group account to run this example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AccessControl.FileSystemAuditRule/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -186,7 +186,7 @@
  The following code example uses the <xref:System.Security.AccessControl.FileSystemAuditRule> class to add and then remove an audit rule from a file.  You must supply a valid user or group account to run this example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AccessControl.FileSystemAuditRule/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.AccessControl/FileSystemSecurity.xml b/xml/System.Security.AccessControl/FileSystemSecurity.xml
index 3f039fd1bdc..97201c7bba2 100644
--- a/xml/System.Security.AccessControl/FileSystemSecurity.xml
+++ b/xml/System.Security.AccessControl/FileSystemSecurity.xml
@@ -331,7 +331,7 @@ Use the following .NET implementation-dependent methods to add or retrieve ACL i
  The following code example uses the <xref:System.Security.AccessControl.FileSystemSecurity.AddAuditRule%2A> method to add an audit rule to a file and uses the <xref:System.Security.AccessControl.FileSystemSecurity.RemoveAuditRule%2A> method to remove the audit rule from the file. You must supply a valid user or group account to run this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AccessControl.FileSystemAuditRule/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -680,7 +680,7 @@ Use the following .NET implementation-dependent methods to add or retrieve ACL i
  The following code example uses the <xref:System.Security.AccessControl.FileSystemSecurity.AddAuditRule%2A> method to add an audit rule to a file and uses the <xref:System.Security.AccessControl.FileSystemSecurity.RemoveAuditRule%2A> method to remove the audit rule from the file. You must supply a valid user or group account to run this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AccessControl.FileSystemAuditRule/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.AccessControl/FileSystemAuditRule/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.AccessControl/RegistryRights.xml b/xml/System.Security.AccessControl/RegistryRights.xml
index 49f5fd7735b..9e625ab07c8 100644
--- a/xml/System.Security.AccessControl/RegistryRights.xml
+++ b/xml/System.Security.AccessControl/RegistryRights.xml
@@ -51,7 +51,7 @@
  This example works best if you use **RunAs** from the command line to run the Registry Editor and the sample code as a local user without administrator rights. For example, if you have defined a local user named TestUser, the command `runas /user:TestUser cmd` opens a command window from which you can run the Registry Editor and then the example code.
   
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/RegistryKey/SetAccessControl/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RegistrySecurity101/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/RegistryKey/SetAccessControl/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/OpenFlags.xml b/xml/System.Security.Cryptography.X509Certificates/OpenFlags.xml
index 88f96c12f83..5b2a5e829f6 100644
--- a/xml/System.Security.Cryptography.X509Certificates/OpenFlags.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/OpenFlags.xml
@@ -69,7 +69,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes you have three certificates to add to and remove from a local store.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/PublicKey.xml b/xml/System.Security.Cryptography.X509Certificates/PublicKey.xml
index 3d8bf66fce2..7d532068d8d 100644
--- a/xml/System.Security.Cryptography.X509Certificates/PublicKey.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/PublicKey.xml
@@ -70,12 +70,12 @@
  The following example demonstrates how to use the public key from a <xref:System.Security.Cryptography.X509Certificates.X509Certificate2> object to encrypt a file. It also shows how to decrypt the encrypted file using the private key for that certificate.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/program.vb" id="Snippet1":::
 
  The following example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -370,7 +370,7 @@
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -800,7 +800,7 @@
  The following code example opens the current user certificate store, selects only active certificates, and then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -861,7 +861,7 @@
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/StoreLocation.xml b/xml/System.Security.Cryptography.X509Certificates/StoreLocation.xml
index 14019b9bf23..2ad3075be59 100644
--- a/xml/System.Security.Cryptography.X509Certificates/StoreLocation.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/StoreLocation.xml
@@ -65,7 +65,7 @@ This enumeration is used with the <xref:System.Security.Cryptography.X509Certifi
 The following example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes you have three certificates to add to and remove from a local store.
  
 :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/StoreName.xml b/xml/System.Security.Cryptography.X509Certificates/StoreName.xml
index 9c78484a88d..8eddaae93cb 100644
--- a/xml/System.Security.Cryptography.X509Certificates/StoreName.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/StoreName.xml
@@ -63,7 +63,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes you have three certificates to add to and remove from a local store.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/StoreName/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509storename/vb/program.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/StoreName/Overview/program.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X500DistinguishedName.xml b/xml/System.Security.Cryptography.X509Certificates/X500DistinguishedName.xml
index 9f37ed8658f..86a6e35aec8 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X500DistinguishedName.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X500DistinguishedName.xml
@@ -89,7 +89,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -158,7 +158,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -376,7 +376,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -436,7 +436,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -498,7 +498,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -597,7 +597,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -657,7 +657,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.X509Certificates.X500DistinguishedName> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.xml b/xml/System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.xml
index 690d1fabdb6..43abb4d800e 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.xml
@@ -70,7 +70,7 @@
  The following code example shows how to use the `X500DistinguishedNameFlags` enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X500DistinguishedName/VB/x500.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X500DistinguishedName/Overview/x500.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.xml b/xml/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.xml
index c2ba652b3fc..e0bfcb1dfda 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.xml
@@ -70,7 +70,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509BasicConstraintsExtension> class to display the information.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -132,7 +132,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509BasicConstraintsExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -302,7 +302,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509BasicConstraintsExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -489,7 +489,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509BasicConstraintsExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -550,7 +550,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509BasicConstraintsExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509Certificate.xml b/xml/System.Security.Cryptography.X509Certificates/X509Certificate.xml
index 0d6e23e2cda..1bd4774baf2 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509Certificate.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509Certificate.xml
@@ -113,7 +113,7 @@
  The following example loads an X.509 certificate from a file, calls the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.ToString%2A> method, and displays the results to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Overview/example.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -257,7 +257,7 @@
  The following example loads an X.509 certificate file into an <xref:System.Security.Cryptography.X509Certificates.X509Certificate> object, exports the certificate as a byte array, and then imports the byte array into another <xref:System.Security.Cryptography.X509Certificates.X509Certificate> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate.Import-Export/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/.ctor/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -488,7 +488,7 @@
  The following example loads an X.509 certificate from a file, calls the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.ToString%2A> method, and displays the results to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Overview/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1359,7 +1359,7 @@
  The following example creates an <xref:System.Security.Cryptography.X509Certificates.X509Certificate> from a specified certification file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/CreateFromCertFile/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.ToString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/CreateFromCertFile/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1659,7 +1659,7 @@
  The following example compares two certificates for equality.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/Equals/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.Equals Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Equals/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1740,7 +1740,7 @@
  The following example compares two certificates for equality.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/Equals/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.Equals Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Equals/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1825,7 +1825,7 @@
  The following example loads an X.509 certificate file into an <xref:System.Security.Cryptography.X509Certificates.X509Certificate> object, exports the certificate as a byte array, and then imports the byte array into another <xref:System.Security.Cryptography.X509Certificates.X509Certificate> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate.Import-Export/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/.ctor/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2191,7 +2191,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetCertHash%2A> method to fill an array of bytes with the hash value for an X.509 certificate.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetCertHash/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetCertHash Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetCertHash/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2305,7 +2305,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetCertHashString%2A> method to get an X.509 certificate hash value, convert it to a string, and display it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetCertHashString/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetCertHashString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetCertHashString/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2414,7 +2414,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetEffectiveDateString%2A> method to get the effective date of a certificate and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetEffectiveDateString/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetEffectiveDateString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetEffectiveDateString/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2479,7 +2479,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetExpirationDateString%2A> method to get the expiration date of a certificate and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetExpirationDateString/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetExpirationDateString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetExpirationDateString/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2541,7 +2541,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetFormat%2A> method to get the format of a certificate and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetFormat/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetFormat Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetFormat/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2609,7 +2609,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetHashCode%2A> method to return an integer representation of a certificate's hash code and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetHashCode/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetHashCode Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetHashCode/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2682,7 +2682,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetIssuerName%2A> method to return the certificate issuer's name and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetIssuerName/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetIssuerName Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetIssuerName/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2752,7 +2752,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetKeyAlgorithm%2A> method to get a certificate's key algorithm in string format and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithm/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithm Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithm/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2817,7 +2817,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetKeyAlgorithmParameters%2A> method to return a certificate's key algorithm parameters as an array of bytes and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithmParameters/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithmParameters Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithmParameters/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2882,7 +2882,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetKeyAlgorithmParametersString%2A> method to return a certificate's key algorithm parameters in string format and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithmParametersString/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetKeyAlgorithmParametersString/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetKeyAlgorithmParametersString/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2956,7 +2956,7 @@
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetName%2A> method to return the name of a certificate's principal and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetName/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetName Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetName/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3022,7 +3022,7 @@ This value corresponds to the contents of the `subjectPublicKey` field of the Su
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetPublicKey%2A> method to return a certificate's public key as an array of bytes and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetPublicKey/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetPublicKey Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetPublicKey/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3080,7 +3080,7 @@ This value corresponds to the contents of the `subjectPublicKey` field of the Su
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetPublicKeyString%2A> method to return a certificate's public key as a string and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetPublicKeyString/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetPublicKeyString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetPublicKeyString/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3143,7 +3143,7 @@ The output of this method is equivalent to the output of the <xref:System.Securi
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetRawCertData%2A> method to return a certificate's raw data as an array of bytes and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetRawCertData/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetRawCertData Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetRawCertData/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3198,7 +3198,7 @@ The output of this method is equivalent to the output of the <xref:System.Securi
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetRawCertDataString%2A> method to return a certificate's raw data as a string and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetRawCertDataString/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetRawCertDataString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetRawCertDataString/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3261,7 +3261,7 @@ The output of this method is equivalent to the output of the <xref:System.Securi
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetSerialNumber%2A> method to return a certificate's serial number as an array of bytes and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetSerialNumber/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetSerialNumber Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetSerialNumber/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3317,7 +3317,7 @@ The output of this method is equivalent to the output of the <xref:System.Securi
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.GetSerialNumberString%2A> method to return a certificate's serial number as a string and displays it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/GetSerialNumberString/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.GetSerialNumberString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/GetSerialNumberString/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3545,7 +3545,7 @@ The output of this method is equivalent to the output of the <xref:System.Securi
  The following example loads an X.509 certificate from a file, calls the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.ToString%2A> method, and displays the results to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/Import/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Certificate.Import/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/Import/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4277,7 +4277,7 @@ The output of this method is equivalent to the output of the <xref:System.Securi
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.ToString%2A> method to display the value of a certificate to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/CreateFromCertFile/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.ToString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/CreateFromCertFile/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4344,7 +4344,7 @@ The output of this method is equivalent to the output of the <xref:System.Securi
  The following example uses the <xref:System.Security.Cryptography.X509Certificates.X509Certificate.ToString%2A> method to display the value of a certificate to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Certificate/CreateFromCertFile/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/X509Certificate.ToString Method/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Certificate/CreateFromCertFile/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509Certificate2.xml b/xml/System.Security.Cryptography.X509Certificates/X509Certificate2.xml
index 52645139a32..7a2bec3aa33 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509Certificate2.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509Certificate2.xml
@@ -80,12 +80,12 @@
  The following example demonstrates how to use an <xref:System.Security.Cryptography.X509Certificates.X509Certificate2> object to encrypt and decrypt a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509certificate2/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/program.vb" id="Snippet1":::
 
  The following example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -166,7 +166,7 @@
  The following code example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1404,7 +1404,7 @@ If you create an <xref:System.Security.Cryptography.X509Certificates.X509Certifi
  The following code example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2072,7 +2072,7 @@ The certificate is encoded according to the IETF RFC 7468 "strict"
  The following code example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2141,7 +2141,7 @@ The certificate is encoded according to the IETF RFC 7468 "strict"
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2223,7 +2223,7 @@ The certificate is encoded according to the IETF RFC 7468 "strict"
  The following code example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2601,7 +2601,7 @@ The certificate is encoded according to the IETF RFC 7468 "strict"
  The following code example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3026,7 +3026,7 @@ The certificate is encoded according to the IETF RFC 7468 "strict"
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3245,7 +3245,7 @@ The certificate is encoded according to the IETF RFC 7468 "strict"
  The following code example creates a command-line executable file that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3376,7 +3376,7 @@ The Subject Alternative Name extension or Subject Name could not be decoded.</ex
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3437,7 +3437,7 @@ The Subject Alternative Name extension or Subject Name could not be decoded.</ex
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3512,7 +3512,7 @@ The Subject Alternative Name extension or Subject Name could not be decoded.</ex
  The following code example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3580,7 +3580,7 @@ The Subject Alternative Name extension or Subject Name could not be decoded.</ex
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3636,7 +3636,7 @@ The Subject Alternative Name extension or Subject Name could not be decoded.</ex
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3792,7 +3792,7 @@ Unlike <xref:System.Security.Cryptography.X509Certificates.X509Certificate2.RawD
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3852,7 +3852,7 @@ Unlike <xref:System.Security.Cryptography.X509Certificates.X509Certificate2.RawD
  The following code example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3913,7 +3913,7 @@ Unlike <xref:System.Security.Cryptography.X509Certificates.X509Certificate2.RawD
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3976,7 +3976,7 @@ Unlike <xref:System.Security.Cryptography.X509Certificates.X509Certificate2.RawD
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4050,7 +4050,7 @@ Unlike <xref:System.Security.Cryptography.X509Certificates.X509Certificate2.RawD
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4117,7 +4117,7 @@ Unlike <xref:System.Security.Cryptography.X509Certificates.X509Certificate2.RawD
  The following code example creates a command line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4232,7 +4232,7 @@ Unlike <xref:System.Security.Cryptography.X509Certificates.X509Certificate2.RawD
  The following code example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4293,7 +4293,7 @@ Unlike <xref:System.Security.Cryptography.X509Certificates.X509Certificate2.RawD
  The following code example creates a command-line executable that takes a certificate file as an argument and prints various certificate properties to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertInfo/VB/certinfo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Overview/certinfo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.xml b/xml/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.xml
index 874cfff4477..1fd5f5056c0 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.xml
@@ -82,7 +82,7 @@
  The following code example opens the current user's personal certificate store, selects only valid certificates, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate the user selects.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -155,7 +155,7 @@
  The following code example opens the current user's personal certificate store, selects only valid certificates, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate the user selects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -255,7 +255,7 @@
  The following code example opens the current user's personal certificate store, selects only valid certificates, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -310,7 +310,7 @@
  The following code example opens the current user's personal certificate store, selects only valid certificates, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate the user selects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -374,7 +374,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -950,7 +950,7 @@
  The following code example opens the current user's personal certificate store, finds only valid certificates, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate the user selects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1876,7 +1876,7 @@
  The following code example opens the current user's personal certificate store, selects only valid certificates, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate the user selects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509Certificate2UI.xml b/xml/System.Security.Cryptography.X509Certificates/X509Certificate2UI.xml
index ba72ac354a9..ab417ad6c57 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509Certificate2UI.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509Certificate2UI.xml
@@ -49,7 +49,7 @@
  The following code example demonstrates how to display user interface dialogs to select and view X.509 certificates.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -147,7 +147,7 @@
  The following code example demonstrates how to display user interface dialogs to select and view X.509 certificates.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -292,7 +292,7 @@
  The following code example demonstrates how to display user interface dialogs to select and view X.509 certificates.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509Chain.xml b/xml/System.Security.Cryptography.X509Certificates/X509Chain.xml
index 6a66282b914..d7f85835ba2 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509Chain.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509Chain.xml
@@ -84,7 +84,7 @@
  The following code example opens the current user's personal certificate store, allows you to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -156,7 +156,7 @@
  The following code example opens the current user's personal certificate store, allows you to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -221,7 +221,7 @@
  The following code example opens the current user's personal certificate store, allows you to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -350,7 +350,7 @@
  The following code example opens the current user's personal certificate store, allows you to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -474,7 +474,7 @@ The following code example demonstrates the ordering of chain elements:
  The following code example opens the current user's personal certificate store, allows you to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -534,7 +534,7 @@ The following code example demonstrates the ordering of chain elements:
  The following code example opens the current user's personal certificate store, allows you to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509ChainElement.xml b/xml/System.Security.Cryptography.X509Certificates/X509ChainElement.xml
index 8329426c5f2..260eeb09e4e 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509ChainElement.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509ChainElement.xml
@@ -128,7 +128,7 @@
  The following code example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate the user selects.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
  The following code example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate the user selects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.xml b/xml/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.xml
index 459f5f81618..d9b758f8258 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.xml
@@ -85,7 +85,7 @@
  The following code example opens the current user's personal certificate store, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet4":::
 
  ]]></format>
     </remarks>
@@ -203,7 +203,7 @@
  The following code example opens the current user's personal certificate store, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -317,7 +317,7 @@
  The following code example opens the current user's personal certificate store, allows the user to select a certificate, and then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509ChainPolicy.xml b/xml/System.Security.Cryptography.X509Certificates/X509ChainPolicy.xml
index 0a78e101a7c..7abfe736e46 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509ChainPolicy.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509ChainPolicy.xml
@@ -70,7 +70,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -172,7 +172,7 @@
  By default, this collection is empty. You can add additional object identifiers (OIDs) to the collection using the following code:
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/remarks.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/remarks.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/remarks.vb" id="Snippet5":::
 
 
 
@@ -180,7 +180,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -244,7 +244,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -534,7 +534,7 @@ The collection is respected only when <xref:System.Security.Cryptography.X509Cer
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -601,7 +601,7 @@ The collection is respected only when <xref:System.Security.Cryptography.X509Cer
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -770,7 +770,7 @@ When <xref:System.Security.Cryptography.X509Certificates.X509ChainTrustMode.Cust
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -847,7 +847,7 @@ not with the time that the object was constructed.
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509ChainStatus.xml b/xml/System.Security.Cryptography.X509Certificates/X509ChainStatus.xml
index 7bdc8f2a52d..3afde5ca285 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509ChainStatus.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509ChainStatus.xml
@@ -70,7 +70,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
@@ -144,7 +144,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -210,7 +210,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.xml b/xml/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.xml
index fc6c43a6b43..b29508e601e 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.xml
@@ -70,7 +70,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension> class to display the information.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -137,7 +137,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -344,7 +344,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509EnhancedKeyUsageExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509Extension.xml b/xml/System.Security.Cryptography.X509Certificates/X509Extension.xml
index cd1a0490e44..7a656c25bc7 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509Extension.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509Extension.xml
@@ -82,7 +82,7 @@
  The following code example demonstrates using the <xref:System.Security.Cryptography.X509Certificates.X509Extension> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -155,7 +155,7 @@
  The following code example demonstrates using the <xref:System.Security.Cryptography.X509Certificates.X509Extension> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -218,7 +218,7 @@
  The following code example demonstrates using the <xref:System.Security.Cryptography.X509Certificates.X509Extension> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -283,7 +283,7 @@
  The following code example demonstrates using the <xref:System.Security.Cryptography.X509Certificates.X509Extension> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -396,7 +396,7 @@
  The following code example demonstrates using the <xref:System.Security.Cryptography.X509Certificates.X509Extension> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -503,7 +503,7 @@
  The following code example demonstrates using the <xref:System.Security.Cryptography.X509Certificates.X509Extension> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -578,7 +578,7 @@
  The following code example demonstrates using the <xref:System.Security.Cryptography.X509Certificates.X509Extension> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509FindType.xml b/xml/System.Security.Cryptography.X509Certificates/X509FindType.xml
index 57887bf1c24..872cec72a3a 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509FindType.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509FindType.xml
@@ -65,7 +65,7 @@
  The following example opens the current user's personal certificate store, finds only valid certificates, allows the user to select a certificate, and then writes certificate information to the console. The output depends on the certificate you select.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.xml b/xml/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.xml
index 604b9453333..a28375f9b64 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.xml
@@ -70,7 +70,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509KeyUsageExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -132,7 +132,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509KeyUsageExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509NameType.xml b/xml/System.Security.Cryptography.X509Certificates/X509NameType.xml
index b48ff4f3319..fd5fe72bd21 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509NameType.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509NameType.xml
@@ -63,7 +63,7 @@
  The following example opens the current user certificate store, selects only active certificates, then allows the user to select one or more certificates. The example then writes certificate information to the console.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CertSelect/VB/certselect.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/PublicKey/Key/certselect.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509RevocationFlag.xml b/xml/System.Security.Cryptography.X509Certificates/X509RevocationFlag.xml
index 581488a95f2..5d9d702fea7 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509RevocationFlag.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509RevocationFlag.xml
@@ -63,7 +63,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509RevocationMode.xml b/xml/System.Security.Cryptography.X509Certificates/X509RevocationMode.xml
index 2ed709fd374..7075c7f9304 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509RevocationMode.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509RevocationMode.xml
@@ -66,7 +66,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509SelectionFlag.xml b/xml/System.Security.Cryptography.X509Certificates/X509SelectionFlag.xml
index cb9f4460cf5..84af6e753cd 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509SelectionFlag.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509SelectionFlag.xml
@@ -38,7 +38,7 @@
  The following code example demonstrates how to use the selection flag with the <xref:System.Security.Cryptography.X509Certificates.X509Certificate2UI.SelectFromCollection%2A?displayProperty=nameWithType> method. This code example is part of a larger example provided for the <xref:System.Security.Cryptography.X509Certificates.X509Store> class. The larger example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate the user selects.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509Store.xml b/xml/System.Security.Cryptography.X509Certificates/X509Store.xml
index 948f8fadfaf..9b8edcae0ad 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509Store.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509Store.xml
@@ -92,14 +92,14 @@
  The example creates an <xref:System.Security.Cryptography.X509Certificates.X509Store> object for each combination of standard name and standard location. It calls the <xref:System.Security.Cryptography.X509Certificates.X509Store.Open%2A> method with the <xref:System.Security.Cryptography.X509Certificates.OpenFlags.OpenExistingOnly?displayProperty=nameWithType> flag, which opens the physical store only if it already exists. If the physical store exists, the example uses the <xref:System.Security.Cryptography.X509Certificates.X509Store.Name%2A>, <xref:System.Security.Cryptography.X509Certificates.X509Store.Location%2A>, and <xref:System.Security.Cryptography.X509Certificates.X509Store.Certificates%2A> properties to display the number of certificates in the store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/storenames1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.vb" id="Snippet2":::
 
  **Example 2**
 
  This example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -172,7 +172,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -288,7 +288,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -352,7 +352,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -418,7 +418,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -480,7 +480,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -544,7 +544,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -694,7 +694,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -758,7 +758,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -829,14 +829,14 @@
  The example creates an <xref:System.Security.Cryptography.X509Certificates.X509Store> object for each combination of standard name and standard location. It calls the <xref:System.Security.Cryptography.X509Certificates.X509Store.Open%2A> method with the <xref:System.Security.Cryptography.X509Certificates.OpenFlags.OpenExistingOnly?displayProperty=nameWithType> flag, which opens the physical store only if it already exists. If the physical store exists, the example uses the <xref:System.Security.Cryptography.X509Certificates.X509Store.Name%2A>, <xref:System.Security.Cryptography.X509Certificates.X509Store.Location%2A>, and <xref:System.Security.Cryptography.X509Certificates.X509Store.Certificates%2A> properties to display the number of certificates in the store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/storenames1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.vb" id="Snippet2":::
 
  **Example 2**
 
  This example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -894,7 +894,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1063,14 +1063,14 @@
  The example creates an <xref:System.Security.Cryptography.X509Certificates.X509Store> object for each combination of standard name and standard location. It calls the <xref:System.Security.Cryptography.X509Certificates.X509Store.Open%2A> method with the <xref:System.Security.Cryptography.X509Certificates.OpenFlags.OpenExistingOnly?displayProperty=nameWithType> flag, which opens the physical store only if it already exists. If the physical store exists, the example uses the <xref:System.Security.Cryptography.X509Certificates.X509Store.Name%2A>, <xref:System.Security.Cryptography.X509Certificates.X509Store.Location%2A>, and <xref:System.Security.Cryptography.X509Certificates.X509Store.Certificates%2A> properties to display the number of certificates in the store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/storenames1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.vb" id="Snippet2":::
 
  **Example 2**
 
  This example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1149,14 +1149,14 @@
  The example creates an <xref:System.Security.Cryptography.X509Certificates.X509Store> object for each combination of standard name and standard location. It calls the <xref:System.Security.Cryptography.X509Certificates.X509Store.Open%2A> method with the <xref:System.Security.Cryptography.X509Certificates.OpenFlags.OpenExistingOnly?displayProperty=nameWithType> flag, which opens the physical store only if it already exists. If the physical store exists, the example uses the <xref:System.Security.Cryptography.X509Certificates.X509Store.Name%2A>, <xref:System.Security.Cryptography.X509Certificates.X509Store.Location%2A>, and <xref:System.Security.Cryptography.X509Certificates.X509Store.Certificates%2A> properties to display the number of certificates in the store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/storenames1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/storenames1.vb" id="Snippet2":::
 
  **Example 2**
 
  This example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1219,7 +1219,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1285,7 +1285,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1353,7 +1353,7 @@
  The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes that you have three certificates to add to and remove from a local store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/OpenFlags/Overview/x509store2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.xml b/xml/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.xml
index 30df26d8537..c1f74cad92d 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.xml
@@ -70,7 +70,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509SubjectKeyIdentifierExtension> class to display the information.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -132,7 +132,7 @@
  The following code example demonstrates how to open a user's personal certificate store and display information about each certificate in the store.  This example uses the <xref:System.Security.Cryptography.X509Certificates.X509SubjectKeyIdentifierExtension> class to display the information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.X509Certificates.X509Extensions/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.X509Certificates/X509VerificationFlags.xml b/xml/System.Security.Cryptography.X509Certificates/X509VerificationFlags.xml
index 5e25f6e747a..73e1b50220f 100644
--- a/xml/System.Security.Cryptography.X509Certificates/X509VerificationFlags.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/X509VerificationFlags.xml
@@ -69,7 +69,7 @@
  The following example opens the current user's personal certificate store, allows the user to select a certificate, then writes certificate and certificate chain information to the console. The output depends on the certificate you select.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/x509chaintest/vb/x509chaintest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.X509Certificates/X509Chain/Overview/x509chaintest.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/CipherData.xml b/xml/System.Security.Cryptography.Xml/CipherData.xml
index 5806fddd77b..d7751f64626 100644
--- a/xml/System.Security.Cryptography.Xml/CipherData.xml
+++ b/xml/System.Security.Cryptography.Xml/CipherData.xml
@@ -54,7 +54,7 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.EncryptedData> class to create an `<EncryptedData>` element that contains a `<CipherData>` element, and then writes the XML to an XML file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/Overview/encrypteddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptgraphy.Xml.EncryptedData/VB/encrypteddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/Overview/encrypteddata.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -107,7 +107,7 @@
  The following code example shows how to create a new instance of the <xref:System.Security.Cryptography.Xml.CipherData> class. The entire sample can be found in the <xref:System.Security.Cryptography.Xml.CipherData> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/Overview/encrypteddata.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptgraphy.Xml.EncryptedData/VB/encrypteddata.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/Overview/encrypteddata.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -158,7 +158,7 @@
  The following code example shows how to create a new instance of the <xref:System.Security.Cryptography.Xml.CipherData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/.ctor/encrypteddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.EncryptedData2/VB/encrypteddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/encrypteddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
  The following code example shows how to create a new instance of the <xref:System.Security.Cryptography.Xml.CipherData> class using <xref:System.Security.Cryptography.Xml.CipherReference> information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/.ctor/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.CipherReference/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -262,7 +262,7 @@ The `<CipherReference>` element identifies a source that, when processed, yields
  The following code example shows how to create a new instance of the <xref:System.Security.Cryptography.Xml.CipherData> class using <xref:System.Security.Cryptography.Xml.CipherReference> information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/.ctor/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.CipherReference/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -316,7 +316,7 @@ The `<CipherReference>` element identifies a source that, when processed, yields
  The following code example shows how to create a new instance of the <xref:System.Security.Cryptography.Xml.CipherData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/.ctor/encrypteddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.EncryptedData2/VB/encrypteddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/encrypteddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -367,7 +367,7 @@ The `<CipherReference>` element identifies a source that, when processed, yields
  The following code example demonstrates how to create a new instance of the <xref:System.Security.Cryptography.Xml.CipherData> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/Overview/encrypteddata.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptgraphy.Xml.EncryptedData/VB/encrypteddata.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/Overview/encrypteddata.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/CipherReference.xml b/xml/System.Security.Cryptography.Xml/CipherReference.xml
index cb3b579d984..8f0190c3ab9 100644
--- a/xml/System.Security.Cryptography.Xml/CipherReference.xml
+++ b/xml/System.Security.Cryptography.Xml/CipherReference.xml
@@ -61,7 +61,7 @@ EncryptedXml exml = new EncryptedXml(doc, ev);
  The following code example creates a new instance of <xref:System.Security.Cryptography.Xml.CipherReference>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/.ctor/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.CipherReference/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/example.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -122,7 +122,7 @@ EncryptedXml exml = new EncryptedXml(doc, ev);
  The following code example creates a new instance of <xref:System.Security.Cryptography.Xml.CipherReference>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/.ctor/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.CipherReference/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@ EncryptedXml exml = new EncryptedXml(doc, ev);
  The following code example creates a new instance of <xref:System.Security.Cryptography.Xml.CipherReference>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/.ctor/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.CipherReference/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -242,7 +242,7 @@ EncryptedXml exml = new EncryptedXml(doc, ev);
  The following code example creates a new instance of <xref:System.Security.Cryptography.Xml.CipherReference>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherData/.ctor/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.Xml.CipherReference/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherData/.ctor/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -291,7 +291,7 @@ EncryptedXml exml = new EncryptedXml(doc, ev);
  The following code example shows one way to use the <xref:System.Security.Cryptography.Xml.CipherReference.GetXml%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherReference/GetXml/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CipherReference2/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherReference/GetXml/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/DataObject.xml b/xml/System.Security.Cryptography.Xml/DataObject.xml
index afbde94087d..7f24a769010 100644
--- a/xml/System.Security.Cryptography.Xml/DataObject.xml
+++ b/xml/System.Security.Cryptography.Xml/DataObject.xml
@@ -52,12 +52,12 @@
  The following code example demonstrates how to generate an enveloping XML signature.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataObject/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Signing/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source.vb" id="Snippet1":::
 
  The following code example demonstrates how to check an XML signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataObject/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Verification/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -111,12 +111,12 @@
  The following code example demonstrates how to generate an enveloping XML signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataObject/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Signing/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source.vb" id="Snippet1":::
 
  The following code example demonstrates how to check an XML signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataObject/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Verification/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -219,12 +219,12 @@
  The following code example demonstrates how to generate an enveloping XML signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataObject/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Signing/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source.vb" id="Snippet1":::
 
  The following code example demonstrates how to check an XML signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataObject/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Verification/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -359,12 +359,12 @@
  The following code example demonstrates how to generate an enveloping XML signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataObject/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Signing/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source.vb" id="Snippet1":::
 
  The following code example demonstrates how to check an XML signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataObject/Overview/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG Verification/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataObject/Overview/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/DataReference.xml b/xml/System.Security.Cryptography.Xml/DataReference.xml
index 427c6f72f63..a635854cd4b 100644
--- a/xml/System.Security.Cryptography.Xml/DataReference.xml
+++ b/xml/System.Security.Cryptography.Xml/DataReference.xml
@@ -53,7 +53,7 @@
  The following code example demonstrates how to use the <xref:System.Security.Cryptography.Xml.DataReference> class to encrypt and decrypt multiple XML elements using different session keys.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataReference/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.DataReference/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataReference/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -108,7 +108,7 @@
  The following code example demonstrates how to use the <xref:System.Security.Cryptography.Xml.DataReference> class to encrypt and decrypt multiple XML elements using different session keys.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/DataReference/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.DataReference/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/DataReference/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/EncryptedData.xml b/xml/System.Security.Cryptography.Xml/EncryptedData.xml
index c3a6c63927d..7c916b468d4 100644
--- a/xml/System.Security.Cryptography.Xml/EncryptedData.xml
+++ b/xml/System.Security.Cryptography.Xml/EncryptedData.xml
@@ -49,7 +49,7 @@
  The following example demonstrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedData> class. This example then displays various properties of the <xref:System.Security.Cryptography.Xml.EncryptedData> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -93,7 +93,7 @@
  The following example demonstrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedData> class. This example then displays various properties of the <xref:System.Security.Cryptography.Xml.EncryptedData> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -196,7 +196,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedData> class. This example then displays various properties of the <xref:System.Security.Cryptography.Xml.EncryptedData> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/EncryptedKey.xml b/xml/System.Security.Cryptography.Xml/EncryptedKey.xml
index ea9a69975ed..9f3fffc3c19 100644
--- a/xml/System.Security.Cryptography.Xml/EncryptedKey.xml
+++ b/xml/System.Security.Cryptography.Xml/EncryptedKey.xml
@@ -51,7 +51,7 @@
  The following example illustrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedKey> class. This example then displays the values of various properties of the <xref:System.Security.Cryptography.Xml.EncryptedKey> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedKey/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -95,7 +95,7 @@
  The following example illustrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedKey> class. This example then displays the values of various properties of the <xref:System.Security.Cryptography.Xml.EncryptedKey> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedKey/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -245,7 +245,7 @@
  The following example illustrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedKey> class. This example then displays the values of various properties of the <xref:System.Security.Cryptography.Xml.EncryptedKey> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedKey/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -348,7 +348,7 @@
  The following example illustrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedKey> class. This example then displays the values of various properties of the <xref:System.Security.Cryptography.Xml.EncryptedKey> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedKey/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -398,7 +398,7 @@
  The following example illustrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedKey> class. This example then displays the values of various properties of the <xref:System.Security.Cryptography.Xml.EncryptedKey> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedKey/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -446,7 +446,7 @@
  The following example illustrates how to encrypt and decrypt an XML element by using the <xref:System.Security.Cryptography.Xml.EncryptedKey> class. This example then displays the values of various properties of the <xref:System.Security.Cryptography.Xml.EncryptedKey> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedKey/vb/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedKey/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/EncryptedReference.xml b/xml/System.Security.Cryptography.Xml/EncryptedReference.xml
index a01fa5555a0..294912502b7 100644
--- a/xml/System.Security.Cryptography.Xml/EncryptedReference.xml
+++ b/xml/System.Security.Cryptography.Xml/EncryptedReference.xml
@@ -49,7 +49,7 @@
  The following example uses the <xref:System.Security.Cryptography.Xml.CipherReference.GetXml%2A> method in the <xref:System.Security.Cryptography.Xml.CipherReference> class to write the XML values to the console.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherReference/GetXml/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CipherReference2/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherReference/GetXml/example.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -322,7 +322,7 @@
  The following example uses the <xref:System.Security.Cryptography.Xml.CipherReference.GetXml%2A> method in the <xref:System.Security.Cryptography.Xml.CipherReference> class to write the XML values to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/CipherReference/GetXml/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CipherReference2/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/CipherReference/GetXml/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/EncryptedType.xml b/xml/System.Security.Cryptography.Xml/EncryptedType.xml
index 80691edb680..ae9d381f46b 100644
--- a/xml/System.Security.Cryptography.Xml/EncryptedType.xml
+++ b/xml/System.Security.Cryptography.Xml/EncryptedType.xml
@@ -51,7 +51,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML-EncryptedData - EncryptedType/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -95,7 +95,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML-EncryptedData - EncryptedType/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML-EncryptedData - EncryptedType/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -244,7 +244,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class. This sample then displays various properties of the <xref:System.Security.Cryptography.Xml.EncryptedData> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -293,7 +293,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML-EncryptedData - EncryptedType/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -347,7 +347,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class. This sample then displays various properties of the <xref:System.Security.Cryptography.Xml.EncryptedData> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -437,7 +437,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class. This sample then displays various properties of the <xref:System.Security.Cryptography.Xml.EncryptedData> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -491,7 +491,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class. This sample then displays various properties of the <xref:System.Security.Cryptography.Xml.EncryptedData> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -552,7 +552,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML-EncryptedData - EncryptedType/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -602,7 +602,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class. This sample then displays various properties of the <xref:System.Security.Cryptography.Xml.EncryptedData> class to the console.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptedData/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedData/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -651,7 +651,7 @@
  The following code example demonstrates how to encrypt and decrypt an XML element using the <xref:System.Security.Cryptography.Xml.EncryptedData> class that derives from the <xref:System.Security.Cryptography.Xml.EncryptedType> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML-EncryptedData - EncryptedType/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedType/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/EncryptedXml.xml b/xml/System.Security.Cryptography.Xml/EncryptedXml.xml
index 56e2a85f946..9176b04b863 100644
--- a/xml/System.Security.Cryptography.Xml/EncryptedXml.xml
+++ b/xml/System.Security.Cryptography.Xml/EncryptedXml.xml
@@ -65,27 +65,27 @@
  The following code example demonstrates how to create a simple utility class that uses the <xref:System.Security.Cryptography.TripleDES> algorithm to encrypt an XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.MainXMLEncDecryptDataOOP/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example embeds a key name in the encrypted XML document that the decrypting method uses to find the appropriate decryption key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an X.509 certificate. This example creates a symmetric session key to encrypt the document and then uses the X.509 certificate to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKeyX509/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -105,22 +105,22 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example embeds a key name in the encrypted XML document that the decrypting method uses to find the appropriate decryption key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an X.509 certificate. This example creates a symmetric session key to encrypt the document and then uses the X.509 certificate to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKeyX509/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -174,22 +174,22 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example embeds a key name in the encrypted XML document that the decrypting method uses to find the appropriate decryption key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an X.509 certificate. This example creates a symmetric session key to encrypt the document and then uses the X.509 certificate to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKeyX509/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -247,12 +247,12 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example embeds a key name in the encrypted XML document that the decrypting method uses to find the appropriate decryption key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -367,7 +367,7 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example embeds a key name in the encrypted XML document that the decrypting method uses to find the appropriate decryption key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/AddKeyNameMapping/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecrypt/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/AddKeyNameMapping/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -469,7 +469,7 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -539,12 +539,12 @@
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an X.509 certificate. This example creates a symmetric session key to encrypt the document and then uses the X.509 certificate to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKeyX509/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.vb" id="Snippet1":::
 
  The following code example demonstrates how to decrypt a high level `<EncryptedData>` tag that contains another encrypted `<EncryptedData>` tag.
 
@@ -844,12 +844,12 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/AddKeyNameMapping/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecrypt/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/AddKeyNameMapping/sample.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an X.509 certificate. This example creates a symmetric session key to encrypt the document and then uses the X.509 certificate to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKeyX509/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -917,7 +917,7 @@
  The following code example demonstrates how to encrypt an XML document using an X.509 certificate. This example creates a symmetric session key to encrypt the document and then uses the X.509 certificate to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKeyX509/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -989,7 +989,7 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/AddKeyNameMapping/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecrypt/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/AddKeyNameMapping/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1019,17 +1019,17 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example embeds a key name in the encrypted XML document that the decrypting method uses to find the appropriate decryption key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1083,17 +1083,17 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example embeds a key name in the encrypted XML document that the decrypting method uses to find the appropriate decryption key.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1156,7 +1156,7 @@
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1186,7 +1186,7 @@
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1298,7 +1298,7 @@
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1663,7 +1663,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1724,7 +1724,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1894,7 +1894,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1980,7 +1980,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2066,7 +2066,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2113,7 +2113,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2199,7 +2199,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2324,7 +2324,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2527,7 +2527,7 @@ The value of the <paramref name="symmetricAlgorithmUri" /> parameter is not a su
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/EncryptionMethod.xml b/xml/System.Security.Cryptography.Xml/EncryptionMethod.xml
index 39dcd7d0cec..dea67ebe752 100644
--- a/xml/System.Security.Cryptography.Xml/EncryptionMethod.xml
+++ b/xml/System.Security.Cryptography.Xml/EncryptionMethod.xml
@@ -53,12 +53,12 @@
  The following code example demonstrates how to create a simple utility class that uses the <xref:System.Security.Cryptography.TripleDES> algorithm to encrypt an XML document.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.MainXMLEncDecryptDataOOP/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -154,12 +154,12 @@
  The following code example demonstrates how to create a simple utility class that uses the <xref:System.Security.Cryptography.TripleDES> algorithm to encrypt an XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.MainXMLEncDecryptDataOOP/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample.vb" id="Snippet1":::
 
  The following code example demonstrates how to encrypt an XML document using a symmetric key. This example does not include any key information in the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMinimalDecryptData/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/EncryptionProperty.xml b/xml/System.Security.Cryptography.Xml/EncryptionProperty.xml
index e9ba7f535b0..bb5915be504 100644
--- a/xml/System.Security.Cryptography.Xml/EncryptionProperty.xml
+++ b/xml/System.Security.Cryptography.Xml/EncryptionProperty.xml
@@ -51,7 +51,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -132,7 +132,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -228,7 +228,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -321,7 +321,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -371,7 +371,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/EncryptionPropertyCollection.xml b/xml/System.Security.Cryptography.Xml/EncryptionPropertyCollection.xml
index 56e73fa6f5f..7146b761f7e 100644
--- a/xml/System.Security.Cryptography.Xml/EncryptionPropertyCollection.xml
+++ b/xml/System.Security.Cryptography.Xml/EncryptionPropertyCollection.xml
@@ -62,7 +62,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -101,7 +101,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -148,7 +148,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -356,7 +356,7 @@
  The following code example encrypts and decrypts an XML document.  This code example creates an <xref:System.Security.Cryptography.Xml.EncryptionProperty> object that contains custom information about the <xref:System.Security.Cryptography.Xml.EncryptedKey> element, and adds the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object to the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection of the <xref:System.Security.Cryptography.Xml.EncryptedXml> class.  Finally, this code example displays information about the <xref:System.Security.Cryptography.Xml.EncryptionProperty> object and the <xref:System.Security.Cryptography.Xml.EncryptionPropertyCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.EncryptionProperty/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptionProperty/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/IRelDecryptor.xml b/xml/System.Security.Cryptography.Xml/IRelDecryptor.xml
index ad4ebca78bb..bff1599a620 100644
--- a/xml/System.Security.Cryptography.Xml/IRelDecryptor.xml
+++ b/xml/System.Security.Cryptography.Xml/IRelDecryptor.xml
@@ -41,7 +41,7 @@
  The following code example shows how to validate an XML digital signature using the <xref:System.Security.Cryptography.Xml.IRelDecryptor> interface and the <xref:System.Security.Cryptography.Xml.XmlLicenseTransform> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/IRelDecryptor/Overview/sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlLicenseTransform/VB/sample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/IRelDecryptor/Overview/sample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/KeyInfo.xml b/xml/System.Security.Cryptography.Xml/KeyInfo.xml
index bd8fb502b20..53fa6e90502 100644
--- a/xml/System.Security.Cryptography.Xml/KeyInfo.xml
+++ b/xml/System.Security.Cryptography.Xml/KeyInfo.xml
@@ -68,12 +68,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfo> object when encrypting an XML document. This example embeds an encrypted key within the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfo> object when encrypting an XML document. This example maps a name to a symmetric key to identify it to the decryption method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -123,12 +123,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfo> object when encrypting an XML document. This example embeds an encrypted key within the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfo> object when encrypting an XML document. This example maps a name to a symmetric key to identify it to the decryption method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -185,12 +185,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfo> object when encrypting an XML document. This example embeds an encrypted key within the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfo> object when encrypting an XML document. This example maps a name to a symmetric key to identify it to the decryption method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.xml b/xml/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.xml
index 112fbb65b25..6eba703feef 100644
--- a/xml/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.xml
+++ b/xml/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.xml
@@ -57,7 +57,7 @@
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -77,7 +77,7 @@
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -156,7 +156,7 @@
  The following code example demonstrates how to encrypt an XML document using an asymmetric key. This example creates a symmetric session key to encrypt the document and then uses the asymmetric key to embed an encrypted version of the session key into the XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/KeyInfoName.xml b/xml/System.Security.Cryptography.Xml/KeyInfoName.xml
index 3a159f45db3..9b4526d6e1f 100644
--- a/xml/System.Security.Cryptography.Xml/KeyInfoName.xml
+++ b/xml/System.Security.Cryptography.Xml/KeyInfoName.xml
@@ -62,12 +62,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfoName> object when encrypting an XML document. This example embeds an encrypted key within the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfoName> object when encrypting an XML document. This example maps a name to a symmetric key to identify it to the decryption method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -126,12 +126,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfoName> object when encrypting an XML document. This example embeds an encrypted key within the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfoName> object when encrypting an XML document. This example maps a name to a symmetric key to identify it to the decryption method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -321,12 +321,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfoName> object when encrypting an XML document. This example embeds an encrypted key within the encrypted XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncImbedKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample1.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.KeyInfoName> object when encrypting an XML document. This example maps a name to a symmetric key to identify it to the decryption method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XMLEncMapKey/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/EncryptedXml/Overview/sample2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/Reference.xml b/xml/System.Security.Cryptography.Xml/Reference.xml
index 769d73b4fc3..dda379c24eb 100644
--- a/xml/System.Security.Cryptography.Xml/Reference.xml
+++ b/xml/System.Security.Cryptography.Xml/Reference.xml
@@ -209,7 +209,7 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.Reference> class to sign and verify an XML document using an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/Signature.xml b/xml/System.Security.Cryptography.Xml/Signature.xml
index bbed1f0fa85..1c9588016d2 100644
--- a/xml/System.Security.Cryptography.Xml/Signature.xml
+++ b/xml/System.Security.Cryptography.Xml/Signature.xml
@@ -52,12 +52,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.Signature> class with the <xref:System.Security.Cryptography.Xml.SignedXml> class to sign and verify an XML document using an envelope signature.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.Signature> class with the <xref:System.Security.Cryptography.Xml.SignedXml> class to sign an object and verify an XML document using a detached signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Signature/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -98,12 +98,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.Signature> class with the <xref:System.Security.Cryptography.Xml.SignedXml> class to sign and verify an XML document using an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.Signature> class with the <xref:System.Security.Cryptography.Xml.SignedXml> class to sign an object and verify an XML document using a detached signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Signature/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -290,12 +290,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.Signature> class with the <xref:System.Security.Cryptography.Xml.SignedXml> class to sign and verify an XML document using an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.Signature> class with the <xref:System.Security.Cryptography.Xml.SignedXml> class to sign an object and verify an XML document using a detached signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Signature/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -505,12 +505,12 @@
  The following code example uses the <xref:System.Security.Cryptography.Xml.Signature> class with the <xref:System.Security.Cryptography.Xml.SignedXml> class to sign and verify an XML document using an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.Signature> class with the <xref:System.Security.Cryptography.Xml.SignedXml> class to sign an object and verify an XML document using a detached signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Signature/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/SignedXml.xml b/xml/System.Security.Cryptography.Xml/SignedXml.xml
index 3a129ed803d..ad93dfb21f6 100644
--- a/xml/System.Security.Cryptography.Xml/SignedXml.xml
+++ b/xml/System.Security.Cryptography.Xml/SignedXml.xml
@@ -49,7 +49,7 @@ The following code example shows how to sign and verify an entire XML document u
 The following code example shows how to sign and verify a single element of an XML document using an enveloping signature.
 
 :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/Overview/sample.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.SignVerifyEnvelope - Specify Element/VB/sample.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/Overview/sample.vb" id="Snippet1":::
       ]]></format>
     </example>
     <related type="ExternalDocumentation" href="https://www.w3.org/TR/xmldsig-bestpractices">XML Signature Best Practices</related>
@@ -108,17 +108,17 @@ The following code example shows how to sign and verify a single element of an X
  The following code example shows how to sign and verify an entire XML document using an enveloped signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  The following code example shows how to sign and verify a Uniform Resource Identifier (URI) addressable object using a detached signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Signature/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb" id="Snippet1":::
 
  The following code example shows how to sign and verify a single element of an XML document using an enveloping signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.SignVerifyEnvelope - Specify Element/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -172,17 +172,17 @@ The following code example shows how to sign and verify a single element of an X
  The following code example shows how to sign and verify an entire XML document using an enveloped signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  The following code example shows how to sign and verify a Uniform Resource Identifier (URI) addressable object using a detached signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Signature/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb" id="Snippet1":::
 
  The following code example shows how to sign and verify a single element of an XML document using an enveloping signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.SignVerifyEnvelope - Specify Element/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -344,17 +344,17 @@ The following code example shows how to sign and verify a single element of an X
  The following code example shows how to sign and verify an entire XML document using an enveloped signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  The following code example shows how to sign and verify a Uniform Resource Identifier (URI) addressable object using a detached signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Signature/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb" id="Snippet1":::
 
  The following code example shows how to sign and verify a single element of an XML document using an enveloping signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.SignVerifyEnvelope - Specify Element/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -426,7 +426,7 @@ The following code example shows how to sign and verify a single element of an X
  The following code example shows how to sign and verify a single element of an XML document using an enveloping signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.SignVerifyEnvelope - Specify Element/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -635,7 +635,7 @@ The following code example shows how to sign and verify a single element of an X
  The following code example uses an X.509 certificate from a certificate store to sign and verify an XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/CheckSignature/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Security.Cryptography.Xml.SignedXml.CheckSignature/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/CheckSignature/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1363,12 +1363,12 @@ The following code example shows how to sign and verify a single element of an X
  The following code example uses the <xref:System.Security.Cryptography.Xml.SignedXml.Signature%2A> property to sign and verify an entire XML document using an enveloped signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Reference/.ctor/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.Signature - Envelope/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Reference/.ctor/sample.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.Xml.SignedXml.Signature%2A> property to sign and verify a Uniform Resource Identifier (URI) addressable object using a detached signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/Signature/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/XMLDSIG - Signature - Detached/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/Signature/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1677,7 +1677,7 @@ The following code example shows how to sign and verify a single element of an X
  The following code example shows how to sign and verify a single element of an XML document using an enveloping signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.SignVerifyEnvelope - Specify Element/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2162,7 +2162,7 @@ The following code example shows how to sign and verify a single element of an X
  The following code example shows how to sign and verify an XML document using the <xref:System.Security.Cryptography.Xml.XmlDsigExcC14NTransform> class.  This sample creates an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NTransformUrl/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NTransform/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NTransformUrl/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2215,7 +2215,7 @@ The following code example shows how to sign and verify a single element of an X
  The following code example shows how to sign and verify an XML document using the <xref:System.Security.Cryptography.Xml.XmlDsigExcC14NWithCommentsTransform> class.  This sample creates an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NWithCommentsTransformUrl/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NWithCommentsTransform/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NWithCommentsTransformUrl/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.xml b/xml/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.xml
index 1714e5398ee..6d67786529c 100644
--- a/xml/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.xml
+++ b/xml/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.xml
@@ -61,7 +61,7 @@
  The following code example shows how to sign an XML document with the <xref:System.Security.Cryptography.Xml.XmlDsigExcC14NTransform> class using an envelope signature.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NTransformUrl/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NTransform/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NTransformUrl/example.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -438,7 +438,7 @@
  The following code example shows how to sign an XML document with the <xref:System.Security.Cryptography.Xml.XmlDsigExcC14NTransform> class using an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NTransformUrl/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NTransform/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NTransformUrl/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/XmlDsigExcC14NWithCommentsTransform.xml b/xml/System.Security.Cryptography.Xml/XmlDsigExcC14NWithCommentsTransform.xml
index 64b4004f3d4..8b8122413d5 100644
--- a/xml/System.Security.Cryptography.Xml/XmlDsigExcC14NWithCommentsTransform.xml
+++ b/xml/System.Security.Cryptography.Xml/XmlDsigExcC14NWithCommentsTransform.xml
@@ -51,7 +51,7 @@
  The following code example shows how to sign and verify an XML document using the <xref:System.Security.Cryptography.Xml.XmlDsigExcC14NWithCommentsTransform> class.  This example creates an envelope signature.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NWithCommentsTransformUrl/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigExcC14NWithCommentsTransform/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/SignedXml/XmlDsigExcC14NWithCommentsTransformUrl/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/XmlDsigXPathTransform.xml b/xml/System.Security.Cryptography.Xml/XmlDsigXPathTransform.xml
index 618d9b76351..0c0174645ce 100644
--- a/xml/System.Security.Cryptography.Xml/XmlDsigXPathTransform.xml
+++ b/xml/System.Security.Cryptography.Xml/XmlDsigXPathTransform.xml
@@ -58,7 +58,7 @@
  **Example #1**
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/XmlDsigXPathTransform/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXPathTransform/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXPathTransform/Overview/sample.vb" id="Snippet1":::
 
  **Example #2**
 
@@ -103,7 +103,7 @@
  The following code example shows how to sign and verify an XML document using the <xref:System.Security.Cryptography.Xml.XmlDsigXPathTransform> class.  This example creates an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/XmlDsigXPathTransform/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXPathTransform/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXPathTransform/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -373,7 +373,7 @@
  The following code example shows how to sign and verify an XML document using the <xref:System.Security.Cryptography.Xml.XmlDsigXPathTransform> class.  This sample creates an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/XmlDsigXPathTransform/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXPathTransform/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXPathTransform/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/XmlDsigXsltTransform.xml b/xml/System.Security.Cryptography.Xml/XmlDsigXsltTransform.xml
index ba5cdc40671..b1e97527126 100644
--- a/xml/System.Security.Cryptography.Xml/XmlDsigXsltTransform.xml
+++ b/xml/System.Security.Cryptography.Xml/XmlDsigXsltTransform.xml
@@ -62,7 +62,7 @@
  **Example #1**
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/XmlDsigXsltTransform/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXsltTransform/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXsltTransform/Overview/sample.vb" id="Snippet1":::
 
  **Example #2**
 
@@ -116,7 +116,7 @@
  The following code example shows how to sign and verify an XML document using the <xref:System.Security.Cryptography.Xml.XmlDsigXsltTransform> class with an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/XmlDsigXsltTransform/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXsltTransform/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXsltTransform/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -401,7 +401,7 @@
  The following code example shows how to sign and verify an XML document using the <xref:System.Security.Cryptography.Xml.XmlDsigXsltTransform> class with an envelope signature.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/XmlDsigXsltTransform/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlDsigXsltTransform/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/XmlDsigXsltTransform/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography.Xml/XmlLicenseTransform.xml b/xml/System.Security.Cryptography.Xml/XmlLicenseTransform.xml
index 3bf337a922c..9d26e636dda 100644
--- a/xml/System.Security.Cryptography.Xml/XmlLicenseTransform.xml
+++ b/xml/System.Security.Cryptography.Xml/XmlLicenseTransform.xml
@@ -61,7 +61,7 @@
  The following code example shows how to validate an XML digital signature using the <xref:System.Security.Cryptography.Xml.IRelDecryptor> interface and the <xref:System.Security.Cryptography.Xml.XmlLicenseTransform> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/IRelDecryptor/Overview/sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlLicenseTransform/VB/sample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/IRelDecryptor/Overview/sample.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -145,7 +145,7 @@
  The following code example shows how to validate an XML digital signature using the <xref:System.Security.Cryptography.Xml.IRelDecryptor> interface and the <xref:System.Security.Cryptography.Xml.XmlLicenseTransform> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography.Xml/IRelDecryptor/Overview/sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.XML.XmlLicenseTransform/VB/sample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography.Xml/IRelDecryptor/Overview/sample.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/Aes.xml b/xml/System.Security.Cryptography/Aes.xml
index f7778c64064..ec3af914f26 100644
--- a/xml/System.Security.Cryptography/Aes.xml
+++ b/xml/System.Security.Cryptography/Aes.xml
@@ -77,7 +77,7 @@
  The following example demonstrates how to encrypt and decrypt sample data by using the <xref:System.Security.Cryptography.Aes> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Aes/Overview/program.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/aessample/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Aes/Overview/program.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aessample/fs/program.fs" id="Snippet1":::
   
  ]]></format>
@@ -133,7 +133,7 @@
  The following example demonstrates how to encrypt and decrypt sample data using the <xref:System.Security.Cryptography.Aes> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Aes/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/aessample/vb/program.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Aes/Overview/program.vb" id="Snippet1":::  
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aessample/fs/program.fs" id="Snippet1":::  
   
  ]]></format>
diff --git a/xml/System.Security.Cryptography/AesCryptoServiceProvider.xml b/xml/System.Security.Cryptography/AesCryptoServiceProvider.xml
index 1d32641f3a9..4e61ab8da1d 100644
--- a/xml/System.Security.Cryptography/AesCryptoServiceProvider.xml
+++ b/xml/System.Security.Cryptography/AesCryptoServiceProvider.xml
@@ -71,7 +71,7 @@
  The following example demonstrates how to encrypt and decrypt sample data using the <xref:System.Security.Cryptography.AesCryptoServiceProvider> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AesCryptoServiceProvider/Overview/program.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/aescryptoservprovider/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AesCryptoServiceProvider/Overview/program.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aescryptoservprovider/fs/program.fs" id="Snippet1":::
   
  ]]></format>
@@ -317,7 +317,7 @@
  The following example shows how to use the <xref:System.Security.Cryptography.AesCryptoServiceProvider.CreateDecryptor%2A?displayProperty=nameWithType> method to decrypt an encrypted message. This code example is part of a larger example provided for the <xref:System.Security.Cryptography.AesCryptoServiceProvider> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AesCryptoServiceProvider/Overview/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/aescryptoservprovider/vb/program.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AesCryptoServiceProvider/Overview/program.vb" id="Snippet3":::  
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aescryptoservprovider/fs/program.fs" id="Snippet3":::  
   
  ]]></format>
@@ -477,7 +477,7 @@
  The following example shows how to use the <xref:System.Security.Cryptography.AesCryptoServiceProvider.CreateEncryptor%2A?displayProperty=nameWithType> method to encrypt a message. This code example is part of a larger example provided for the <xref:System.Security.Cryptography.AesCryptoServiceProvider> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AesCryptoServiceProvider/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/aescryptoservprovider/vb/program.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AesCryptoServiceProvider/Overview/program.vb" id="Snippet2":::  
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aescryptoservprovider/fs/program.fs" id="Snippet2":::  
   
  ]]></format>
diff --git a/xml/System.Security.Cryptography/AesManaged.xml b/xml/System.Security.Cryptography/AesManaged.xml
index 065788b9995..e2ba0f5f2a2 100644
--- a/xml/System.Security.Cryptography/AesManaged.xml
+++ b/xml/System.Security.Cryptography/AesManaged.xml
@@ -83,7 +83,7 @@
  The following example demonstrates how to encrypt and decrypt sample data using the <xref:System.Security.Cryptography.AesManaged> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AesManaged/Overview/program.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/aesmanaged/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AesManaged/Overview/program.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aesmanaged/fs/program.fs" id="Snippet1"::: 
   
  ]]></format>
@@ -298,7 +298,7 @@
  The following example shows how to use the <xref:System.Security.Cryptography.AesManaged.CreateDecryptor%2A?displayProperty=nameWithType> method to decrypt an encrypted message. This code example is part of a larger example provided for the <xref:System.Security.Cryptography.AesManaged> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AesManaged/Overview/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/aesmanaged/vb/program.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AesManaged/Overview/program.vb" id="Snippet3":::  
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aesmanaged/fs/program.fs" id="Snippet3":::  
   
  ]]></format>
@@ -433,7 +433,7 @@
  The following example shows how to use the <xref:System.Security.Cryptography.AesManaged.CreateEncryptor%2A> method to encrypt a message. This code example is part of a larger example provided for the <xref:System.Security.Cryptography.AesManaged> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AesManaged/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/aesmanaged/vb/program.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AesManaged/Overview/program.vb" id="Snippet2":::  
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/aesmanaged/fs/program.fs" id="Snippet2":::  
   
  ]]></format>
diff --git a/xml/System.Security.Cryptography/AsnEncodedData.xml b/xml/System.Security.Cryptography/AsnEncodedData.xml
index 9a03018f897..83cb0858a15 100644
--- a/xml/System.Security.Cryptography/AsnEncodedData.xml
+++ b/xml/System.Security.Cryptography/AsnEncodedData.xml
@@ -70,7 +70,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -271,7 +271,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -434,7 +434,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -537,7 +537,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -610,7 +610,7 @@ extension.Format(true);
 The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
 :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
           ]]></format>
         </example>
       </Docs>
@@ -679,7 +679,7 @@ The following code example shows how to use the <xref:System.Security.Cryptograp
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -744,7 +744,7 @@ The following code example shows how to use the <xref:System.Security.Cryptograp
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedData> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/AsnEncodedDataCollection.xml b/xml/System.Security.Cryptography/AsnEncodedDataCollection.xml
index b805bcd1b11..fe5b6bb6ee7 100644
--- a/xml/System.Security.Cryptography/AsnEncodedDataCollection.xml
+++ b/xml/System.Security.Cryptography/AsnEncodedDataCollection.xml
@@ -75,7 +75,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -125,7 +125,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -227,7 +227,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -298,7 +298,7 @@ One of the OIDs is <see langword="null" /> and the OIDs do not match.</exception
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -360,7 +360,7 @@ One of the OIDs is <see langword="null" /> and the OIDs do not match.</exception
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -420,7 +420,7 @@ One of the OIDs is <see langword="null" /> and the OIDs do not match.</exception
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -482,7 +482,7 @@ One of the OIDs is <see langword="null" /> and the OIDs do not match.</exception
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -545,7 +545,7 @@ One of the OIDs is <see langword="null" /> and the OIDs do not match.</exception
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -602,7 +602,7 @@ One of the OIDs is <see langword="null" /> and the OIDs do not match.</exception
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -665,7 +665,7 @@ One of the OIDs is <see langword="null" /> and the OIDs do not match.</exception
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/AsnEncodedDataEnumerator.xml b/xml/System.Security.Cryptography/AsnEncodedDataEnumerator.xml
index 8c093daad06..b484aba3fcf 100644
--- a/xml/System.Security.Cryptography/AsnEncodedDataEnumerator.xml
+++ b/xml/System.Security.Cryptography/AsnEncodedDataEnumerator.xml
@@ -72,7 +72,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataEnumerator> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -135,7 +135,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataEnumerator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -203,7 +203,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataEnumerator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -266,7 +266,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.AsnEncodedDataEnumerator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.AsnEncodedData/VB/asnencodeddata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/AsnEncodedData/Overview/asnencodeddata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/CspKeyContainerInfo.xml b/xml/System.Security.Cryptography/CspKeyContainerInfo.xml
index e7ea8795f50..3ea343a2614 100644
--- a/xml/System.Security.Cryptography/CspKeyContainerInfo.xml
+++ b/xml/System.Security.Cryptography/CspKeyContainerInfo.xml
@@ -79,7 +79,7 @@
  The following code example creates a key container and retrieves information about that container.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -139,7 +139,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -200,7 +200,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -379,7 +379,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -435,7 +435,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -498,7 +498,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -553,7 +553,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -614,7 +614,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -680,7 +680,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -739,7 +739,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -799,7 +799,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -860,7 +860,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -925,7 +925,7 @@
  The following code example creates a key container and retrieves information about that container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/CspParameters.xml b/xml/System.Security.Cryptography/CspParameters.xml
index 6724732f230..eef3e6293dc 100644
--- a/xml/System.Security.Cryptography/CspParameters.xml
+++ b/xml/System.Security.Cryptography/CspParameters.xml
@@ -86,12 +86,12 @@
  The following code example creates a key container using the <xref:System.Security.Cryptography.CspParameters> class and saves the key in the container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspParameters/Overview/capikey.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/capikey/VB/capikey.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/capikey.vb" id="Snippet1":::
 
  The following code example uses the <xref:System.Security.Cryptography.CspParameters> class to select a Smart Card Cryptographic Service Provider.  It then signs and verifies data using the smart card.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspParameters/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.SmartCardCSP/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/example.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -160,7 +160,7 @@
  The following code example creates a key container using the <xref:System.Security.Cryptography.CspParameters> class and saves the key in the container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspParameters/Overview/capikey.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/capikey/VB/capikey.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/capikey.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -291,7 +291,7 @@
  The following code example uses the <xref:System.Security.Cryptography.CspParameters> class to select a Smart Card Cryptographic Service Provider.  It then signs and verifies data using the smart card.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspParameters/Overview/example.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.SmartCardCSP/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -615,7 +615,7 @@
  The following code example creates a key container using the <xref:System.Security.Cryptography.CspParameters> class and saves the key in the container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspParameters/Overview/capikey.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/capikey/VB/capikey.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspParameters/Overview/capikey.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -681,7 +681,7 @@
  The following code example demonstrates how to use the <xref:System.Security.Cryptography.KeyNumber> enumeration to specify a key type for an <xref:System.Security.Cryptography.RSACryptoServiceProvider> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspParameters/KeyNumber/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.KeyNumber/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspParameters/KeyNumber/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/DES.xml b/xml/System.Security.Cryptography/DES.xml
index 27478190ef3..039565393b0 100644
--- a/xml/System.Security.Cryptography/DES.xml
+++ b/xml/System.Security.Cryptography/DES.xml
@@ -216,12 +216,12 @@
  The following code example shows how to create and use a <xref:System.Security.Cryptography.DES> object to encrypt and decrypt data in a file.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DES/Create/fileexample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DES.Create.File/VB/fileexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DES/Create/fileexample.vb" id="Snippet1":::
 
  The following code example shows how to create and use a <xref:System.Security.Cryptography.DES> object to encrypt and decrypt data in memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DES/Create/memoryexample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DES.Create.Memory/VB/memoryexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DES/Create/memoryexample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/DESCryptoServiceProvider.xml b/xml/System.Security.Cryptography/DESCryptoServiceProvider.xml
index ad95d7ae3e6..7880c3492ec 100644
--- a/xml/System.Security.Cryptography/DESCryptoServiceProvider.xml
+++ b/xml/System.Security.Cryptography/DESCryptoServiceProvider.xml
@@ -408,12 +408,12 @@
  The following code example shows how to create and use a <xref:System.Security.Cryptography.DESCryptoServiceProvider> object to encrypt and decrypt data in a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DESCryptoServiceProvider/CreateEncryptor/fileexample.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DESCSP.CreateEncryptor.File/VB/fileexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/CreateEncryptor/fileexample.vb" id="Snippet1":::
 
  The following code example shows how to create and use a <xref:System.Security.Cryptography.DESCryptoServiceProvider> object to encrypt and decrypt data in memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DESCryptoServiceProvider/CreateEncryptor/memoryexample.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DESCSP.CreateEncryptor.Memory/VB/memoryexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/CreateEncryptor/memoryexample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/DataProtectionScope.xml b/xml/System.Security.Cryptography/DataProtectionScope.xml
index 5d8adf27985..10432daad0a 100644
--- a/xml/System.Security.Cryptography/DataProtectionScope.xml
+++ b/xml/System.Security.Cryptography/DataProtectionScope.xml
@@ -46,7 +46,7 @@
  The following code example shows how to use data protection.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DataProtectionSample/vb/dataprotectionsample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/DataProtector.xml b/xml/System.Security.Cryptography/DataProtector.xml
index 5d26d400de0..ac5f95ef40b 100644
--- a/xml/System.Security.Cryptography/DataProtector.xml
+++ b/xml/System.Security.Cryptography/DataProtector.xml
@@ -29,12 +29,12 @@
  The following example demonstrates how to create a data protector that uses a protection class with an option for extra entropy. By default, the <xref:System.Security.Cryptography.DataProtector> class prepends the hash of the purpose properties to the data to be encrypted. You can turn that functionality off and use the hashed purpose as extra entropy when calling a data protector with an extra entropy option.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtector/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.dataprotector/vb/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class1.vb" id="Snippet1":::  
   
  The following example demonstrates a simple data protector that uses the <xref:System.Security.Cryptography.DataProtector.PrependHashedPurposeToPlaintext%2A> functionality of the <xref:System.Security.Cryptography.DataProtector> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtector/Overview/class11.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.memoryprotector/vb/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class11.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -174,7 +174,7 @@
  The following example shows how to use the <xref:System.Security.Cryptography.DataProtector.GetHashedPurpose%2A> method to hash the purpose properties for use as extra entropy.  It is part of a larger code example for the <xref:System.Security.Cryptography.DataProtector> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtector/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.dataprotector/vb/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -311,7 +311,7 @@
  The following example shows an implementation of the <xref:System.Security.Cryptography.DataProtector.ProviderProtect%2A> method.  It is part of a larger code example for the <xref:System.Security.Cryptography.DataProtector> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtector/Overview/class11.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.memoryprotector/vb/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class11.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -346,7 +346,7 @@
  The following example shows an implementation of the <xref:System.Security.Cryptography.DataProtector.ProviderUnprotect%2A> method.  It is part of a larger code example for the <xref:System.Security.Cryptography.DataProtector> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtector/Overview/class11.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/cryptography.memoryprotector/vb/class1.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtector/Overview/class11.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/ECDiffieHellmanCng.xml b/xml/System.Security.Cryptography/ECDiffieHellmanCng.xml
index 5d38c0485e7..5700db86595 100644
--- a/xml/System.Security.Cryptography/ECDiffieHellmanCng.xml
+++ b/xml/System.Security.Cryptography/ECDiffieHellmanCng.xml
@@ -75,7 +75,7 @@
  The following example shows how to use the <xref:System.Security.Cryptography.ECDiffieHellmanCng> class to establish a key exchange and how to use that key to encrypt a message that can be sent over a public channel and decrypted by the receiver.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/ECDiffieHellmanCng/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ecdiffiehellmancng/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/ECDiffieHellmanCng/Overview/program.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/ECDsaCng.xml b/xml/System.Security.Cryptography/ECDsaCng.xml
index 5a41b1b691b..d15e74694c7 100644
--- a/xml/System.Security.Cryptography/ECDsaCng.xml
+++ b/xml/System.Security.Cryptography/ECDsaCng.xml
@@ -65,7 +65,7 @@ When platform interop is not needed, you should use the <xref:System.Security.Cr
  The following example shows how to use the <xref:System.Security.Cryptography.ECDsaCng> class to sign a message and how to use the signature to verify that the message has not been altered.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/ECDsaCng/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ecdsacng/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/ECDsaCng/Overview/program.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/HMACRIPEMD160.xml b/xml/System.Security.Cryptography/HMACRIPEMD160.xml
index 4fa72c1ed10..3667c54e49b 100644
--- a/xml/System.Security.Cryptography/HMACRIPEMD160.xml
+++ b/xml/System.Security.Cryptography/HMACRIPEMD160.xml
@@ -44,7 +44,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/hmacripemd160.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/HMACRIPEMD160/vb/hmacripemd160.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/HMACSHA256.xml b/xml/System.Security.Cryptography/HMACSHA256.xml
index 50b387c30d4..9cb54ad57e0 100644
--- a/xml/System.Security.Cryptography/HMACSHA256.xml
+++ b/xml/System.Security.Cryptography/HMACSHA256.xml
@@ -84,7 +84,7 @@
  The following example shows how to sign a file by using the <xref:System.Security.Cryptography.HMACSHA256> object and then how to verify the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HMACSHA256/Overview/hmacsha256.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/HMACSHA256/vb/hmacsha256.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HMACSHA256/Overview/hmacsha256.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/HMACSHA384.xml b/xml/System.Security.Cryptography/HMACSHA384.xml
index 15183f83b0d..9641b907f34 100644
--- a/xml/System.Security.Cryptography/HMACSHA384.xml
+++ b/xml/System.Security.Cryptography/HMACSHA384.xml
@@ -84,7 +84,7 @@
  The following example shows how to sign a file by using the <xref:System.Security.Cryptography.HMACSHA384> object, and then how to verify the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HMACSHA384/Overview/hmacsha384.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/HMACSHA384/vb/hmacsha384.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HMACSHA384/Overview/hmacsha384.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/HMACSHA512.xml b/xml/System.Security.Cryptography/HMACSHA512.xml
index 4e89afdeef0..64900f198b2 100644
--- a/xml/System.Security.Cryptography/HMACSHA512.xml
+++ b/xml/System.Security.Cryptography/HMACSHA512.xml
@@ -84,7 +84,7 @@
  The following example shows how to sign a file by using the <xref:System.Security.Cryptography.HMACSHA512> object and then how to verify the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HMACSHA512/Overview/hmacsha512.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/HMACSHA512/vb/hmacsha512.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HMACSHA512/Overview/hmacsha512.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/HashAlgorithm.xml b/xml/System.Security.Cryptography/HashAlgorithm.xml
index 79afaf96a57..338b6811be4 100644
--- a/xml/System.Security.Cryptography/HashAlgorithm.xml
+++ b/xml/System.Security.Cryptography/HashAlgorithm.xml
@@ -1576,7 +1576,7 @@ For more information about Dispose and Finalize, see [Cleaning Up Unmanaged Reso
  The following code examples use the <xref:System.Security.Cryptography.HashAlgorithm.TransformFinalBlock%2A> method with the <xref:System.Security.Cryptography.HashAlgorithm.TransformBlock%2A> method to hash a string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HashAlgorithm/TransformBlock/sample.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.HashAlgorithm.TransformFinalBlock/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/TransformBlock/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1665,7 +1665,7 @@ For more information about Dispose and Finalize, see [Cleaning Up Unmanaged Reso
  The following code examples use the <xref:System.Security.Cryptography.HashAlgorithm.TransformFinalBlock%2A> method with the <xref:System.Security.Cryptography.HashAlgorithm.TransformBlock%2A> method to hash a string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HashAlgorithm/TransformBlock/sample.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.HashAlgorithm.TransformFinalBlock/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/TransformBlock/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/KeyNumber.xml b/xml/System.Security.Cryptography/KeyNumber.xml
index e6abf96cba0..e0fb7359bf8 100644
--- a/xml/System.Security.Cryptography/KeyNumber.xml
+++ b/xml/System.Security.Cryptography/KeyNumber.xml
@@ -71,7 +71,7 @@
  The following code example demonstrates how to use the <xref:System.Security.Cryptography.KeyNumber> enumeration to specify a key type for an <xref:System.Security.Cryptography.RSACryptoServiceProvider> object.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspParameters/KeyNumber/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.KeyNumber/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspParameters/KeyNumber/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/KeyedHashAlgorithm.xml b/xml/System.Security.Cryptography/KeyedHashAlgorithm.xml
index 9272d121ace..305aad58b1c 100644
--- a/xml/System.Security.Cryptography/KeyedHashAlgorithm.xml
+++ b/xml/System.Security.Cryptography/KeyedHashAlgorithm.xml
@@ -77,7 +77,7 @@
  The following code example demonstrates how to derive from the <xref:System.Security.Cryptography.KeyedHashAlgorithm> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/KeyedHashAlgorithm/Overview/program.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/keyedhashalgorithm/vb/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/KeyedHashAlgorithm/Overview/program.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/MACTripleDES.xml b/xml/System.Security.Cryptography/MACTripleDES.xml
index b5db233287a..5b18e58dd3a 100644
--- a/xml/System.Security.Cryptography/MACTripleDES.xml
+++ b/xml/System.Security.Cryptography/MACTripleDES.xml
@@ -40,7 +40,7 @@
  The following example creates a MAC for a file named `input.txt`, which is located in the folder that contains the example executable. The MAC and the original text are written to a file named `encrypted.hsh` in the same folder. The signed file is then read, and the MAC is calculated for the text portion of the file and compared to the MAC that is included with the text.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/MACTripleDES/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MAC3DES/VB/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/MACTripleDES/Overview/program.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/MemoryProtectionScope.xml b/xml/System.Security.Cryptography/MemoryProtectionScope.xml
index a035bc233d9..72713c5106a 100644
--- a/xml/System.Security.Cryptography/MemoryProtectionScope.xml
+++ b/xml/System.Security.Cryptography/MemoryProtectionScope.xml
@@ -28,7 +28,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/CPP/memoryprotectionsample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/vb/memoryprotectionsample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/Oid.xml b/xml/System.Security.Cryptography/Oid.xml
index e780746ff09..c80e141b937 100644
--- a/xml/System.Security.Cryptography/Oid.xml
+++ b/xml/System.Security.Cryptography/Oid.xml
@@ -66,7 +66,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.Oid> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -134,7 +134,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.Oid> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -191,7 +191,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.Oid> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -256,7 +256,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.Oid> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -322,7 +322,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.Oid> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@ In .NET 5 and later versions, this property is *init only*, meaning that its val
  The following code example shows how to use the <xref:System.Security.Cryptography.Oid> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -559,7 +559,7 @@ In .NET 5 and later versions, this property is *init only*, meaning that its val
  The following code example shows how to use the <xref:System.Security.Cryptography.Oid> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/OidCollection.xml b/xml/System.Security.Cryptography/OidCollection.xml
index a6c9eb0dd2e..ff1e0500391 100644
--- a/xml/System.Security.Cryptography/OidCollection.xml
+++ b/xml/System.Security.Cryptography/OidCollection.xml
@@ -75,7 +75,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -130,7 +130,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -193,7 +193,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -257,7 +257,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -314,7 +314,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -374,7 +374,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -436,7 +436,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -509,7 +509,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -579,7 +579,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidCollection> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/OidEnumerator.xml b/xml/System.Security.Cryptography/OidEnumerator.xml
index 77c0338b5b0..4d642bbed39 100644
--- a/xml/System.Security.Cryptography/OidEnumerator.xml
+++ b/xml/System.Security.Cryptography/OidEnumerator.xml
@@ -72,7 +72,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidEnumerator> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -135,7 +135,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidEnumerator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -203,7 +203,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidEnumerator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -266,7 +266,7 @@
  The following code example shows how to use the <xref:System.Security.Cryptography.OidEnumerator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Oid/Overview/cryptography.oid.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.Oid/VB/cryptography.oid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Oid/Overview/cryptography.oid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/PasswordDeriveBytes.xml b/xml/System.Security.Cryptography/PasswordDeriveBytes.xml
index cc4c935a6b9..eb27ef11621 100644
--- a/xml/System.Security.Cryptography/PasswordDeriveBytes.xml
+++ b/xml/System.Security.Cryptography/PasswordDeriveBytes.xml
@@ -80,7 +80,7 @@
  The following code example creates a key from a password using the <xref:System.Security.Cryptography.PasswordDeriveBytes> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -167,7 +167,7 @@
  The following code example creates a key from a password using the <xref:System.Security.Cryptography.PasswordDeriveBytes> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -316,7 +316,7 @@
  The following code example creates a key from a password using the <xref:System.Security.Cryptography.PasswordDeriveBytes> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -825,7 +825,7 @@
  This code example is part of a larger example provided for the <xref:System.Security.Cryptography.PasswordDeriveBytes> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/VB/sample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/PasswordDeriveBytes/Overview/sample.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/ProtectedData.xml b/xml/System.Security.Cryptography/ProtectedData.xml
index 474a9f8b576..501f9e65a16 100644
--- a/xml/System.Security.Cryptography/ProtectedData.xml
+++ b/xml/System.Security.Cryptography/ProtectedData.xml
@@ -61,7 +61,7 @@ If you use these methods during impersonation, you may receive the following err
  The following example shows how to use data protection.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DataProtectionSample/vb/dataprotectionsample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@ If you use these methods during impersonation, you may receive the following err
  The following example shows how to use data protection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DataProtectionSample/vb/dataprotectionsample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -356,7 +356,7 @@ If you use these methods during impersonation, you may receive the following err
  The following code example shows how to use data protection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.DataProtectionSample/vb/dataprotectionsample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DataProtectionScope/Overview/dataprotectionsample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/ProtectedMemory.xml b/xml/System.Security.Cryptography/ProtectedMemory.xml
index f1ec670c83b..54604ec9b23 100644
--- a/xml/System.Security.Cryptography/ProtectedMemory.xml
+++ b/xml/System.Security.Cryptography/ProtectedMemory.xml
@@ -35,7 +35,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/CPP/memoryprotectionsample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/vb/memoryprotectionsample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -86,7 +86,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/CPP/memoryprotectionsample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/vb/memoryprotectionsample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -142,7 +142,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/CPP/memoryprotectionsample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.MemoryProtectionSample/vb/memoryprotectionsample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/MemoryProtectionScope/Overview/memoryprotectionsample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RC2.xml b/xml/System.Security.Cryptography/RC2.xml
index 420e9442aa6..5411e75f11c 100644
--- a/xml/System.Security.Cryptography/RC2.xml
+++ b/xml/System.Security.Cryptography/RC2.xml
@@ -221,12 +221,12 @@
  The following example shows how to create and use an RC2 object to encrypt and decrypt data in a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RC2/Create/fileexample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2.Create.File/VB/fileexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RC2/Create/fileexample.vb" id="Snippet1":::
 
  The following example shows how to create and use an RC2 object to encrypt and decrypt data in memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RC2/Create/memoryexample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2.Create.Memory/VB/memoryexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RC2/Create/memoryexample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RC2CryptoServiceProvider.xml b/xml/System.Security.Cryptography/RC2CryptoServiceProvider.xml
index 4425846e58a..e5273440e15 100644
--- a/xml/System.Security.Cryptography/RC2CryptoServiceProvider.xml
+++ b/xml/System.Security.Cryptography/RC2CryptoServiceProvider.xml
@@ -599,7 +599,7 @@
  The following code example sets the <xref:System.Security.Cryptography.RC2CryptoServiceProvider.UseSalt%2A> property to `true`, and then encrypts and decrypts a value.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RC2CryptoServiceProvider/UseSalt/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RC2CryptoServiceProvider/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RC2CryptoServiceProvider/UseSalt/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RIPEMD160.xml b/xml/System.Security.Cryptography/RIPEMD160.xml
index 8a6ca9c6131..d29da5061c3 100644
--- a/xml/System.Security.Cryptography/RIPEMD160.xml
+++ b/xml/System.Security.Cryptography/RIPEMD160.xml
@@ -41,7 +41,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RIPEMD160/CPP/ripemd160.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RIPEMD160/vb/ripemd160.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -76,7 +76,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RIPEMD160/CPP/ripemd160.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RIPEMD160/vb/ripemd160.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -132,7 +132,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RIPEMD160/CPP/ripemd160.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RIPEMD160/vb/ripemd160.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RIPEMD160Managed.xml b/xml/System.Security.Cryptography/RIPEMD160Managed.xml
index da39e9b8b9d..d43284440dc 100644
--- a/xml/System.Security.Cryptography/RIPEMD160Managed.xml
+++ b/xml/System.Security.Cryptography/RIPEMD160Managed.xml
@@ -39,7 +39,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RIPEMD160/CPP/ripemd160.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RIPEMD160/vb/ripemd160.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -76,7 +76,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RIPEMD160/CPP/ripemd160.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RIPEMD160/vb/ripemd160.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RIPEMD160/Overview/ripemd160.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RNGCryptoServiceProvider.xml b/xml/System.Security.Cryptography/RNGCryptoServiceProvider.xml
index 9493543bead..a1ff5fe0b57 100644
--- a/xml/System.Security.Cryptography/RNGCryptoServiceProvider.xml
+++ b/xml/System.Security.Cryptography/RNGCryptoServiceProvider.xml
@@ -83,7 +83,7 @@
  The following code example shows how to create a random number with the <xref:System.Security.Cryptography.RNGCryptoServiceProvider> class.
  
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RNGCryptoServiceProvider/Overview/rngcsp.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RNGCSP/VB/rngcsp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RNGCryptoServiceProvider/Overview/rngcsp.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -151,7 +151,7 @@
  The following code example shows how to create a random number with the <xref:System.Security.Cryptography.RNGCryptoServiceProvider> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RNGCryptoServiceProvider/Overview/rngcsp.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RNGCSP/VB/rngcsp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RNGCryptoServiceProvider/Overview/rngcsp.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -472,7 +472,7 @@
  The following code example shows how to create a random number with the <xref:System.Security.Cryptography.RNGCryptoServiceProvider> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RNGCryptoServiceProvider/Overview/rngcsp.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RNGCSP/VB/rngcsp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RNGCryptoServiceProvider/Overview/rngcsp.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RSACryptoServiceProvider.xml b/xml/System.Security.Cryptography/RSACryptoServiceProvider.xml
index bed7b7993a9..0458ce05381 100644
--- a/xml/System.Security.Cryptography/RSACryptoServiceProvider.xml
+++ b/xml/System.Security.Cryptography/RSACryptoServiceProvider.xml
@@ -236,7 +236,7 @@ If no key is loaded via the <xref:System.Security.Cryptography.RSACryptoServiceP
  The following code example creates a <xref:System.Security.Cryptography.RSACryptoServiceProvider>, generates a new key, and stores it in a key container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-int32-2/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -317,7 +317,7 @@ If no key is loaded via the <xref:System.Security.Cryptography.RSACryptoServiceP
  The following code example creates an <xref:System.Security.Cryptography.RSACryptoServiceProvider> object, generates a new key, and stores it in a key container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-csp/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -400,7 +400,7 @@ If no key is loaded via the <xref:System.Security.Cryptography.RSACryptoServiceP
  The following code example creates a <xref:System.Security.Cryptography.RSACryptoServiceProvider>, generates a new key, and stores it in a key container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.ctor-int32-csp/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/.ctor/example2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -484,7 +484,7 @@ If no key is loaded via the <xref:System.Security.Cryptography.RSACryptoServiceP
  The following code example demonstrates how to call the <xref:System.Security.Cryptography.CspKeyContainerInfo> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RsaCryptoServiceProvider.CspKeyContainerInfo/VB/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/CspKeyContainerInfo/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -571,7 +571,7 @@ If no key is loaded via the <xref:System.Security.Cryptography.RSACryptoServiceP
  This example uses the <xref:System.Text.ASCIIEncoding> class; however, the <xref:System.Text.UnicodeEncoding> class may be preferable in large data operations. The encrypted value can be saved as an `nvarchar` data type in Microsoft SQL Server.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/Decrypt/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.Decrypt/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/Decrypt/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1717,7 +1717,7 @@ The supported RSA key sizes depend on the available cryptographic service provid
  The following code example creates an <xref:System.Security.Cryptography.RSACryptoServiceProvider> object and persists the key to a key container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/PersistKeyInCsp/example.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.PersistKey/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/PersistKeyInCsp/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1918,7 +1918,7 @@ The supported RSA key sizes depend on the available cryptographic service provid
  The following code example signs and verifies data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData2/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1995,7 +1995,7 @@ The supported RSA key sizes depend on the available cryptographic service provid
  The following code example signs and verifies data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData3/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2084,7 +2084,7 @@ The supported RSA key sizes depend on the available cryptographic service provid
  The following code example signs and verifies data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.SignData1/VB/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/SignData/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2311,7 +2311,7 @@ The supported RSA key sizes depend on the available cryptographic service provid
  The following code example creates an <xref:System.Security.Cryptography.RSACryptoServiceProvider> object and sets the static <xref:System.Security.Cryptography.RSACryptoServiceProvider.UseMachineKeyStore%2A> property to use the machine key store instead of the user profile key store.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RSACryptoServiceProvider/UseMachineKeyStore/example2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.RSACSP.UseMachineKey/VB/example2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RSACryptoServiceProvider/UseMachineKeyStore/example2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/Rfc2898DeriveBytes.xml b/xml/System.Security.Cryptography/Rfc2898DeriveBytes.xml
index 4b4c7fe5db2..1ad0564118e 100644
--- a/xml/System.Security.Cryptography/Rfc2898DeriveBytes.xml
+++ b/xml/System.Security.Cryptography/Rfc2898DeriveBytes.xml
@@ -83,7 +83,7 @@
  The following code example uses the <xref:System.Security.Cryptography.Rfc2898DeriveBytes> class to create two identical keys for the <xref:System.Security.Cryptography.Aes> class.  It then encrypts and decrypts some data using the keys.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -174,7 +174,7 @@
  The following code example uses the <xref:System.Security.Cryptography.Rfc2898DeriveBytes> class to create two identical keys for the <xref:System.Security.Cryptography.Aes> class.  It then encrypts and decrypts some data using the keys.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -412,7 +412,7 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
  The following code example uses the <xref:System.Security.Cryptography.Rfc2898DeriveBytes> class to create two identical keys for the <xref:System.Security.Cryptography.Aes> class.  It then encrypts and decrypts some data using the keys.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -889,7 +889,7 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
  The following example shows how to use the <xref:System.Security.Cryptography.Rfc2898DeriveBytes.GetBytes%2A> method to get the key for an instance of <xref:System.Security.Cryptography.Rfc2898DeriveBytes>. This code example is part of a larger example provided for the <xref:System.Security.Cryptography.Rfc2898DeriveBytes> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -989,7 +989,7 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
  The following example shows how to use the <xref:System.Security.Cryptography.Rfc2898DeriveBytes.IterationCount%2A> property to display the number of iterations used in the generation of the key. This code example is part of a larger example provided for the <xref:System.Security.Cryptography.Rfc2898DeriveBytes> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1408,7 +1408,7 @@ The `password` is converted to bytes using the UTF8 encoding. For other encoding
  The following example shows how to use the <xref:System.Security.Cryptography.Rfc2898DeriveBytes.Reset%2A> method. This code example is part of a larger example provided for the <xref:System.Security.Cryptography.Rfc2898DeriveBytes> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/rfc28981/vb/rfc28981.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/Rfc2898DeriveBytes/Overview/rfc28981.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RijndaelManaged.xml b/xml/System.Security.Cryptography/RijndaelManaged.xml
index e80da098c55..a2824c22c7c 100644
--- a/xml/System.Security.Cryptography/RijndaelManaged.xml
+++ b/xml/System.Security.Cryptography/RijndaelManaged.xml
@@ -85,7 +85,7 @@
  The following example demonstrates how to encrypt and decrypt sample data using the `RijndaelManaged` class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RijndaelManaged/Overview/class1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RijndaelManaged Example/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RijndaelManaged/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@
  The following example creates a new instance of the `RijndaelManaged` class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RijndaelManaged/Overview/class1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RijndaelManaged Example/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RijndaelManaged/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -309,7 +309,7 @@
  The following code example demonstrates how to use the <xref:System.Security.Cryptography.RijndaelManaged.CreateDecryptor%2A> method to decrypt messages encoded with the same signature parameter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RijndaelManaged/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RijndaelManaged Example/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RijndaelManaged/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -436,7 +436,7 @@
  The following code examples demonstrates how to encrypt a message using the `CreateEncryptor` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RijndaelManaged/Overview/class1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RijndaelManaged Example/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RijndaelManaged/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -579,7 +579,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RijndaelManaged/Overview/class1.cs"  interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RijndaelManaged Example/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RijndaelManaged/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -637,7 +637,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RijndaelManaged/Overview/class1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RijndaelManaged Example/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RijndaelManaged/Overview/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/TripleDES.xml b/xml/System.Security.Cryptography/TripleDES.xml
index 6bc20e33421..8516220b143 100644
--- a/xml/System.Security.Cryptography/TripleDES.xml
+++ b/xml/System.Security.Cryptography/TripleDES.xml
@@ -84,12 +84,12 @@
  The following code example shows how to create and use a <xref:System.Security.Cryptography.TripleDES> object to encrypt and decrypt data in a file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/TripleDES/Create/fileexample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.File/VB/fileexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/fileexample.vb" id="Snippet1":::
 
  The following code example shows how to create and use a <xref:System.Security.Cryptography.TripleDES> object to encrypt and decrypt data in memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/TripleDES/Create/memoryexample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.Memory/VB/memoryexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/memoryexample.vb" id="Snippet1":::
 
 
  ]]></format>
@@ -240,12 +240,12 @@
  The following code example shows how to create and use a <xref:System.Security.Cryptography.TripleDES> object to encrypt and decrypt data in a file.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/TripleDES/Create/fileexample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.File/VB/fileexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/fileexample.vb" id="Snippet1":::
 
  The following code example shows how to create and use a <xref:System.Security.Cryptography.TripleDES> object to encrypt and decrypt data in memory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/TripleDES/Create/memoryexample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Cryptography.3DES.Create.Memory/VB/memoryexample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/TripleDES/Overview/memoryexample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Principal/WindowsIdentity.xml b/xml/System.Security.Principal/WindowsIdentity.xml
index a9dd49ec001..2b5e4e7be5e 100644
--- a/xml/System.Security.Principal/WindowsIdentity.xml
+++ b/xml/System.Security.Principal/WindowsIdentity.xml
@@ -1394,7 +1394,7 @@ Application code does not call this method; it is automatically invoked during g
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/WindowsIdentity Impersonation/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Principal/WindowsIdentity/Impersonate/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WindowsIdentity Impersonation/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Principal/WindowsIdentity/Impersonate/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1458,7 +1458,7 @@ Application code does not call this method; it is automatically invoked during g
  The following example demonstrates how to obtain a Windows account token by calling the unmanaged Win32 `LogonUser` function, and how to use that token to impersonate another user and then revert to the original identity.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Principal/WindowsIdentity/Impersonate/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/windowsidentity impersonation2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Principal/WindowsIdentity/Impersonate/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Principal/WindowsImpersonationContext.xml b/xml/System.Security.Principal/WindowsImpersonationContext.xml
index 9b2d91f225b..c6dc21631fa 100644
--- a/xml/System.Security.Principal/WindowsImpersonationContext.xml
+++ b/xml/System.Security.Principal/WindowsImpersonationContext.xml
@@ -49,7 +49,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/WindowsIdentity Impersonation/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Principal/WindowsIdentity/Impersonate/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WindowsIdentity Impersonation/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Principal/WindowsIdentity/Impersonate/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security/ISecurityEncodable.xml b/xml/System.Security/ISecurityEncodable.xml
index 9b036063f58..628fbe57fee 100644
--- a/xml/System.Security/ISecurityEncodable.xml
+++ b/xml/System.Security/ISecurityEncodable.xml
@@ -90,7 +90,7 @@
  This example shows how to define a permission class for use with code access security. All of the necessary permission interfaces are implemented.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security/IPermission/Overview/Permission.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Permission/vb/permission.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/ISecurityEncodable/Overview/permission.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -159,7 +159,7 @@
  The following code example demonstrates implementing the <xref:System.Security.ISecurityEncodable.FromXml%2A> method. This code example is part of a larger example provided for the <xref:System.Security.ISecurityEncodable> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/IPermission/Overview/Permission.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Permission/vb/permission.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/ISecurityEncodable/Overview/permission.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -227,7 +227,7 @@
  The following code example demonstrates implementing the <xref:System.Security.ISecurityEncodable.FromXml%2A> method. This code example is part of a larger example provided for the <xref:System.Security.ISecurityEncodable> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/IPermission/Overview/Permission.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Permission/vb/permission.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/ISecurityEncodable/Overview/permission.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security/SecureString.xml b/xml/System.Security/SecureString.xml
index 863bda55620..a37b45c66d5 100644
--- a/xml/System.Security/SecureString.xml
+++ b/xml/System.Security/SecureString.xml
@@ -292,12 +292,12 @@ The following example demonstrates how to use a <xref:System.Security.SecureStri
  The following example demonstrates how the <xref:System.Security.SecureString.AppendChar%2A>, <xref:System.Security.SecureString.InsertAt%2A>, <xref:System.Security.SecureString.RemoveAt%2A>, <xref:System.Security.SecureString.SetAt%2A>, and <xref:System.Security.SecureString.Clear%2A> methods affect the value of a <xref:System.Security.SecureString> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecureString/AppendChar/xat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/xat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecureString/AppendChar/xat.vb" id="Snippet1":::
 
  The following example demonstrates how the <xref:System.Security.SecureString.AppendChar%2A> and <xref:System.Security.SecureString.RemoveAt%2A> methods can be used to collect the characters in a password.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecureString/AppendChar/xchar.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecureString.xChar/VB/xchar.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecureString/AppendChar/xchar.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -366,7 +366,7 @@ The following example demonstrates how to use a <xref:System.Security.SecureStri
  The following example demonstrates how the <xref:System.Security.SecureString.AppendChar%2A>, <xref:System.Security.SecureString.InsertAt%2A>, <xref:System.Security.SecureString.RemoveAt%2A>, <xref:System.Security.SecureString.SetAt%2A>, and <xref:System.Security.SecureString.Clear%2A> methods affect the value of a <xref:System.Security.SecureString> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecureString/AppendChar/xat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/xat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecureString/AppendChar/xat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -569,7 +569,7 @@ The following example demonstrates how to use a <xref:System.Security.SecureStri
  The following example demonstrates how the <xref:System.Security.SecureString.AppendChar%2A>, <xref:System.Security.SecureString.InsertAt%2A>, <xref:System.Security.SecureString.RemoveAt%2A>, <xref:System.Security.SecureString.SetAt%2A>, and <xref:System.Security.SecureString.Clear%2A> methods affect the value of a <xref:System.Security.SecureString> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecureString/AppendChar/xat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/xat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecureString/AppendChar/xat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -768,7 +768,7 @@ The following example demonstrates how to use a <xref:System.Security.SecureStri
  The following example demonstrates how the <xref:System.Security.SecureString.AppendChar%2A> and <xref:System.Security.SecureString.RemoveAt%2A> methods can be used to collect the characters in a password. After the password is collected, it is made read-only.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecureString/AppendChar/xchar.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecureString.xChar/VB/xchar.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecureString/AppendChar/xchar.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -844,12 +844,12 @@ The following example demonstrates how to use a <xref:System.Security.SecureStri
  The following example demonstrates how the <xref:System.Security.SecureString.AppendChar%2A>, <xref:System.Security.SecureString.InsertAt%2A>, <xref:System.Security.SecureString.RemoveAt%2A>, <xref:System.Security.SecureString.SetAt%2A>, and <xref:System.Security.SecureString.Clear%2A> methods affect the value of a <xref:System.Security.SecureString> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecureString/AppendChar/xat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/xat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecureString/AppendChar/xat.vb" id="Snippet1":::
 
  The following example demonstrates how the <xref:System.Security.SecureString.AppendChar%2A> and <xref:System.Security.SecureString.RemoveAt%2A> methods can be used to collect the characters in a password.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecureString/AppendChar/xchar.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecureString.xChar/VB/xchar.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecureString/AppendChar/xchar.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -930,7 +930,7 @@ The following example demonstrates how to use a <xref:System.Security.SecureStri
  The following example demonstrates how the <xref:System.Security.SecureString.AppendChar%2A>, <xref:System.Security.SecureString.InsertAt%2A>, <xref:System.Security.SecureString.RemoveAt%2A>, <xref:System.Security.SecureString.SetAt%2A>, and <xref:System.Security.SecureString.Clear%2A> methods affect the value of a <xref:System.Security.SecureString> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecureString/AppendChar/xat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecureString.xAt/VB/xat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecureString/AppendChar/xat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security/SecurityElement.xml b/xml/System.Security/SecurityElement.xml
index d4b6ae814c5..3bfedf3ea89 100644
--- a/xml/System.Security/SecurityElement.xml
+++ b/xml/System.Security/SecurityElement.xml
@@ -115,7 +115,7 @@
  The following example shows the use of members of the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -191,7 +191,7 @@
  The following code shows the use of  the <xref:System.Security.SecurityElement.%23ctor%2A> constructor to create a new <xref:System.Security.SecurityElement> object.  This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -336,7 +336,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.AddAttribute%2A> method to add a name/value attribute to an XML element. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -411,7 +411,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.AddChild%2A> method to add a child element to the XML element.  This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -493,7 +493,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.Attribute%2A> method to find an attribute by name. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -565,7 +565,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.Attributes%2A> property to get an attribute of an XML element. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -634,7 +634,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.Children%2A> property to get the array of child elements of the XML element. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -780,7 +780,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.Equal%2A> method to compare two XML elements. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
@@ -865,7 +865,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.Escape%2A> method to replace invalid XML characters in a string with their valid XML equivalent. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet19":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet19":::
 
  ]]></format>
         </remarks>
@@ -1019,7 +1019,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.IsValidAttributeName%2A> method to determine whether a string is a valid attribute name. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1098,7 +1098,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.IsValidAttributeValue%2A> method to determine whether a string is a valid attribute value. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1177,7 +1177,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.IsValidTag%2A> method to determine whether a string is a valid attribute tag. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1256,7 +1256,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.IsValidText%2A> method to determine whether a string is valid as XML element text. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -1338,7 +1338,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.SearchForChildByTag%2A> method to find a child by its tag name. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -1426,7 +1426,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.SearchForTextOfTag%2A> method to find a child by its tag name and return the contained text. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -1508,7 +1508,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.Tag%2A> property to get the tag name of an XML element. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -1579,7 +1579,7 @@
  The following code shows the use of the <xref:System.Security.SecurityElement.Text%2A> property to get the text of an XML element. This code example is part of a larger example provided for the <xref:System.Security.SecurityElement> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security/SecurityElement/Overview/securityelementmembers.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/SecurityElementMembers/VB/Form1.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security/SecurityElement/Overview/Form1.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceProcess/ServiceController.xml b/xml/System.ServiceProcess/ServiceController.xml
index 015a2b8cd47..dd16bddd210 100644
--- a/xml/System.ServiceProcess/ServiceController.xml
+++ b/xml/System.ServiceProcess/ServiceController.xml
@@ -92,7 +92,7 @@
  The following example demonstrates the use of the <xref:System.ServiceProcess.ServiceController> class to control the `SimpleService` service example.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/Overview/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -167,7 +167,7 @@
  The following example demonstrates the use of the <xref:System.ServiceProcess.ServiceController.%23ctor%28System.String%29?displayProperty=nameWithType> constructor to create a <xref:System.ServiceProcess.ServiceController> object that is used to control a sample service. This example is part of a larger example that is provided for the <xref:System.ServiceProcess.ServiceController> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -263,7 +263,7 @@
  The following example demonstrates the use of the <xref:System.ServiceProcess.ServiceController.CanPauseAndContinue%2A> property to determine whether a service can pause and continue. This example is part of a larger example that is provided for the <xref:System.ServiceProcess.ServiceController> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -315,7 +315,7 @@
  The following example demonstrates the use of the <xref:System.ServiceProcess.ServiceController.CanShutdown%2A> property to determine whether a service provides a handler for a shutdown event. This example is part of a larger example that is provided for the <xref:System.ServiceProcess.ServiceController> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -367,7 +367,7 @@
  The following example demonstrates the use of the <xref:System.ServiceProcess.ServiceController.CanStop%2A> property to determine whether a service provides a handler for a stop event. This example is part of a larger example that is provided for the <xref:System.ServiceProcess.ServiceController> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/Overview/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -450,7 +450,7 @@
  The following example demonstrates the use of the <xref:System.ServiceProcess.ServiceController.Continue%2A> method to continue a paused service. This example is part of a larger example that is provided for the <xref:System.ServiceProcess.ServiceController> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/Overview/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -510,7 +510,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -575,7 +575,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -704,7 +704,7 @@
  The following code example shows the use of the <xref:System.ServiceProcess.ServiceController.ExecuteCommand%28System.Int32%29?displayProperty=nameWithType> method to execute custom commands in the `SimpleService` service example.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/ExecuteCommand/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceContoller_ExecuteCommand/VB/module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/ExecuteCommand/module1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -762,7 +762,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -862,7 +862,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1014,7 +1014,7 @@
  The following example demonstrates the use of the <xref:System.ServiceProcess.ServiceController.Pause%2A> method to pause a service. This example is part of a larger example that is provided for the <xref:System.ServiceProcess.ServiceController> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/Overview/program.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1063,7 +1063,7 @@
  The following example demonstrates the use of the <xref:System.ServiceProcess.ServiceController.Refresh%2A> method to obtain the status of a service. The code instructs a service to pause, and then waits for the status to reflect the change. This example is part of a larger example that is provided for the <xref:System.ServiceProcess.ServiceController> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/Overview/program.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceControllerClass/VB/program.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/Overview/program.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1230,7 +1230,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1287,7 +1287,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1344,7 +1344,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1491,7 +1491,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1540,7 +1540,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1643,7 +1643,7 @@ If any other services depend on this one, you need to either pass `true` for
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceProcess/ServiceControllerStatus.xml b/xml/System.ServiceProcess/ServiceControllerStatus.xml
index 37276ec17ce..863b0fd48a0 100644
--- a/xml/System.ServiceProcess/ServiceControllerStatus.xml
+++ b/xml/System.ServiceProcess/ServiceControllerStatus.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceProcess/ServiceInstaller.xml b/xml/System.ServiceProcess/ServiceInstaller.xml
index 77530c3397b..77e2ba08720 100644
--- a/xml/System.ServiceProcess/ServiceInstaller.xml
+++ b/xml/System.ServiceProcess/ServiceInstaller.xml
@@ -230,7 +230,7 @@
  The following code example sets the installation properties for a new Windows service application. The example sets the service name, along with the display name and description. After assigning the installation properties for the service, the example adds the <xref:System.ServiceProcess.ServiceInstaller> object to the <xref:System.Configuration.Install.Installer.Installers%2A> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceInstaller/Description/simpleserviceinstaller.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceProcess_serviceinstaller/VB/service1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceInstaller/Description/service1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceProcess/ServiceType.xml b/xml/System.ServiceProcess/ServiceType.xml
index 49ab9d66ddc..b8e9e50a203 100644
--- a/xml/System.ServiceProcess/ServiceType.xml
+++ b/xml/System.ServiceProcess/ServiceType.xml
@@ -59,7 +59,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ServiceController/CPP/servicecontroller.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceController/VB/servicecontroller.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceController/DependentServices/servicecontroller.vb" id="Snippet5":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceProcess/SessionChangeDescription.xml b/xml/System.ServiceProcess/SessionChangeDescription.xml
index 88fde17c6a7..8f6bc1e690b 100644
--- a/xml/System.ServiceProcess/SessionChangeDescription.xml
+++ b/xml/System.ServiceProcess/SessionChangeDescription.xml
@@ -57,7 +57,7 @@
  The following code example shows the use of the <xref:System.ServiceProcess.SessionChangeDescription> class in an implementation of the <xref:System.ServiceProcess.ServiceBase.OnSessionChange%2A> method in a class derived from <xref:System.ServiceProcess.ServiceBase>.  This code example is part of a larger example provided for the <xref:System.ServiceProcess.ServiceBase> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceBase_Commands/VB/simpleservice.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.vb" id="Snippet9":::  
   
  ]]></format>
     </remarks>
@@ -311,7 +311,7 @@
  The following code example shows the use of the <xref:System.ServiceProcess.SessionChangeDescription.Reason%2A> property in an implementation of the <xref:System.ServiceProcess.ServiceBase.OnSessionChange%2A> method in a class derived from <xref:System.ServiceProcess.ServiceBase>.  This code example is part of a larger example provided for the <xref:System.ServiceProcess.ServiceBase> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceBase_Commands/VB/simpleservice.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -348,7 +348,7 @@
  The following code example shows the use of the <xref:System.ServiceProcess.SessionChangeDescription.SessionId%2A> property in an implementation of the <xref:System.ServiceProcess.ServiceBase.OnSessionChange%2A> method in a class derived from <xref:System.ServiceProcess.ServiceBase>.  This code example is part of a larger example provided for the <xref:System.ServiceProcess.ServiceBase> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceBase_Commands/VB/simpleservice.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceProcess/SessionChangeReason.xml b/xml/System.ServiceProcess/SessionChangeReason.xml
index 0633691341f..2a9191e57ae 100644
--- a/xml/System.ServiceProcess/SessionChangeReason.xml
+++ b/xml/System.ServiceProcess/SessionChangeReason.xml
@@ -41,7 +41,7 @@
  The following code example shows the use of the <xref:System.ServiceProcess.SessionChangeReason> enumeration in an implementation of the <xref:System.ServiceProcess.ServiceBase.OnSessionChange%2A> method in a class derived from <xref:System.ServiceProcess.ServiceBase>.  This code example is part of a larger example provided for the <xref:System.ServiceProcess.ServiceBase> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ServiceBase_Commands/VB/simpleservice.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/SessionChangeDescription/Overview/simpleservice.vb" id="Snippet9":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Text.RegularExpressions/Match.xml b/xml/System.Text.RegularExpressions/Match.xml
index 5b96a920302..bc1c6047383 100644
--- a/xml/System.Text.RegularExpressions/Match.xml
+++ b/xml/System.Text.RegularExpressions/Match.xml
@@ -228,7 +228,7 @@ The following examples use the regular expression `Console\.Write(Line)?`. The r
  The following example attempts to match a regular expression pattern against a sample string. The example uses the <xref:System.Text.RegularExpressions.Match.Groups%2A> property to store information that is retrieved by the match for display to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Match/Groups/snippet8.cs" interactive="try-dotnet" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/regex match, nextmatch, groups, captures/vb/snippet8.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text.RegularExpressions/Match/Groups/snippet8.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -294,7 +294,7 @@ The following examples use the regular expression `Console\.Write(Line)?`. The r
  The following example uses the <xref:System.Text.RegularExpressions.Match.NextMatch%2A> method to capture regular expression matches beyond the first match.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Match/Groups/snippet8.cs" interactive="try-dotnet" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/regex match, nextmatch, groups, captures/vb/snippet8.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text.RegularExpressions/Match/Groups/snippet8.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Text.RegularExpressions/MatchCollection.xml b/xml/System.Text.RegularExpressions/MatchCollection.xml
index c35d6095551..f94f3331e7c 100644
--- a/xml/System.Text.RegularExpressions/MatchCollection.xml
+++ b/xml/System.Text.RegularExpressions/MatchCollection.xml
@@ -125,7 +125,7 @@
  The following example illustrates the use of the <xref:System.Text.RegularExpressions.MatchCollection> class to interrogate a set of <xref:System.Text.RegularExpressions.Match> instances.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/MatchCollection/Overview/words.cs" interactive="try-dotnet" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Regex_Words/VB/words.vb" id="Snippet0":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text.RegularExpressions/MatchCollection/Overview/words.vb" id="Snippet0":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Text.RegularExpressions/Regex.xml b/xml/System.Text.RegularExpressions/Regex.xml
index 5d4b22dddc0..99353865571 100644
--- a/xml/System.Text.RegularExpressions/Regex.xml
+++ b/xml/System.Text.RegularExpressions/Regex.xml
@@ -3747,7 +3747,7 @@ For more details about `startat`, see the Remarks section of <xref:System.Text.R
  The following example finds regular expression pattern matches in a string, then lists the matched groups, captures, and capture positions.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Match/Groups/snippet8.cs" interactive="try-dotnet" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/regex match, nextmatch, groups, captures/vb/snippet8.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text.RegularExpressions/Match/Groups/snippet8.vb" id="Snippet8":::
 
  The regular expression pattern `(\w+)\s+(car)` matches occurrences of the word "car" along with the word that precedes it. It is interpreted as shown in the following table.
 
@@ -5101,7 +5101,7 @@ For more details about `startat`, see the Remarks section of <xref:System.Text.R
  The following code example displays an original string, matches each word in the original string, converts the first character of each match to uppercase, then displays the converted string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Replace/sample.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Regex.Replace-Instance/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text.RegularExpressions/Regex/Replace/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Text.RegularExpressions/RegexCompilationInfo.xml b/xml/System.Text.RegularExpressions/RegexCompilationInfo.xml
index 2d3a3a3c1f9..6ee7e4caeb5 100644
--- a/xml/System.Text.RegularExpressions/RegexCompilationInfo.xml
+++ b/xml/System.Text.RegularExpressions/RegexCompilationInfo.xml
@@ -128,12 +128,12 @@
  In the first step, compile and execute the following code example. The <xref:System.Text.RegularExpressions.RegexCompilationInfo.%23ctor%2A> constructor in the code example defines a compiled regular expression. The result of executing the code is an assembly named FishRegex.dll that contains a compiled regular expression type named `FishRegex`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/genFishRegex.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.rgxCompInfo/vb/genFishRegex.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/genFishRegex.vb" id="Snippet1":::
 
  In the second step, compile the following code example using a reference to FishRegex.dll, and then run the resulting executable file. The executable file matches a target string by using the `FishRegex` type, and displays the match, group, capture group, and index position of the matches in the target string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/useFishRegex.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.rgxCompInfo/vb/useFishRegex.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/useFishRegex.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Text/Decoder.xml b/xml/System.Text/Decoder.xml
index 720bd3c84ca..6a069af29e6 100644
--- a/xml/System.Text/Decoder.xml
+++ b/xml/System.Text/Decoder.xml
@@ -435,7 +435,7 @@ The `completed` parameter can also be set to `false`, even though the `bytesUsed
 The following example uses the <xref:System.Text.Encoder.Convert%2A> method to convert a file of UTF-16 characters to UTF-8. It then uses the <xref:System.Text.Decoder.Convert%2A> method to convert the UTF-8 characters back to UTF-16 characters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/Decoder/Convert/edCvt.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.EncoderDecoder.convert/vb/edCvt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/Decoder/Convert/edCvt.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Text/DecoderExceptionFallback.xml b/xml/System.Text/DecoderExceptionFallback.xml
index e097ca870a0..baac2ad8bfd 100644
--- a/xml/System.Text/DecoderExceptionFallback.xml
+++ b/xml/System.Text/DecoderExceptionFallback.xml
@@ -80,7 +80,7 @@
  The following code example demonstrates the <xref:System.Text.DecoderExceptionFallback> and <xref:System.Text.DecoderFallbackException> classes.
   
  :::code language="csharp" source="~/snippets/csharp/System.Text/DecoderExceptionFallback/Overview/fallDecExc.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackDecExc/vb/fallDecExc.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/DecoderExceptionFallback/Overview/fallDecExc.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Text/DecoderFallbackException.xml b/xml/System.Text/DecoderFallbackException.xml
index 5803a895783..3323f30d14c 100644
--- a/xml/System.Text/DecoderFallbackException.xml
+++ b/xml/System.Text/DecoderFallbackException.xml
@@ -75,7 +75,7 @@
  The following code example demonstrates the <xref:System.Text.DecoderExceptionFallback> and <xref:System.Text.DecoderFallbackException> classes.
   
  :::code language="csharp" source="~/snippets/csharp/System.Text/DecoderExceptionFallback/Overview/fallDecExc.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackDecExc/vb/fallDecExc.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/DecoderExceptionFallback/Overview/fallDecExc.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Text/DecoderReplacementFallback.xml b/xml/System.Text/DecoderReplacementFallback.xml
index 15b72b4ef1d..89e7f3e3904 100644
--- a/xml/System.Text/DecoderReplacementFallback.xml
+++ b/xml/System.Text/DecoderReplacementFallback.xml
@@ -86,7 +86,7 @@
  The following code example demonstrates the <xref:System.Text.DecoderReplacementFallback> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/DecoderReplacementFallback/Overview/fallDecRpl.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackDecRpl/vb/fallDecRpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/DecoderReplacementFallback/Overview/fallDecRpl.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Text/Encoder.xml b/xml/System.Text/Encoder.xml
index 3b1b3d9c2e4..f98011ac76f 100644
--- a/xml/System.Text/Encoder.xml
+++ b/xml/System.Text/Encoder.xml
@@ -415,7 +415,7 @@ The following example demonstrates how to convert an array of Unicode characters
  The following example uses the <xref:System.Text.Encoder.Convert%2A> method to convert a file of UTF-16 characters to UTF-8, then uses the <xref:System.Text.Decoder.Convert%2A> method to convert the UTF-8 characters back to UTF-16 characters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/Decoder/Convert/edCvt.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.EncoderDecoder.convert/vb/edCvt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/Decoder/Convert/edCvt.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Text/EncoderExceptionFallback.xml b/xml/System.Text/EncoderExceptionFallback.xml
index cdb0158d924..f03c84a8a67 100644
--- a/xml/System.Text/EncoderExceptionFallback.xml
+++ b/xml/System.Text/EncoderExceptionFallback.xml
@@ -80,7 +80,7 @@
  The following code example demonstrates the <xref:System.Text.EncoderExceptionFallback> and <xref:System.Text.EncoderFallbackException> classes.
   
  :::code language="csharp" source="~/snippets/csharp/System.Text/EncoderExceptionFallback/Overview/fallEncExc.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncExc/vb/fallEncExc.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/EncoderExceptionFallback/Overview/fallEncExc.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Text/EncoderFallbackException.xml b/xml/System.Text/EncoderFallbackException.xml
index 93dd2de32ee..c2c1441bfba 100644
--- a/xml/System.Text/EncoderFallbackException.xml
+++ b/xml/System.Text/EncoderFallbackException.xml
@@ -75,7 +75,7 @@
  The following code example demonstrates the <xref:System.Text.EncoderExceptionFallback> and <xref:System.Text.EncoderFallbackException> classes.
   
  :::code language="csharp" source="~/snippets/csharp/System.Text/EncoderExceptionFallback/Overview/fallEncExc.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncExc/vb/fallEncExc.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/EncoderExceptionFallback/Overview/fallEncExc.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Text/EncoderReplacementFallback.xml b/xml/System.Text/EncoderReplacementFallback.xml
index faa3caf6761..254ca59855d 100644
--- a/xml/System.Text/EncoderReplacementFallback.xml
+++ b/xml/System.Text/EncoderReplacementFallback.xml
@@ -88,7 +88,7 @@
  The following example demonstrates the <xref:System.Text.EncoderReplacementFallback> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/EncoderReplacementFallback/Overview/fallEncRpl.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncRpl/vb/fallEncRpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/EncoderReplacementFallback/Overview/fallEncRpl.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Text/Encoding.xml b/xml/System.Text/Encoding.xml
index 9e36efb5add..10e42574873 100644
--- a/xml/System.Text/Encoding.xml
+++ b/xml/System.Text/Encoding.xml
@@ -3750,7 +3750,7 @@ You can also supply a value of 0 for the `codepage` argument. Its precise behavi
  The following example demonstrates the <xref:System.Text.Encoding.GetEncoding%28System.String%2CSystem.Text.EncoderFallback%2CSystem.Text.DecoderFallback%29?displayProperty=nameWithType> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/EncoderReplacementFallback/Overview/fallEncRpl.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncRpl/vb/fallEncRpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/EncoderReplacementFallback/Overview/fallEncRpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3842,7 +3842,7 @@ In .NET 5 and later versions, the code page name `utf-7` is not supported.
  The following example demonstrates the <xref:System.Text.Encoding.GetEncoding%28System.String%2CSystem.Text.EncoderFallback%2CSystem.Text.DecoderFallback%29?displayProperty=nameWithType> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/EncoderReplacementFallback/Overview/fallEncRpl.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/sys.txt.fallbackEncRpl/vb/fallEncRpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/EncoderReplacementFallback/Overview/fallEncRpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Text/StringBuilder.xml b/xml/System.Text/StringBuilder.xml
index 84689eefd28..461fc4d6e09 100644
--- a/xml/System.Text/StringBuilder.xml
+++ b/xml/System.Text/StringBuilder.xml
@@ -81,7 +81,7 @@ The following example shows how to call many of the methods defined by the <xref
 
 :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Overview/StringBuilder.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Overview/StringBuilder.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StringBuilder/VB/StringBuilder.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Overview/StringBuilder.vb" id="Snippet1":::
       ]]></format>
     </example>
     <block subset="none" type="usage">
@@ -2492,7 +2492,7 @@ The following example shows how to call many of the methods defined by the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/AppendFormat/appfmt.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/AppendFormat/appfmt.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendformat/VB/appfmt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/AppendFormat/appfmt.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2620,7 +2620,7 @@ The following example shows how to call many of the methods defined by the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/AppendFormat/appfmt.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/AppendFormat/appfmt.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendformat/VB/appfmt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/AppendFormat/appfmt.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2977,7 +2977,7 @@ The index of a format item is less than 0 (zero), or greater than or equal to th
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/AppendFormat/appfmt.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/AppendFormat/appfmt.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendformat/VB/appfmt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/AppendFormat/appfmt.vb" id="Snippet1":::
 
  The following example defines a custom <xref:System.IFormatProvider> implementation named `CustomerFormatter` that formats a 10-digit customer number with hyphens after the fourth and seventh digits. It is passed to the <xref:System.Text.StringBuilder.AppendFormat%28System.IFormatProvider%2CSystem.String%2CSystem.Object%5B%5D%29?displayProperty=nameWithType> method to create a string that includes the formatted customer number and customer name.
 
@@ -3313,7 +3313,7 @@ The index of a format item is less than 0 (zero), or greater than or equal to th
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/AppendFormat/appfmt.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/AppendFormat/appfmt.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendformat/VB/appfmt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/AppendFormat/appfmt.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3568,7 +3568,7 @@ The index of a format item is less than 0 (zero), or greater than or equal to th
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/AppendFormat/appfmt.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/AppendFormat/appfmt.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendformat/VB/appfmt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/AppendFormat/appfmt.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4569,7 +4569,7 @@ The index of a format item is less than 0 (zero), or greater than or equal to th
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/AppendLine/al.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/AppendLine/al.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.appendline/VB/al.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/AppendLine/al.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4812,7 +4812,7 @@ The index of a format item is less than 0 (zero), or greater than or equal to th
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Capacity/cap.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Capacity/cap.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.ensurecapacity/VB/cap.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Capacity/cap.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5075,7 +5075,7 @@ The following example instantiates a <xref:System.Text.StringBuilder> object wit
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/CopyTo/ct2.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/CopyTo/ct2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.copyto2/VB/ct2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/CopyTo/ct2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5154,7 +5154,7 @@ The following example instantiates a <xref:System.Text.StringBuilder> object wit
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Capacity/cap.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Capacity/cap.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.ensurecapacity/VB/cap.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Capacity/cap.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5283,7 +5283,7 @@ The `Equals` method performs an ordinal comparison to determine whether the char
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Capacity/cap.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Capacity/cap.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.ensurecapacity/VB/cap.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Capacity/cap.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5374,7 +5374,7 @@ foreach (ReadOnlyMemory<char> chunk in sb.GetChunks())
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Insert/insert.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Insert/insert.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.insert/VB/insert.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Insert/insert.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6788,7 +6788,7 @@ The existing characters are shifted to make room for the character sequence in t
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Capacity/cap.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Capacity/cap.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.ensurecapacity/VB/cap.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Capacity/cap.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6919,7 +6919,7 @@ In .NET Core and in the .NET Framework 4.0 and later versions, when you instanti
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Remove/remove.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Remove/remove.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.remove/VB/remove.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Remove/remove.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6946,7 +6946,7 @@ In .NET Core and in the .NET Framework 4.0 and later versions, when you instanti
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Replace/replace.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Replace/replace.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringbuilder.replace/VB/replace.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Replace/replace.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7475,7 +7475,7 @@ In .NET Core and in the .NET Framework 4.0 and later versions, when you instanti
 
  :::code language="csharp" source="~/snippets/csharp/System.Text/StringBuilder/Overview/StringBuilder.cs" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Text/StringBuilder/Overview/StringBuilder.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StringBuilder/VB/StringBuilder.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Text/StringBuilder/Overview/StringBuilder.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Threading/Monitor.xml b/xml/System.Threading/Monitor.xml
index 2dcb4b80a36..1759512c28e 100644
--- a/xml/System.Threading/Monitor.xml
+++ b/xml/System.Threading/Monitor.xml
@@ -145,7 +145,7 @@
  The following example demonstrates how to use the `Enter` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Monitor/Enter/monitor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MonitorExmpl2/VB/monitor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Monitor/Enter/monitor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -303,7 +303,7 @@
  The following example demonstrates how to use the `Exit` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Monitor/Enter/monitor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MonitorExmpl2/VB/monitor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Monitor/Enter/monitor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -636,7 +636,7 @@
  The following code example demonstrates how to use the `TryEnter` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Monitor/Enter/monitor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MonitorExmpl2/VB/monitor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Monitor/Enter/monitor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Threading/Thread.xml b/xml/System.Threading/Thread.xml
index 53841a6e077..70fd09cfba3 100644
--- a/xml/System.Threading/Thread.xml
+++ b/xml/System.Threading/Thread.xml
@@ -1794,7 +1794,7 @@ You can specify the COM threading model for a C++ application using the [/CLRTHR
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Thread/GetApartmentState/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Threading/Thread/GetApartmentState/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Thread.GetSetTrySetApartmentState/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Thread/GetApartmentState/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3207,7 +3207,7 @@ The value is not guaranteed to be a zero-based processor number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Thread/GetApartmentState/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Threading/Thread/GetApartmentState/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Thread.GetSetTrySetApartmentState/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Thread/GetApartmentState/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3455,7 +3455,7 @@ The value is not guaranteed to be a zero-based processor number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Thread/Sleep/example.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Threading/Thread/Sleep/example.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/thread.sleep/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Thread/Sleep/example.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3524,7 +3524,7 @@ The value is not guaranteed to be a zero-based processor number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Thread/Sleep/example1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Threading/Thread/Sleep/example1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/thread.sleep_timespan/vb/example.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Thread/Sleep/example1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3674,7 +3674,7 @@ The value is not guaranteed to be a zero-based processor number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Thread/Start/threadstart.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Threading/Thread/Start/threadstart.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ThreadStart/VB/threadstart.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Thread/Start/threadstart.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4168,7 +4168,7 @@ When you call the `Suspend` method on a thread, the system notes that a thread s
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/Thread/GetApartmentState/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Threading/Thread/GetApartmentState/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Thread.GetSetTrySetApartmentState/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/Thread/GetApartmentState/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Threading/ThreadAbortException.xml b/xml/System.Threading/ThreadAbortException.xml
index 71e607515ff..e7a3a4196c3 100644
--- a/xml/System.Threading/ThreadAbortException.xml
+++ b/xml/System.Threading/ThreadAbortException.xml
@@ -79,7 +79,7 @@
  The following example demonstrates aborting a thread. The thread that receives the `ThreadAbortException` uses the <xref:System.Threading.Thread.ResetAbort%2A> method to cancel the abort request and continue executing.
   
  :::code language="csharp" source="~/snippets/csharp/System.Threading/ThreadAbortException/Overview/threadabex.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ThreadAbEx/VB/threadabex.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/ThreadAbortException/Overview/threadabex.vb" id="Snippet1":::
 
  This code produces the following output:
 
diff --git a/xml/System.Threading/ThreadStateException.xml b/xml/System.Threading/ThreadStateException.xml
index 84b795296c1..ec6e9347d04 100644
--- a/xml/System.Threading/ThreadStateException.xml
+++ b/xml/System.Threading/ThreadStateException.xml
@@ -81,7 +81,7 @@
  The following example demonstrates an error that causes the system to throw a `ThreadStateException`.
   
  :::code language="csharp" source="~/snippets/csharp/System.Threading/ThreadStateException/Overview/threadstex.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ThreadStEx/VB/threadstex.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/ThreadStateException/Overview/threadstex.vb" id="Snippet1":::
 
  This code produces the following output:
 
diff --git a/xml/System.Threading/WaitHandle.xml b/xml/System.Threading/WaitHandle.xml
index 1220f1d9825..7365060fe90 100644
--- a/xml/System.Threading/WaitHandle.xml
+++ b/xml/System.Threading/WaitHandle.xml
@@ -110,7 +110,7 @@
  The following code example shows how two threads can do background tasks while the Main thread waits for the tasks to complete using the static <xref:System.Threading.WaitHandle.WaitAny%2A> and <xref:System.Threading.WaitHandle.WaitAll%2A> methods of the <xref:System.Threading.WaitHandle> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/WaitHandle/Overview/WaitHandle.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WaitHandle/VB/WaitHandle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/WaitHandle/Overview/WaitHandle.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -1463,7 +1463,7 @@ The maximum value for `timeout` is <xref:System.Int32.MaxValue?displayProperty=n
  The following code example demonstrates calling the <xref:System.Threading.WaitHandle.WaitAny%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Threading/WaitHandle/Overview/WaitHandle.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WaitHandle/VB/WaitHandle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/WaitHandle/Overview/WaitHandle.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Timers/Timer.xml b/xml/System.Timers/Timer.xml
index 81af146fa48..7a6a1e2eb02 100644
--- a/xml/System.Timers/Timer.xml
+++ b/xml/System.Timers/Timer.xml
@@ -1039,7 +1039,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Timers/Timer/Stop/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Timers/Timer/Stop/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Timer.Stop/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Timers/Timer/Stop/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.UI/DataBindingCollection.xml b/xml/System.Web.UI/DataBindingCollection.xml
index a35ec51b0d1..30de6b9f23f 100644
--- a/xml/System.Web.UI/DataBindingCollection.xml
+++ b/xml/System.Web.UI/DataBindingCollection.xml
@@ -395,7 +395,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/DataBinding/CPP/webcustomcontrol1.cpp" id="Snippet18":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.UI/DataBindingCollection/Remove/webcustomcontrol1.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DataBinding/VB/webcustomcontrol1.vb" id="Snippet18":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.UI/DataBindingCollection/Remove/webcustomcontrol1.vb" id="Snippet18":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web/HttpParseException.xml b/xml/System.Web/HttpParseException.xml
index d87aad9da39..83562740654 100644
--- a/xml/System.Web/HttpParseException.xml
+++ b/xml/System.Web/HttpParseException.xml
@@ -34,10 +34,10 @@
  The following example demonstrates how to use the <xref:System.Web.HttpParseException> to customize errors generated during page parsing. In this example, a customized <xref:System.Web.UI.HtmlControls.HtmlSelect> control is defined. If child elements of the custom control are not of a specified type then an <xref:System.Web.HttpParseException> is thrown in the overridden <xref:System.Web.UI.HtmlControls.HtmlSelectBuilder.GetChildControlType%2A> method of a custom <xref:System.Web.UI.HtmlControls.HtmlSelectBuilder>. To generate a parse exception, change the child element literal `MyCustomOption` to any other string.  
   
  :::code language="aspx-csharp" source="~/snippets/csharp/System.Web/HttpParseException/Overview/source.aspx" id="Snippet1":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/source.aspx" id="Snippet1":::  
+ :::code language="aspx-vb" source="~/snippets/visualbasic/System.Web/HttpParseException/Overview/source.aspx" id="Snippet1":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Web/HttpParseException/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web/HttpParseException/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -111,7 +111,7 @@
  The following example demonstrates the use of the <xref:System.Web.HttpException.%23ctor%2A> constructor.  For a complete, working code example, see the <xref:System.Web.HttpParseException> overview topic.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Web/HttpParseException/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/HttpParseException/vb/source.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web/HttpParseException/Overview/source.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System/Activator.xml b/xml/System/Activator.xml
index 003463d1e27..a360345146e 100644
--- a/xml/System/Activator.xml
+++ b/xml/System/Activator.xml
@@ -101,7 +101,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Activator/Overview/ActivatorX.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ActivatorX/fs/ActivatorX.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ActivatorX/VB/ActivatorX.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Activator/Overview/ActivatorX.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -411,7 +411,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Activator/Overview/source2.cs" interactive="try-dotnet" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ActivatorX/fs/source2.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ActivatorX/VB/source2.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Activator/Overview/source2.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1998,7 +1998,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
 
  :::code language="csharp" source="~/snippets/csharp/System/Activator/Overview/ActivatorX.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ActivatorX/fs/ActivatorX.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ActivatorX/VB/ActivatorX.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Activator/Overview/ActivatorX.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/AppDomain.xml b/xml/System/AppDomain.xml
index 39e02ed2b50..17dc39bfb28 100644
--- a/xml/System/AppDomain.xml
+++ b/xml/System/AppDomain.xml
@@ -120,7 +120,7 @@ Application domains, which are represented by <xref:System.AppDomain> objects, h
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomainX/cpp/AppDomainX.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/Overview/AppDomainX.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/Overview/AppDomainX.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomainX/VB/AppDomainX.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/Overview/AppDomainX.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -463,7 +463,7 @@ Application domains, which are represented by <xref:System.AppDomain> objects, h
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_AssemblyLoad/CPP/assemblyload.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/AssemblyLoad/assemblyload.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/AssemblyLoad/assemblyload.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_AssemblyLoad/VB/assemblyload.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/AssemblyLoad/assemblyload.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -558,7 +558,7 @@ Application domains, which are represented by <xref:System.AppDomain> objects, h
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AssemblyResolve/CPP/assemblyresolve.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/AssemblyResolve/assemblyresolve.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/AssemblyResolve/assemblyresolve.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AssemblyResolve/VB/assemblyresolve.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/AssemblyResolve/assemblyresolve.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -631,7 +631,7 @@ Application domains, which are represented by <xref:System.AppDomain> objects, h
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADSetup/CPP/adsetup.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/BaseDirectory/adsetup.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/BaseDirectory/adsetup.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADSetup/VB/adsetup.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/BaseDirectory/adsetup.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -722,7 +722,7 @@ Application domains, which are represented by <xref:System.AppDomain> objects, h
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADClearPrivatePath/CPP/adclearprivatepath.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ClearPrivatePath/adclearprivatepath.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ClearPrivatePath/adclearprivatepath.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADClearPrivatePath/VB/adclearprivatepath.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ClearPrivatePath/adclearprivatepath.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -878,7 +878,7 @@ Application domains, which are represented by <xref:System.AppDomain> objects, h
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_CreateComInstanceFrom/CPP/createcominstancefrom.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateComInstanceFrom/createcominstancefrom.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateComInstanceFrom/createcominstancefrom.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_CreateComInstanceFrom/VB/createcominstancefrom.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateComInstanceFrom/createcominstancefrom.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1065,7 +1065,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_Setup/CPP/setup.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateDomain/setup.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateDomain/setup.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_Setup/VB/setup.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateDomain/setup.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1136,7 +1136,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_Setup/CPP/setup.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateDomain/setup.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateDomain/setup.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_Setup/VB/setup.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateDomain/setup.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1206,7 +1206,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_Setup/CPP/setup.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateDomain/setup.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateDomain/setup.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_Setup/VB/setup.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateDomain/setup.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1354,7 +1354,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_Setup/CPP/setup.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateDomain/setup.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateDomain/setup.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_Setup/VB/setup.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateDomain/setup.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1944,7 +1944,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/CreateInstanceAndUnwrap2/cpp/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateInstanceAndUnwrap/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateInstanceAndUnwrap/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CreateInstanceAndUnwrap2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2053,7 +2053,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADDyno/CPP/addyno.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateInstanceAndUnwrap/addyno.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateInstanceAndUnwrap/addyno.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADDyno/VB/addyno.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/addyno.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2174,7 +2174,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_CreateInstance_IgnoreCase/CPP/ignorecase.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateInstanceAndUnwrap/ignorecase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateInstanceAndUnwrap/ignorecase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_CreateInstance_IgnoreCase/VB/ignorecase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/ignorecase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2275,7 +2275,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_CreateInstance_IgnoreCase/CPP/ignorecase.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateInstanceAndUnwrap/ignorecase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateInstanceAndUnwrap/ignorecase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_CreateInstance_IgnoreCase/VB/ignorecase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/ignorecase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3241,7 +3241,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADApplicationBase/CPP/adapplicationbase.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CurrentDomain/adapplicationbase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CurrentDomain/adapplicationbase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADApplicationBase/VB/adapplicationbase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CurrentDomain/adapplicationbase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3320,7 +3320,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3400,7 +3400,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/DefineDynamicAssemblyWithAttributes/cpp/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DefineDynamicAssemblyWithAttributes/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3490,7 +3490,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3569,7 +3569,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3722,7 +3722,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3811,7 +3811,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3973,7 +3973,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4064,7 +4064,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4161,7 +4161,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4261,7 +4261,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/CPP/definedynamicassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DefineDynamicAssembly/VB/definedynamicassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DefineDynamicAssembly/definedynamicassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4415,21 +4415,21 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DoCallBack/CPP/docallback_static.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DoCallBack/docallback_static.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DoCallBack/docallback_static.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_static.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DoCallBack/docallback_static.vb" id="Snippet1":::
 
  The following sample demonstrates using the <xref:System.AppDomain.DoCallBack%2A> method by value.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DoCallBack/CPP/docallback_byval.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DoCallBack/docallback_byval.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DoCallBack/docallback_byval.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_byval.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DoCallBack/docallback_byval.vb" id="Snippet2":::
 
  The following sample demonstrates using the <xref:System.AppDomain.DoCallBack%2A> method by reference.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_DoCallBack/CPP/docallback_byref.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DoCallBack/docallback_byref.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DoCallBack/docallback_byref.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_DoCallBack/VB/docallback_byref.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DoCallBack/docallback_byref.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -4641,7 +4641,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADDynamicBase/CPP/addynamicbase.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DynamicDirectory/addynamicbase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DynamicDirectory/addynamicbase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADDynamicBase/VB/addynamicbase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DynamicDirectory/addynamicbase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4782,7 +4782,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_ExecuteAssembly/CPP/executeassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ExecuteAssembly/executeassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ExecuteAssembly/executeassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_ExecuteAssembly/VB/executeassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ExecuteAssembly/executeassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4864,7 +4864,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_ExecuteAssembly/CPP/executeassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ExecuteAssembly/executeassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ExecuteAssembly/executeassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_ExecuteAssembly/VB/executeassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ExecuteAssembly/executeassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4961,7 +4961,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_ExecuteAssembly/CPP/executeassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ExecuteAssembly/executeassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ExecuteAssembly/executeassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_ExecuteAssembly/VB/executeassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ExecuteAssembly/executeassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5045,7 +5045,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_ExecuteAssembly/CPP/executeassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ExecuteAssembly/executeassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ExecuteAssembly/executeassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_ExecuteAssembly/VB/executeassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ExecuteAssembly/executeassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5155,7 +5155,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_ExecuteAssembly/CPP/executeassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ExecuteAssembly/executeassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ExecuteAssembly/executeassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_ExecuteAssembly/VB/executeassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ExecuteAssembly/executeassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5240,7 +5240,7 @@ This method overload uses the <xref:System.AppDomainSetup> information from the
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_ExecuteAssembly/CPP/executeassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ExecuteAssembly/executeassembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ExecuteAssembly/executeassembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_ExecuteAssembly/VB/executeassembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ExecuteAssembly/executeassembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5894,7 +5894,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADApplicationBase/CPP/adapplicationbase.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CurrentDomain/adapplicationbase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CurrentDomain/adapplicationbase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADApplicationBase/VB/adapplicationbase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CurrentDomain/adapplicationbase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5960,7 +5960,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADGetAssemblies/CPP/adgetassemblies.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/GetAssemblies/adgetassemblies.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/GetAssemblies/adgetassemblies.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADGetAssemblies/VB/adgetassemblies.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/GetAssemblies/adgetassemblies.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6146,7 +6146,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADGetData/CPP/adgetdata.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/GetData/adgetdata.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/GetData/adgetdata.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADGetData/VB/adgetdata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/GetData/adgetdata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6716,7 +6716,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_LoadRaw/CPP/loadraw.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/Load/loadraw.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/Load/loadraw.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_LoadRaw/VB/loadraw.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/Load/loadraw.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6984,7 +6984,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_LoadRaw/CPP/loadraw.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/Load/loadraw.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/Load/loadraw.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_LoadRaw/VB/loadraw.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/Load/loadraw.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7197,7 +7197,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_LoadRaw/CPP/loadraw.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/Load/loadraw.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/Load/loadraw.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_LoadRaw/VB/loadraw.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/Load/loadraw.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7774,7 +7774,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain.ReflectionOnlyGetAssemblies/CPP/reflectiononly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ReflectionOnlyGetAssemblies/reflectiononly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ReflectionOnlyGetAssemblies/reflectiononly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain.ReflectionOnlyGetAssemblies/VB/reflectiononly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ReflectionOnlyGetAssemblies/reflectiononly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7989,7 +7989,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADSetAppDomainPolicy/CPP/adsetappdomainpolicy.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/SetAppDomainPolicy/adsetappdomainpolicy.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/SetAppDomainPolicy/adsetappdomainpolicy.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADSetAppDomainPolicy/VB/adsetappdomainpolicy.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/SetAppDomainPolicy/adsetappdomainpolicy.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8177,7 +8177,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADGetData/CPP/adgetdata.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/GetData/adgetdata.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/GetData/adgetdata.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADGetData/VB/adgetdata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/GetData/adgetdata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8321,7 +8321,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADDynamicBase/CPP/addynamicbase.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DynamicDirectory/addynamicbase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DynamicDirectory/addynamicbase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADDynamicBase/VB/addynamicbase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DynamicDirectory/addynamicbase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8399,7 +8399,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADPrincipal/CPP/adprincipal.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/SetPrincipalPolicy/adprincipal.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/SetPrincipalPolicy/adprincipal.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADPrincipal/VB/adprincipal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/SetPrincipalPolicy/adprincipal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8479,7 +8479,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/adproperties/CPP/adproperties.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/SetShadowCopyFiles/adproperties.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/SetShadowCopyFiles/adproperties.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/adproperties/VB/adproperties.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/SetShadowCopyFiles/adproperties.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8576,7 +8576,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADShadowCopy/CPP/adshadowcopy.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/SetShadowCopyPath/adshadowcopy.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/SetShadowCopyPath/adshadowcopy.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADShadowCopy/VB/adshadowcopy.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/SetShadowCopyPath/adshadowcopy.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8649,7 +8649,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADPrincipal/CPP/adprincipal.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/SetPrincipalPolicy/adprincipal.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/SetPrincipalPolicy/adprincipal.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADPrincipal/VB/adprincipal.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/SetPrincipalPolicy/adprincipal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9029,7 +9029,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADToString/CPP/adtostring.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/ToString/adtostring.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/ToString/adtostring.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADToString/VB/adtostring.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/ToString/adtostring.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9121,7 +9121,7 @@ The friendly name of the default application domain is the file name of the proc
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_TypeResolve/CPP/typeresolve.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/TypeResolve/typeresolve.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/TypeResolve/typeresolve.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_TypeResolve/VB/typeresolve.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/TypeResolve/typeresolve.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9195,7 +9195,7 @@ The following example demonstrates the <xref:System.AppDomain.UnhandledException
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomain_UnhandledException/CPP/unhandledexception.cpp" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System/AppDomain/UnhandledException/unhandledexception.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/UnhandledException/unhandledexception.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_UnhandledException/VB/unhandledexception.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/UnhandledExceptionEventArgs/ExceptionObject/unhandledexception.vb" id="Snippet1":::
           ]]></format>
         </example>
       </Docs>
@@ -9276,7 +9276,7 @@ The threads in `domain` are terminated using the <xref:System.Threading.Thread.A
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADUnload/CPP/adunload.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/Unload/adunload.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/Unload/adunload.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADUnload/VB/adunload.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/Unload/adunload.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/AppDomainSetup.xml b/xml/System/AppDomainSetup.xml
index 09f901420bc..af0f5d9b1b9 100644
--- a/xml/System/AppDomainSetup.xml
+++ b/xml/System/AppDomainSetup.xml
@@ -293,7 +293,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomainInitializer/cpp/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomainSetup/AppDomainInitializer/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomainSetup/AppDomainInitializer/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomainInitializer/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomainSetup/AppDomainInitializer/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -342,7 +342,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/AppDomainInitializer/cpp/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomainSetup/AppDomainInitializer/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomainSetup/AppDomainInitializer/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomainInitializer/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomainSetup/AppDomainInitializer/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -505,7 +505,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADApplicationBase/CPP/adapplicationbase.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CurrentDomain/adapplicationbase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CurrentDomain/adapplicationbase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADApplicationBase/VB/adapplicationbase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CurrentDomain/adapplicationbase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -555,7 +555,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADMultiDomain/CPP/admultidomain.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomainSetup/ApplicationName/admultidomain.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomainSetup/ApplicationName/admultidomain.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADMultiDomain/VB/admultidomain.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomainSetup/ApplicationName/admultidomain.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -933,7 +933,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADDynamicBase/CPP/addynamicbase.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/DynamicDirectory/addynamicbase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/DynamicDirectory/addynamicbase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADDynamicBase/VB/addynamicbase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/DynamicDirectory/addynamicbase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1056,7 +1056,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADDyno/CPP/addyno.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateInstanceAndUnwrap/addyno.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateInstanceAndUnwrap/addyno.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADDyno/VB/addyno.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/addyno.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/AppDomainUnloadedException.xml b/xml/System/AppDomainUnloadedException.xml
index 6b10192a135..69efff95089 100644
--- a/xml/System/AppDomainUnloadedException.xml
+++ b/xml/System/AppDomainUnloadedException.xml
@@ -96,7 +96,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/AppDomainUnloadedException/Overview/Sample.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomainUnloadedException/Overview/Sample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomainUnloadedException/vb/Sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomainUnloadedException/Overview/Sample.vb" id="Snippet1":::
 
  Example 2
 
@@ -105,7 +105,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/ADUnload/CPP/adunload.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/Unload/adunload.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/Unload/adunload.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ADUnload/VB/adunload.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/Unload/adunload.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/ArgumentException.xml b/xml/System/ArgumentException.xml
index ac078826f2e..62415ff38f0 100644
--- a/xml/System/ArgumentException.xml
+++ b/xml/System/ArgumentException.xml
@@ -104,7 +104,7 @@ The following example demonstrates how to throw and catch an <xref:System.Argume
 
  :::code language="csharp" source="~/snippets/csharp/System/ArgumentException/Overview/argumentexception2.cs" interactive="try-dotnet" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ArgumentException/FS/argumentexception2.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ArgumentException/vb/program2.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ArgumentException/Overview/program2.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/ArgumentOutOfRangeException.xml b/xml/System/ArgumentOutOfRangeException.xml
index 11eea68442d..cde325f9543 100644
--- a/xml/System/ArgumentOutOfRangeException.xml
+++ b/xml/System/ArgumentOutOfRangeException.xml
@@ -253,7 +253,7 @@ The following example defines a class to contain information about an invited gu
 
  :::code language="csharp" source="~/snippets/csharp/System/ArgumentOutOfRangeException/Overview/program.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ArgumentOutOfRangeException/FS/program.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ArgumentOutOfRangeException/VB/program.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ArgumentOutOfRangeException/Overview/program.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Array.xml b/xml/System/Array.xml
index 894c19aaa52..4377a478e08 100644
--- a/xml/System/Array.xml
+++ b/xml/System/Array.xml
@@ -801,7 +801,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/BinarySearchT/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_SortSearch/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_SortSearch/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/BinarySearchT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -932,7 +932,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/BinarySearchT/source1.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_SortSearchComparer/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_SortSearchComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/BinarySearchT/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1615,7 +1615,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/ConvertAllTInput,TOutput/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_ConvertAll/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_ConvertAll/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/ConvertAllTInput,TOutput/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3610,7 +3610,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/FindAllT/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_FindEtAl/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_FindEtAl/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/FindAllT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3655,7 +3655,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/FindIndexT/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_FindIndex/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_FindIndex/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/FindIndexT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4020,7 +4020,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/FindAllT/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_FindEtAl/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_FindEtAl/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/FindAllT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4065,7 +4065,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/FindLastIndexT/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_FindLastIndex/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_FindLastIndex/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/FindLastIndexT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5839,7 +5839,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/IndexOfT/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_IndexOf/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_IndexOf/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/IndexOfT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5926,7 +5926,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/IndexOfT/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_IndexOf/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_IndexOf/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/IndexOfT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6017,7 +6017,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/IndexOfT/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_IndexOf/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_IndexOf/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/IndexOfT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6689,7 +6689,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/LastIndexOfT/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_LastIndexOf/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_LastIndexOf/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/LastIndexOfT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6776,7 +6776,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/LastIndexOfT/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_LastIndexOf/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_LastIndexOf/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/LastIndexOfT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6867,7 +6867,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/LastIndexOfT/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_LastIndexOf/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_LastIndexOf/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/LastIndexOfT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9377,7 +9377,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/BinarySearchT/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_SortSearch/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_SortSearch/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/BinarySearchT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9496,7 +9496,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/BinarySearchT/source1.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_SortSearchComparer/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_SortSearchComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/BinarySearchT/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9600,7 +9600,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/SortT/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_SortComparison/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_SortComparison/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/SortT/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9718,7 +9718,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/SortT/source1.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_SortIntIntIComparer/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_SortIntIntIComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/SortT/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9851,7 +9851,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/SortT/source1.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_SortIntIntIComparer/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_SortIntIntIComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/SortT/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9994,7 +9994,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/SortTKey,TValue/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_Sort2IntIntIComparer/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_Sort2IntIntIComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/SortTKey,TValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10134,7 +10134,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/SortTKey,TValue/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_Sort2IntIntIComparer/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_Sort2IntIntIComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/SortTKey,TValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10277,7 +10277,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/SortTKey,TValue/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_Sort2IntIntIComparer/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_Sort2IntIntIComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/SortTKey,TValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10438,7 +10438,7 @@ This method is an O(`n` log `n`) operation, where `n` is the <xref:System.Array.
 
  :::code language="csharp" source="~/snippets/csharp/System/Array/SortTKey,TValue/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Array_Sort2IntIntIComparer/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_Sort2IntIntIComparer/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/SortTKey,TValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/ArrayTypeMismatchException.xml b/xml/System/ArrayTypeMismatchException.xml
index 1067bb13e76..0649f21d718 100644
--- a/xml/System/ArrayTypeMismatchException.xml
+++ b/xml/System/ArrayTypeMismatchException.xml
@@ -172,7 +172,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor1/FS/arraytypemismatch_constructor1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor1/VB/arraytypemismatch_constructor1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -241,7 +241,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor2/FS/arraytypemismatch_constructor2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor2/VB/arraytypemismatch_constructor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -377,7 +377,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor3.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor3/FS/arraytypemismatch_constructor3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ArrayTypeMisMatch_Constructor3/VB/arraytypemismatch_constructor3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ArrayTypeMismatchException/.ctor/arraytypemismatch_constructor3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/AsyncCallback.xml b/xml/System/AsyncCallback.xml
index 50fecaa9d41..c79215329c7 100644
--- a/xml/System/AsyncCallback.xml
+++ b/xml/System/AsyncCallback.xml
@@ -81,7 +81,7 @@
   
  :::code language="csharp" source="~/snippets/csharp/System/AsyncCallback/Overview/AsyncDelegateNoStateObject.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/AsyncDesignPattern/FS/AsyncDelegateNoStateObject.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDesignPattern/VB/AsyncDelegateNoState.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System/AsyncCallback/Overview/AsyncDelegateNoState.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System/Attribute.xml b/xml/System/Attribute.xml
index a4068c53df0..25c5a5cee47 100644
--- a/xml/System/Attribute.xml
+++ b/xml/System/Attribute.xml
@@ -101,7 +101,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/Overview/customattribute.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/AnimalAttributes/FS/customattribute.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AnimalAttributes/VB/customattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/Overview/customattribute.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -325,7 +325,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
  
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -403,7 +403,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
  
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id4.cs" interactive="try-dotnet" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id4.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -476,7 +476,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
  
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -631,7 +631,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
  
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -710,7 +710,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
  
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id4.cs" interactive="try-dotnet" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id4.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -785,7 +785,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
  
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -941,7 +941,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1007,7 +1007,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca4.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca4.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1068,7 +1068,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1131,7 +1131,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca5.cs" interactive="try-dotnet" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca5.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca5.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca5.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1192,7 +1192,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1259,7 +1259,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1329,7 +1329,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca4.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca4.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1397,7 +1397,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1457,7 +1457,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1530,7 +1530,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca5.cs" interactive="try-dotnet" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca5.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca5.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca5.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1597,7 +1597,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca5.cs" interactive="try-dotnet" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca5.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca5.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca5.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1669,7 +1669,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1746,7 +1746,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca4.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca4.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1818,7 +1818,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1893,7 +1893,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca5.cs" interactive="try-dotnet" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca5.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca5.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca5.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1973,7 +1973,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttributes/ca4.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetCustomAttributes/FS/ca4.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttributes/ca4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2043,7 +2043,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetHashCode/hashcode.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/GetHashCode/FS/hashcode.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GetHashCode/VB/hashcode.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetHashCode/hashcode.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2104,7 +2104,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/IsDefaultAttribute/defattr.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefaultAttribute/FS/defattr.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefaultAttribute/VB/defattr.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/IsDefaultAttribute/defattr.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2180,7 +2180,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2251,7 +2251,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id4.cs" interactive="try-dotnet" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id4.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2321,7 +2321,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2389,7 +2389,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id5.cs" interactive="try-dotnet" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id5.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id5.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id5.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2461,7 +2461,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2533,7 +2533,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id4.cs" interactive="try-dotnet" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id4.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id4.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id4.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2611,7 +2611,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id2.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2676,7 +2676,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/GetCustomAttribute/id5.cs" interactive="try-dotnet" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/IsDefined/FS/id5.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IsDefined/VB/id5.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Attribute/GetCustomAttribute/id5.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2750,7 +2750,7 @@ When implementing your own class derived from <xref:System.Attribute>, you can o
 
  :::code language="csharp" source="~/snippets/csharp/System/Attribute/Match/match.cs" interactive="try-dotnet":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Match/FS/match.fs":::
- [!code-vb[Match#1](~/snippets/visualbasic/VS_Snippets_CLR/Match/VB/match.vb)]
+ [!code-vb[Match#1](~/snippets/visualbasic/System/Attribute/Match/match.vb)]
 
  ]]></format>
         </remarks>
diff --git a/xml/System/AttributeTargets.xml b/xml/System/AttributeTargets.xml
index a48e6eadd02..01dfbde7bac 100644
--- a/xml/System/AttributeTargets.xml
+++ b/xml/System/AttributeTargets.xml
@@ -79,7 +79,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/AttributeTargets/Overview/attrtargs.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/AttrTargs/FS/attrtargs.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AttrTargs/VB/AttrTargs.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AttributeTargets/Overview/AttrTargs.vb" id="Snippet1":::
  ]]></format>
     </remarks>
     <altmember cref="T:System.AttributeUsageAttribute" />
diff --git a/xml/System/Boolean.xml b/xml/System/Boolean.xml
index 33a6e1108cb..c32aa5affab 100644
--- a/xml/System/Boolean.xml
+++ b/xml/System/Boolean.xml
@@ -203,7 +203,7 @@ The following code example demonstrates generic and nongeneric versions of the <
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Byte.xml b/xml/System/Byte.xml
index 6540c5f72d4..dbf0a5d244a 100644
--- a/xml/System/Byte.xml
+++ b/xml/System/Byte.xml
@@ -404,7 +404,7 @@
  The following code example demonstrates generic and non-generic versions of the `CompareTo` method for several value and reference types.
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Char.xml b/xml/System/Char.xml
index 1fb5337d2d7..df1d4355b34 100644
--- a/xml/System/Char.xml
+++ b/xml/System/Char.xml
@@ -371,7 +371,7 @@ The following code example demonstrates some of the methods in <xref:System.Char
  The following code example demonstrates generic and non-generic versions of the `CompareTo` method for several value and reference types.
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -534,7 +534,7 @@ The following code example demonstrates some of the methods in <xref:System.Char
 
  :::code language="csharp" source="~/snippets/csharp/System/Char/ConvertFromUtf32/utf.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/char.cvtutf32/FS/utf.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/char.cvtutf32/VB/utf.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Char/ConvertFromUtf32/utf.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -564,7 +564,7 @@ The following code example demonstrates some of the methods in <xref:System.Char
 
  :::code language="csharp" source="~/snippets/csharp/System/Char/ConvertFromUtf32/utf.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/char.cvtutf32/FS/utf.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/char.cvtutf32/VB/utf.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Char/ConvertFromUtf32/utf.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2051,7 +2051,7 @@ The method does not validate that `maxInclusive` is greater than or equal
 
  :::code language="csharp" source="~/snippets/csharp/System/Char/IsHighSurrogate/sur.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/char.surrogate/FS/sur.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/char.surrogate/VB/sur.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Char/IsHighSurrogate/sur.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2711,7 +2711,7 @@ The following code example demonstrates <xref:System.Char.IsLetter%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System/Char/IsHighSurrogate/sur.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/char.surrogate/FS/sur.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/char.surrogate/VB/sur.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Char/IsHighSurrogate/sur.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3844,7 +3844,7 @@ The following code example demonstrates <xref:System.Char.IsLetter%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System/Char/IsHighSurrogate/sur.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/char.surrogate/FS/sur.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/char.surrogate/VB/sur.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Char/IsHighSurrogate/sur.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9888,7 +9888,7 @@ This member is an explicit interface member implementation. It can be used only
 
  :::code language="csharp" source="~/snippets/csharp/System/Char/TryParse/tp.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/T.TryParse/FS/tp.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.TryParse/VB/tp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Char/TryParse/tp.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Comparison`1.xml b/xml/System/Comparison`1.xml
index 08ca145715f..8236ec17d7a 100644
--- a/xml/System/Comparison`1.xml
+++ b/xml/System/Comparison`1.xml
@@ -110,7 +110,7 @@
    
  :::code language="csharp" source="~/snippets/csharp/System/ComparisonT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/List`1_SortComparison/fs/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_SortComparison/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ComparisonT/Overview/source.vb" id="Snippet1":::
 
  The following example uses the <xref:System.Comparison%601> delegate to sort the elements of a collection of `CityInfo` objects. `CityInfo` is an application-defined class that contains information about a city and its population. The example defines three methods, `CompareByName`, `CompareByPopulation`, and `CompareByNames`, that offer three different ways of ordering the `CityInfo` objects. Each method is assigned to the `comparison` argument of the <xref:System.Array.Sort%60%601%28%60%600%5B%5D%2CSystem.Comparison%7B%60%600%7D%29?displayProperty=nameWithType> method.
 
diff --git a/xml/System/Console.xml b/xml/System/Console.xml
index f5401098e5e..11fa4d3bc0e 100644
--- a/xml/System/Console.xml
+++ b/xml/System/Console.xml
@@ -229,7 +229,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Beep/beep.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.beep/FS/beep.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.beep/VB/beep.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Beep/beep.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -301,7 +301,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Beep/b2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.beep2/FS/b2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.beep2/VB/b2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Beep/b2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -397,7 +397,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/BufferHeight/hw.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.bufferHW/FS/hw.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.bufferHW/VB/hw.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/BufferHeight/hw.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -496,7 +496,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/BufferHeight/hw.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.bufferHW/FS/hw.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.bufferHW/VB/hw.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/BufferHeight/hw.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -606,7 +606,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/CancelKeyPress/ckp.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cancelkeypress/fs/ckp.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cancelkeypress/vb/ckp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/CancelKeyPress/ckp.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -748,7 +748,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Clear/lts.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cursorLTS/FS/lts.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cursorLTS/VB/lts.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Clear/lts.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -827,7 +827,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Clear/lts.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cursorLTS/FS/lts.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cursorLTS/VB/lts.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Clear/lts.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -921,7 +921,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/CursorSize/csize.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cursorsize/FS/csize.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cursorsize/VB/csize.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/CursorSize/csize.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1003,7 +1003,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Clear/lts.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cursorLTS/FS/lts.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cursorLTS/VB/lts.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Clear/lts.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1093,7 +1093,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/CursorVisible/vis.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cursorvis/FS/vis.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cursorvis/VB/vis.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/CursorVisible/vis.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1166,7 +1166,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Error/expandtabsex.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Console-EXPANDTABSEX/FS/expandtabsex.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Console-EXPANDTABSEX/VB/expandtabsex.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Error/expandtabsex.vb" id="Snippet1":::
 
  The following example is a simple text file viewer that displays the contents of one or more text files to the console. If there are no command line arguments, or if any files passed as command line arguments do not exist, the example calls the <xref:System.Console.SetError%2A> method to redirect error information to a file, calls the <xref:System.Console.OpenStandardError%2A> method in the process of reacquiring the standard error stream, and indicates that error information was written to a file.
 
@@ -1415,7 +1415,7 @@ Columns are numbered from left to right starting at 0. Rows are numbered from to
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/In/consolein.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/consolein/FS/consolein.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/consolein/VB/consolein.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/In/consolein.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1716,7 +1716,7 @@ Columns are numbered from left to right starting at 0. Rows are numbered from to
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/KeyAvailable/ka.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.keyavailable/FS/ka.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.keyavailable/VB/ka.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/KeyAvailable/ka.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2762,7 +2762,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Read/read.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.read/FS/read.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.read/VB/read.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Read/read.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2862,7 +2862,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/ReadKey/rk.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.readkey1/FS/rk.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.readkey1/VB/rk.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/ReadKey/rk.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2960,7 +2960,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/ReadKey/rkbool.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.readkey2/FS/rkbool.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.readkey2/VB/rkbool.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/ReadKey/rkbool.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3229,7 +3229,7 @@ This method can be used to reacquire the standard output stream after it has bee
  The following example demonstrates the <xref:System.Console.WindowLeft%2A>, <xref:System.Console.WindowTop%2A>, <xref:System.Console.WindowWidth%2A>, <xref:System.Console.WindowHeight%2A>, <xref:System.Console.BufferWidth%2A>, <xref:System.Console.BufferHeight%2A>, and <xref:System.Console.CursorVisible%2A> properties; and the <xref:System.Console.SetWindowPosition%2A>, <xref:System.Console.SetBufferSize%2A>, and <xref:System.Console.ReadKey%2A> methods. The example draws a grid pattern in the screen buffer based on the screen buffer width. Then the example moves the console window in response to which of the UP ARROW, DOWN ARROW, LEFT ARROW, or RIGHT ARROW console keys is pressed. The grid pattern helps you see the movement of the console window relative to the screen buffer.
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/SetBufferSize/wlt.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.windowLT/VB/wlt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/SetBufferSize/wlt.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.windowLT/FS/wlt.fs" id="Snippet1":::
 
  ]]></format>
@@ -3333,7 +3333,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Clear/lts.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cursorLTS/FS/lts.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cursorLTS/VB/lts.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Clear/lts.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3660,7 +3660,7 @@ This method can be used to reacquire the standard output stream after it has bee
  The following example demonstrates the <xref:System.Console.WindowLeft%2A>, <xref:System.Console.WindowTop%2A>, <xref:System.Console.WindowWidth%2A>, <xref:System.Console.WindowHeight%2A>, <xref:System.Console.BufferWidth%2A>, <xref:System.Console.BufferHeight%2A>, and <xref:System.Console.CursorVisible%2A> properties; and the <xref:System.Console.SetWindowPosition%2A>, <xref:System.Console.SetBufferSize%2A>, and <xref:System.Console.ReadKey%2A> methods. The example draws a grid pattern in the screen buffer based on the screen buffer width. Then the example moves the console window in response to which of the UP ARROW, DOWN ARROW, LEFT ARROW, or RIGHT ARROW console keys is pressed. The grid pattern helps you see the movement of the console window relative to the screen buffer.
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/SetBufferSize/wlt.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.windowLT/VB/wlt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/SetBufferSize/wlt.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.windowLT/FS/wlt.fs" id="Snippet1":::
 
  ]]></format>
@@ -3759,7 +3759,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/SetWindowSize/sws.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.setwindowsize/FS/sws.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.setwindowsize/VB/sws.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/SetWindowSize/sws.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3854,7 +3854,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Title/mytitle.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.title/FS/mytitle.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.title/VB/mytitle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Title/mytitle.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3946,7 +3946,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/ReadKey/rk.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.readkey1/FS/rk.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.readkey1/VB/rk.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/ReadKey/rk.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4055,7 +4055,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/SetWindowSize/sws.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.setwindowsize/FS/sws.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.setwindowsize/VB/sws.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/SetWindowSize/sws.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4222,7 +4222,7 @@ This method can be used to reacquire the standard output stream after it has bee
  The following example demonstrates the <xref:System.Console.WindowLeft%2A>, <xref:System.Console.WindowTop%2A>, <xref:System.Console.WindowWidth%2A>, <xref:System.Console.WindowHeight%2A>, <xref:System.Console.BufferWidth%2A>, <xref:System.Console.BufferHeight%2A>, and <xref:System.Console.CursorVisible%2A> properties; and the <xref:System.Console.SetWindowPosition%2A>, <xref:System.Console.SetBufferSize%2A>, and <xref:System.Console.ReadKey%2A> methods. The example draws a grid pattern in the screen buffer based on the screen buffer width. Then the example moves the console window in response to which of the UP ARROW, DOWN ARROW, LEFT ARROW, or RIGHT ARROW console keys is pressed. The grid pattern helps you see the movement of the console window relative to the screen buffer.
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/SetBufferSize/wlt.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.windowLT/VB/wlt.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/SetBufferSize/wlt.vb" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.windowLT/FS/wlt.fs" id="Snippet1":::
 
  ]]></format>
@@ -4335,7 +4335,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/SetWindowSize/sws.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.setwindowsize/FS/sws.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.setwindowsize/VB/sws.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/SetWindowSize/sws.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5251,7 +5251,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Write/wl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.writelineFmt1/fs/wl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.writelineFmt1/vb/wl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Write/wl.vb" id="Snippet1":::
 
  The following example illustrates the use of the <xref:System.Console.Write%2A> method.
 
@@ -5597,7 +5597,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Write/wl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.writelineFmt1/fs/wl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.writelineFmt1/vb/wl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Write/wl.vb" id="Snippet1":::
 
  The following example illustrates the use of the `Write` method.
 
@@ -5707,7 +5707,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Write/wl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.writelineFmt1/fs/wl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.writelineFmt1/vb/wl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Write/wl.vb" id="Snippet1":::
 
  The following example illustrates the use of the `Write` method.
 
@@ -6943,7 +6943,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Write/wl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.writelineFmt1/fs/wl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.writelineFmt1/vb/wl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Write/wl.vb" id="Snippet1":::
 
  The following example is a tip calculator that calculates an 18% tip and uses the <xref:System.Console.WriteLine%2A> method to display the amount of the original charge, the amount of the tip, and the total amount. The example is a console application that requires the user to supply the amount of the original charge as a command-line parameter.
 
@@ -7176,7 +7176,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Write/wl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.writelineFmt1/fs/wl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.writelineFmt1/vb/wl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Write/wl.vb" id="Snippet1":::
 
  The following example is a tip calculator that calculates an 18% tip and uses the <xref:System.Console.WriteLine%2A> method to display the amount of the original charge, the amount of the tip, and the total amount. The example is a console application that requires the user to supply the amount of the original charge as a command-line parameter.
 
@@ -7288,7 +7288,7 @@ This method can be used to reacquire the standard output stream after it has bee
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/Write/wl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.writelineFmt1/fs/wl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.writelineFmt1/vb/wl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/Write/wl.vb" id="Snippet1":::
 
  The following example is a tip calculator that calculates an 18% tip and uses the <xref:System.Console.WriteLine%2A> method to display the amount of the original charge, the amount of the tip, and the total amount. The example is a console application that requires the user to supply the amount of the original charge as a command-line parameter.
 
diff --git a/xml/System/ConsoleCancelEventArgs.xml b/xml/System/ConsoleCancelEventArgs.xml
index 06e6f1304b6..c0ed7635c90 100644
--- a/xml/System/ConsoleCancelEventArgs.xml
+++ b/xml/System/ConsoleCancelEventArgs.xml
@@ -63,7 +63,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/CancelKeyPress/ckp.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cancelkeypress/fs/ckp.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cancelkeypress/vb/ckp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/CancelKeyPress/ckp.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -123,7 +123,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/CancelKeyPress/ckp.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cancelkeypress/fs/ckp.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cancelkeypress/vb/ckp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/CancelKeyPress/ckp.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -182,7 +182,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/CancelKeyPress/ckp.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cancelkeypress/fs/ckp.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cancelkeypress/vb/ckp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/CancelKeyPress/ckp.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/ConsoleCancelEventHandler.xml b/xml/System/ConsoleCancelEventHandler.xml
index 1e266232ed0..4b6fca56745 100644
--- a/xml/System/ConsoleCancelEventHandler.xml
+++ b/xml/System/ConsoleCancelEventHandler.xml
@@ -70,7 +70,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/CancelKeyPress/ckp.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cancelkeypress/fs/ckp.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cancelkeypress/vb/ckp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/CancelKeyPress/ckp.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/ConsoleKeyInfo.xml b/xml/System/ConsoleKeyInfo.xml
index 891effcec0d..d9dde6476e6 100644
--- a/xml/System/ConsoleKeyInfo.xml
+++ b/xml/System/ConsoleKeyInfo.xml
@@ -78,7 +78,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/ReadKey/rk.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.readkey1/FS/rk.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.readkey1/VB/rk.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/ReadKey/rk.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -392,7 +392,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/ReadKey/rk.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.readkey1/FS/rk.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.readkey1/VB/rk.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/ReadKey/rk.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -501,7 +501,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/ReadKey/rk.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.readkey1/FS/rk.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.readkey1/VB/rk.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/ReadKey/rk.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/ConsoleModifiers.xml b/xml/System/ConsoleModifiers.xml
index 909239a9869..e09a3543c61 100644
--- a/xml/System/ConsoleModifiers.xml
+++ b/xml/System/ConsoleModifiers.xml
@@ -66,7 +66,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/ReadKey/rk.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.readkey1/FS/rk.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.readkey1/VB/rk.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/ReadKey/rk.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/ConsoleSpecialKey.xml b/xml/System/ConsoleSpecialKey.xml
index 747a498ccba..bb858ee943d 100644
--- a/xml/System/ConsoleSpecialKey.xml
+++ b/xml/System/ConsoleSpecialKey.xml
@@ -62,7 +62,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Console/CancelKeyPress/ckp.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/console.cancelkeypress/fs/ckp.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/console.cancelkeypress/vb/ckp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Console/CancelKeyPress/ckp.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Convert.xml b/xml/System/Convert.xml
index 78f6b374e74..53fedcc7b2c 100644
--- a/xml/System/Convert.xml
+++ b/xml/System/Convert.xml
@@ -174,7 +174,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Convert/ChangeType/convertchangetype.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Convert/ChangeType/convertchangetype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/convertchangetype/VB/convertchangetype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Convert/ChangeType/convertchangetype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -675,7 +675,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Convert/FromBase64CharArray/tb64ca.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Convert/FromBase64CharArray/tb64ca.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/convert.tobase64chararray/VB/tb64ca.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Convert/FromBase64CharArray/tb64ca.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1302,7 +1302,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Convert/FromBase64CharArray/tb64ca.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Convert/FromBase64CharArray/tb64ca.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/convert.tobase64chararray/VB/tb64ca.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Convert/FromBase64CharArray/tb64ca.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1725,7 +1725,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Convert/ToBase64String/tb64s.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Convert/ToBase64String/tb64s.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/convert.tobase64string/VB/tb64s.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Convert/ToBase64String/tb64s.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Converter`2.xml b/xml/System/Converter`2.xml
index b4c5412d8ab..8727c685388 100644
--- a/xml/System/Converter`2.xml
+++ b/xml/System/Converter`2.xml
@@ -97,14 +97,14 @@
  The following code example defines a method named `PointFToPoint` that converts a <xref:System.Drawing.PointF> structure to a <xref:System.Drawing.Point> structure. The example then creates an array of <xref:System.Drawing.PointF> structures, creates a `Converter<PointF, Point>` delegate (`Converter(Of PointF, Point)` in Visual Basic) to represent the `PointFToPoint` method, and passes the delegate to the <xref:System.Array.ConvertAll%2A> method. The <xref:System.Array.ConvertAll%2A> method passes each element of the input list to the `PointFToPoint` method and puts the converted elements into a new list of <xref:System.Drawing.Point> structures. Both lists are displayed.
   
  :::code language="csharp" source="~/snippets/csharp/System/Array/ConvertAllTInput,TOutput/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Array_ConvertAll/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/ConvertAllTInput,TOutput/source.vb" id="Snippet1":::
 
  Example 2
 
  The following code example defines a method named `PointFToPoint` that converts a <xref:System.Drawing.PointF> structure to a <xref:System.Drawing.Point> structure. The example then creates a <xref:System.Collections.Generic.List%601> of <xref:System.Drawing.PointF> structures, creates a `Converter<PointF, Point>` delegate (`Converter(Of PointF, Point)` in Visual Basic) to represent the `PointFToPoint` method, and passes the delegate to the <xref:System.Collections.Generic.List`1.ConvertAll*> method. The <xref:System.Collections.Generic.List`1.ConvertAll*> method passes each element of the input list to the `PointFToPoint` method and puts the converted elements into a new list of <xref:System.Drawing.Point> structures. Both lists are displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System/ConverterTInput,TOutput/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/List`1_ConvertAll/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ConverterTInput,TOutput/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/DateTime.xml b/xml/System/DateTime.xml
index cd533154908..db746b30f51 100644
--- a/xml/System/DateTime.xml
+++ b/xml/System/DateTime.xml
@@ -213,7 +213,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/datetime.ctor_Int64/FS/ticks.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/.ctor/ticks.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/datetime.ctor_Int64/VB/ticks.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/.ctor/ticks.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1653,7 +1653,7 @@ For applications in which portability of date and time data or a limited degree
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Add/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/Add/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Add/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/Add/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1726,7 +1726,7 @@ For applications in which portability of date and time data or a limited degree
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.AddDays/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/AddDays/class1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.AddDays/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/AddDays/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2466,7 +2466,7 @@ The value parameter is rounded to the nearest integer.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.CompareTo.2/FS/CompareTo_CS1_24564.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/CompareTo/CompareTo_CS1_24564.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.CompareTo.2/VB/CompareTo_VB1_24564.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/CompareTo/CompareTo_VB1_24564.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2556,7 +2556,7 @@ The value parameter is rounded to the nearest integer.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.CompareTo/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/CompareTo/class1.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.CompareTo/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/CompareTo/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2767,7 +2767,7 @@ The value parameter is rounded to the nearest integer.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.DayOfWeek/FS/dow.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/DayOfWeek/dow.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.DayOfWeek/VB/dow.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/DayOfWeek/dow.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2898,7 +2898,7 @@ The value parameter is rounded to the nearest integer.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.DaysInMonth/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/DaysInMonth/class1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.DaysInMonth/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/DaysInMonth/class1.vb" id="Snippet1":::
 
  The following example displays the number of days in each month of a year specified in an integer array.
 
@@ -3220,7 +3220,7 @@ The value parameter is rounded to the nearest integer.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Equals/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/Equals/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Equals/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/Equals/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3343,7 +3343,7 @@ The value parameter is rounded to the nearest integer.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.FromFileTime/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/FromFileTime/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.FromFileTime/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/FromFileTime/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3573,7 +3573,7 @@ The value parameter is rounded to the nearest integer.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.GetDateTimeFormats/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/GetDateTimeFormats/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.GetDateTimeFormats/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/GetDateTimeFormats/class1.vb" id="Snippet1":::
 
  The example displays the following output:
 
@@ -3782,7 +3782,7 @@ July, 2009
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.GetDateTimeFormats/FS/class1.fs" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/GetDateTimeFormats/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.GetDateTimeFormats/VB/class1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/GetDateTimeFormats/class1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3863,7 +3863,7 @@ July, 2009
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.GetDateTimeFormats/FS/class1.fs" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/GetDateTimeFormats/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.GetDateTimeFormats/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/GetDateTimeFormats/class1.vb" id="Snippet2":::
 
  The example displays the following output:
 
@@ -4051,7 +4051,7 @@ juillet 2009
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.GetDateTimeFormats/FS/class1.fs" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/GetDateTimeFormats/class1.cs" interactive="try-dotnet-method" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.GetDateTimeFormats/VB/class1.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/GetDateTimeFormats/class1.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -4427,7 +4427,7 @@ juillet 2009
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Kind_Suite/fs/ks.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/Kind/ks.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Kind_Suite/vb/ks.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/Kind/ks.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4958,7 +4958,7 @@ juillet 2009
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime Operators/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/op_Addition/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime Operators/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/op_Addition/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5037,7 +5037,7 @@ juillet 2009
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime Operators/FS/class1.fs" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/op_Addition/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime Operators/VB/class1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/op_Addition/class1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -5458,7 +5458,7 @@ juillet 2009
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Subtraction/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/op_Subtraction/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Subtraction/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/op_Subtraction/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5528,7 +5528,7 @@ juillet 2009
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Subtraction/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/op_Subtraction/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Subtraction/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/op_Subtraction/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6788,7 +6788,7 @@ The following example demonstrates the <xref:System.DateTime.Parse%28System.Stri
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Kind_Suite/fs/ks.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/Kind/ks.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Kind_Suite/vb/ks.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/Kind/ks.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6880,7 +6880,7 @@ The following example demonstrates the <xref:System.DateTime.Parse%28System.Stri
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Subtraction/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/op_Subtraction/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Subtraction/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/op_Subtraction/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6969,7 +6969,7 @@ The following example demonstrates the <xref:System.DateTime.Parse%28System.Stri
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Subtraction/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/op_Subtraction/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Subtraction/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/op_Subtraction/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8246,7 +8246,7 @@ In general, the ticks represent the time according to the time zone specified by
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.ToFileTime/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/ToFileTime/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.ToFileTime/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/ToFileTime/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8405,13 +8405,13 @@ In general, the ticks represent the time according to the time zone specified by
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.ToLocalTime ToUniversalTime/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/ToLocalTime/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.ToLocalTime ToUniversalTime/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/ToLocalTime/class1.vb" id="Snippet1":::
 
  The following example uses the <xref:System.DateTime.SpecifyKind%2A> method to demonstrate how the <xref:System.DateTime.Kind%2A> property influences the <xref:System.DateTime.ToLocalTime%2A> and <xref:System.DateTime.ToUniversalTime%2A> conversion methods.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Kind_Suite/fs/ks.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/Kind/ks.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Kind_Suite/vb/ks.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/Kind/ks.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8492,7 +8492,7 @@ The following example demonstrates the <xref:System.DateTime.ToLongDateString%2A
 
 :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.ToShortLongString/fs/sls.fs" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System/DateTime/ToLongDateString/sls.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.ToShortLongString/vb/sls.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/DateTime/ToLongDateString/sls.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8771,7 +8771,7 @@ The value of the current <xref:System.DateTime> object is formatted using the pa
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.ToShortLongString/fs/sls.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/ToLongDateString/sls.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.ToShortLongString/vb/sls.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/ToLongDateString/sls.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9300,13 +9300,13 @@ The following example illustrates how the string representation of a <xref:Syste
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.ToLocalTime ToUniversalTime/FS/class1.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/ToLocalTime/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.ToLocalTime ToUniversalTime/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/ToLocalTime/class1.vb" id="Snippet1":::
 
  The following example uses the <xref:System.DateTime.SpecifyKind%2A> method to demonstrate how the <xref:System.DateTime.Kind%2A> property influences the <xref:System.DateTime.ToLocalTime%2A> and <xref:System.DateTime.ToUniversalTime%2A> conversion methods.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Kind_Suite/fs/ks.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/Kind/ks.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Kind_Suite/vb/ks.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/Kind/ks.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10411,7 +10411,7 @@ The following example illustrates the <xref:System.DateTime.TryParse%28System.St
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.Kind_Suite/fs/ks.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/Kind/ks.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.Kind_Suite/vb/ks.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/Kind/ks.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/DayOfWeek.xml b/xml/System/DayOfWeek.xml
index 41b1d32a7c6..72838cc782b 100644
--- a/xml/System/DayOfWeek.xml
+++ b/xml/System/DayOfWeek.xml
@@ -74,7 +74,7 @@
   
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/DayOfWeek/dow.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/DateTime.DayOfWeek/FS/dow.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/DateTime.DayOfWeek/VB/dow.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/DayOfWeek/dow.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Decimal.xml b/xml/System/Decimal.xml
index 49d500c730a..dd1bdc459a8 100644
--- a/xml/System/Decimal.xml
+++ b/xml/System/Decimal.xml
@@ -970,7 +970,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Overview/source.cs" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Decimal/Overview/source.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Decimal Example/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Add/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1287,7 +1287,7 @@
  The following code example demonstrates generic and nongeneric versions of the <xref:System.Decimal.CompareTo%2A> method for several value and reference types.
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2815,7 +2815,7 @@ For <xref:System.Numerics.IFloatingPointIeee754%601>, this method matches the IE
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Overview/source.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Decimal/Overview/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Decimal Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Add/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -6332,7 +6332,7 @@ For <xref:System.Numerics.IFloatingPointIeee754%601>, this method matches the IE
  The following example is the button click event handler of a Web form. It uses the array returned by the <xref:System.Web.HttpRequest.UserLanguages%2A?displayProperty=nameWithType> property to determine the user's locale. It then instantiates a <xref:System.Globalization.CultureInfo> object that corresponds to that locale. The <xref:System.Globalization.NumberFormatInfo> object that belongs to that <xref:System.Globalization.CultureInfo> object is then passed to the <xref:System.Decimal.Parse%28System.String%2CSystem.IFormatProvider%29> method to convert the user's input to a <xref:System.Decimal> value.
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Parse/Default.aspx.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -7102,7 +7102,7 @@ It is recommended that a function return `1`, `0`, and `-1`, respectively.
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Overview/source.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Decimal/Overview/source.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Decimal Example/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Add/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -10444,7 +10444,7 @@ This member is an explicit interface member implementation. It can be used only
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Overview/source.cs" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Decimal/Overview/source.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Decimal Example/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Add/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Double.xml b/xml/System/Double.xml
index 8adbb5ae6ba..573d81b5d9e 100644
--- a/xml/System/Double.xml
+++ b/xml/System/Double.xml
@@ -1157,7 +1157,7 @@ This computes `arctan(x) / π` in the interval `[-0.5, +0.5]`.
 The following code example demonstrates generic and nongeneric versions of the <xref:System.Double.CompareTo%2A> method for several value and reference types.
 
 :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" interactive="try-dotnet" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
           ]]></format>
         </example>
         <altmember cref="M:System.Double.Equals(System.Object)" />
@@ -3863,7 +3863,7 @@ For <xref:System.Numerics.IFloatingPoint%601> this method matches the IEEE 754:2
 
  :::code language="csharp" source="~/snippets/csharp/System/Double/Overview/source.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Double/Overview/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Double Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Double/MaxValue/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -4161,7 +4161,7 @@ For <xref:System.Numerics.IFloatingPoint%601> this method matches the IEEE 754:2
 
  :::code language="csharp" source="~/snippets/csharp/System/Double/Overview/source.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Double/Overview/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Double Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Double/MaxValue/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -4852,7 +4852,7 @@ If a separator is encountered in the `s` parameter during a parse operation, and
 
  :::code language="csharp" source="~/snippets/csharp/System/Double/Overview/source.cs" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Double/Overview/source.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Double Example/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Double/MaxValue/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -5204,7 +5204,7 @@ If a separator is encountered in the `s` parameter during a parse operation, and
  The following example is the button click event handler of a Web form. It uses the array returned by the <xref:System.Web.HttpRequest.UserLanguages%2A?displayProperty=nameWithType> property to determine the user's locale. It then instantiates a <xref:System.Globalization.CultureInfo> object that corresponds to that locale. The <xref:System.Globalization.NumberFormatInfo> object that belongs to that <xref:System.Globalization.CultureInfo> object is then passed to the <xref:System.Double.Parse%28System.String%2CSystem.IFormatProvider%29> method to convert the user's input to a <xref:System.Double> value.
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Parse/Default.aspx.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -9475,7 +9475,7 @@ Tau is approximately 6.2831853071795864769.
 
  :::code language="csharp" source="~/snippets/csharp/System/Double/Overview/source.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Double/Overview/source.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Double Example/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Double/MaxValue/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -9709,7 +9709,7 @@ Tau is approximately 6.2831853071795864769.
 
  :::code language="csharp" source="~/snippets/csharp/System/Double/Overview/source.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Double/Overview/source.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Double Example/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Double/MaxValue/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Enum.xml b/xml/System/Enum.xml
index 2216b3eb579..e6879f3879a 100644
--- a/xml/System/Enum.xml
+++ b/xml/System/Enum.xml
@@ -216,7 +216,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/CompareTo/EnumCompareTo.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/CompareTo/EnumCompareTo.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/enumcompareto/VB/EnumCompareTo.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/CompareTo/EnumCompareTo.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -302,7 +302,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/Equals/EnumEquals.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/Equals/EnumEquals.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/enumequals/VB/EnumEquals.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/Equals/EnumEquals.vb" id="Snippet1":::
 
  The following example defines two enumeration types, `SledDog` and `WorkDog`. The `SledDog` enumeration has two members, `SledDog.AlaskanMalamute` and `SledDog.Malamute`, that have the same underlying value. The call to the <xref:System.Enum.Equals%2A> method indicates that these values are equal because their underlying values are the same. The `SledDog.Malamute` and `WorkDog.Newfoundland` members have the same underlying value, although they represent different enumeration types. A call to the <xref:System.Enum.Equals%2A> method indicates that these values are not equal.
 
@@ -397,7 +397,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/Format/EnumFormat.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/Format/EnumFormat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/enumformat/VB/EnumFormat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/Format/EnumFormat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -542,7 +542,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/GetName/EnumGetName.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/GetName/EnumGetName.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/enumgetname/VB/EnumGetName.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/GetName/EnumGetName.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -680,7 +680,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/GetNames/EnumGetNames.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/GetNames/EnumGetNames.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/enumgetnames/VB/EnumGetNames.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/GetNames/EnumGetNames.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -957,7 +957,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/GetValues/EnumGetValues.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/GetValues/EnumGetValues.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/enumgetvalues/VB/EnumGetValues.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/GetValues/EnumGetValues.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1503,7 +1503,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/Parse/EnumParse.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/Parse/EnumParse.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/enumparse/VB/EnumParse.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/Parse/EnumParse.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3879,7 +3879,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/ToString/tostr.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/ToString/tostr.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/enum.tostring/VB/tostr.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/ToString/tostr.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Environment+SpecialFolder.xml b/xml/System/Environment+SpecialFolder.xml
index e807b410c1e..3caaa16bebc 100644
--- a/xml/System/Environment+SpecialFolder.xml
+++ b/xml/System/Environment+SpecialFolder.xml
@@ -74,7 +74,7 @@
   
  :::code language="csharp" source="~/snippets/csharp/System/Environment+SpecialFolder/Overview/getfolderpath.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment+SpecialFolder/Overview/getfolderpath.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.GetFolderPath/VB/getfolderpath.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment+SpecialFolder/Overview/getfolderpath.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Environment.xml b/xml/System/Environment.xml
index 788eee1d2fd..2aaf15e2a38 100644
--- a/xml/System/Environment.xml
+++ b/xml/System/Environment.xml
@@ -82,7 +82,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/Overview/env0.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/Overview/env0.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.class/VB/env0.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/Overview/env0.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -150,7 +150,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/CommandLine/commandline.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/CommandLine/commandline.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.CommandLine/VB/commandline.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/CommandLine/commandline.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -592,7 +592,7 @@ Invalid argument
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/ExpandEnvironmentVariables/expandenvironmentvariables.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/ExpandEnvironmentVariables/expandenvironmentvariables.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.ExpandEnvironmentVariables/VB/expandenvironmentvariables.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/ExpandEnvironmentVariables/expandenvironmentvariables.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -688,7 +688,7 @@ Calling the `Environment.FailFast` method to terminate execution of an applicati
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/FailFast/ff.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/FailFast/ff.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.FailFast/vb/ff.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/FailFast/ff.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -854,7 +854,7 @@ In .NET 5 and later versions, for single-file publishing, the first element is t
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/GetCommandLineArgs/getcommandlineargs.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/GetCommandLineArgs/getcommandlineargs.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.GetCommandLineArgs/VB/getcommandlineargs.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/GetCommandLineArgs/getcommandlineargs.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1018,7 +1018,7 @@ The following example creates environment variables for the <xref:System.Environ
 
 :::code language="csharp" source="~/snippets/csharp/System/Environment/GetEnvironmentVariable/gsev.cs":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Environment/GetEnvironmentVariable/gsev.fs":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.getsetenvar/VB/gsev.vb":::
+:::code language="vb" source="~/snippets/visualbasic/System/Environment/GetEnvironmentVariables/gsev.vb":::
           ]]></format>
         </example>
         <exception cref="T:System.ArgumentNullException">
@@ -1122,7 +1122,7 @@ The following example demonstrates the <xref:System.Environment.GetEnvironmentVa
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/GetEnvironmentVariables/getenvironmentvariables.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/GetEnvironmentVariables/getenvironmentvariables.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.GetEnvironmentVariables/VB/getenvironmentvariables.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/GetEnvironmentVariables/getenvironmentvariables.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1207,7 +1207,7 @@ The following example creates environment variables for the <xref:System.Environ
 
 :::code language="csharp" source="~/snippets/csharp/System/Environment/GetEnvironmentVariable/gsev.cs":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Environment/GetEnvironmentVariable/gsev.fs":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.getsetenvar/VB/gsev.vb":::
+:::code language="vb" source="~/snippets/visualbasic/System/Environment/GetEnvironmentVariables/gsev.vb":::
 
  ]]></format>
         </remarks>
@@ -1296,7 +1296,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment+SpecialFolder/Overview/getfolderpath.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment+SpecialFolder/Overview/getfolderpath.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.GetFolderPath/VB/getfolderpath.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment+SpecialFolder/Overview/getfolderpath.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1440,7 +1440,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/GetLogicalDrives/getlogicaldrives.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/GetLogicalDrives/getlogicaldrives.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.GetLogicalDrives/VB/getlogicaldrives.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/GetLogicalDrives/getlogicaldrives.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1697,7 +1697,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/MachineName/machinename.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/MachineName/machinename.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.MachineName/VB/machinename.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/MachineName/machinename.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1766,7 +1766,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/NewLine/newline.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/NewLine/newline.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.NewLine/VB/newline.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/NewLine/newline.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1941,7 +1941,7 @@ For more information about processor groups and logical processors, see [Process
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/ProcessorCount/pc.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/ProcessorCount/pc.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.processorcount/VB/pc.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/ProcessorCount/pc.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2217,7 +2217,7 @@ The following example creates environment variables for the <xref:System.Environ
 
 :::code language="csharp" source="~/snippets/csharp/System/Environment/GetEnvironmentVariable/gsev.cs":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Environment/GetEnvironmentVariable/gsev.fs":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.getsetenvar/VB/gsev.vb":::
+:::code language="vb" source="~/snippets/visualbasic/System/Environment/GetEnvironmentVariables/gsev.vb":::
 
  ]]></format>
         </remarks>
@@ -2337,7 +2337,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/StackTrace/stacktrace.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/StackTrace/stacktrace.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.StackTrace/VB/stacktrace.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/StackTrace/stacktrace.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2401,7 +2401,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/SystemDirectory/systemdirectory.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/SystemDirectory/systemdirectory.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.SystemDirectory/VB/systemdirectory.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/SystemDirectory/systemdirectory.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2532,7 +2532,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/TickCount/tickcount.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/TickCount/tickcount.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.TickCount/VB/tickcount.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/TickCount/tickcount.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2696,7 +2696,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/UserInteractive/userinteractive.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/UserInteractive/userinteractive.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.UserInteractive/VB/userinteractive.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/UserInteractive/userinteractive.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2767,7 +2767,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/UserName/username.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/UserName/username.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.UserName/VB/username.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/UserName/username.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2833,7 +2833,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/Version/version.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/Version/version.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.Version/VB/version.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/Version/version.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2894,7 +2894,7 @@ The following example creates environment variables for the <xref:System.Environ
 
  :::code language="csharp" source="~/snippets/csharp/System/Environment/WorkingSet/workingset.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Environment/WorkingSet/workingset.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Environment.WorkingSet/VB/workingset.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Environment/WorkingSet/workingset.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/EnvironmentVariableTarget.xml b/xml/System/EnvironmentVariableTarget.xml
index 68e8055b37e..c190456731f 100644
--- a/xml/System/EnvironmentVariableTarget.xml
+++ b/xml/System/EnvironmentVariableTarget.xml
@@ -87,7 +87,7 @@ The following example uses the <xref:System.EnvironmentVariableTarget> enumerati
   
 :::code language="csharp" source="~/snippets/csharp/System/Environment/GetEnvironmentVariable/gsev.cs":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Environment/GetEnvironmentVariable/gsev.fs":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/environment.getsetenvar/VB/gsev.vb":::  
+:::code language="vb" source="~/snippets/visualbasic/System/Environment/GetEnvironmentVariables/gsev.vb":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System/EventArgs.xml b/xml/System/EventArgs.xml
index 59ea6de3a62..69cdc8637e0 100644
--- a/xml/System/EventArgs.xml
+++ b/xml/System/EventArgs.xml
@@ -77,7 +77,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/EventArgs/Overview/programwithdata.cs" id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System/EventArgs/Overview/programwithdata.fs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventsoverview/vb/module1withdata.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System/EventArgs/Overview/module1withdata.vb" id="Snippet6":::
 
  ]]></format>
     </remarks>
@@ -201,7 +201,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/EventArgs/Overview/programnodata.cs" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System/EventArgs/Overview/programnodata.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventsoverview/vb/module1nodata.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/EventArgs/Overview/module1nodata.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/EventHandler`1.xml b/xml/System/EventHandler`1.xml
index fdf57f7c14e..71d1fcb4949 100644
--- a/xml/System/EventHandler`1.xml
+++ b/xml/System/EventHandler`1.xml
@@ -115,7 +115,7 @@ The following example shows an event named `ThresholdReached`. The event is asso
 
  :::code language="csharp" source="~/snippets/csharp/System/EventArgs/Overview/programwithdata.cs" id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System/EventArgs/Overview/programwithdata.fs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/eventsoverview/vb/module1withdata.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System/EventArgs/Overview/module1withdata.vb" id="Snippet6":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Exception.xml b/xml/System/Exception.xml
index 6cb8f1b74d6..2850dced2c2 100644
--- a/xml/System/Exception.xml
+++ b/xml/System/Exception.xml
@@ -873,7 +873,7 @@ The following example demonstrates how to add and retrieve information using the
 
  :::code language="csharp" source="~/snippets/csharp/System/Exception/InnerException/innerex.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Exception/InnerException/innerex.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InnerEx/VB/innerex.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Exception/InnerException/innerex.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/FormattableString.xml b/xml/System/FormattableString.xml
index c5060baf19e..e501ed4330d 100644
--- a/xml/System/FormattableString.xml
+++ b/xml/System/FormattableString.xml
@@ -269,7 +269,7 @@ Within the scope of that import directive, an interpolated string may be formatt
   
  :::code language="csharp" source="~/snippets/csharp/System/FormattableString/Format/Composite1.cs" id="Snippet9":::
  :::code language="fsharp" source="~/snippets/fsharp/System/FormattableString/Format/Composite1.fs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Formatting.Composite/vb/Composite1.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System/FormattableString/Format/Composite1.vb" id="Snippet9":::  
   
  the composite format string is `"Name = {0}, hours = {1:hh}"`.  
   
diff --git a/xml/System/GC.xml b/xml/System/GC.xml
index 43cc55c10b6..82fe595c8b6 100644
--- a/xml/System/GC.xml
+++ b/xml/System/GC.xml
@@ -318,7 +318,7 @@ Skipping zero-initialization using this API only has a material performance bene
 
  :::code language="csharp" source="~/snippets/csharp/System/GC/CancelFullGCNotification/Program.cs" id="Snippet7":::
  :::code language="fsharp" source="~/snippets/fsharp/System/GC/CancelFullGCNotification/Program.fs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GCNotification/vb/program.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System/GC/CancelFullGCNotification/program.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1605,7 +1605,7 @@ The following example demonstrates the use of the <xref:System.GC.GetGeneration%
 
  :::code language="csharp" source="~/snippets/csharp/System/GC/CancelFullGCNotification/Program.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/GC/CancelFullGCNotification/Program.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GCNotification/vb/program.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/GC/CancelFullGCNotification/program.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2286,7 +2286,7 @@ If `obj` does not have a finalizer or the GC has already signaled the finalizer
 
  :::code language="csharp" source="~/snippets/csharp/System/GC/CancelFullGCNotification/Program.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/GC/CancelFullGCNotification/Program.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GCNotification/vb/program.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/GC/CancelFullGCNotification/program.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -2468,7 +2468,7 @@ If `obj` does not have a finalizer or the GC has already signaled the finalizer
 
  :::code language="csharp" source="~/snippets/csharp/System/GC/CancelFullGCNotification/Program.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/GC/CancelFullGCNotification/Program.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GCNotification/vb/program.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/GC/CancelFullGCNotification/program.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/GCNotificationStatus.xml b/xml/System/GCNotificationStatus.xml
index f18a68f6349..ee7c7657e71 100644
--- a/xml/System/GCNotificationStatus.xml
+++ b/xml/System/GCNotificationStatus.xml
@@ -61,7 +61,7 @@
   
  :::code language="csharp" source="~/snippets/csharp/System/GC/CancelFullGCNotification/Program.cs" id="Snippet8":::
  :::code language="fsharp" source="~/snippets/fsharp/System/GC/CancelFullGCNotification/Program.fs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/GCNotification/vb/program.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System/GC/CancelFullGCNotification/program.vb" id="Snippet8":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/IAsyncResult.xml b/xml/System/IAsyncResult.xml
index ebbdd5e27e6..15c701bb4a2 100644
--- a/xml/System/IAsyncResult.xml
+++ b/xml/System/IAsyncResult.xml
@@ -76,10 +76,10 @@
  For more information and more examples of calling methods asynchronously by using delegates, see [Calling Synchronous Methods Asynchronously](/dotnet/standard/asynchronous-programming-patterns/calling-synchronous-methods-asynchronously).
 
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
  
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/waithandle.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/WaitHandle.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/WaitHandle.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
@@ -150,9 +150,9 @@
  For more information about how this callback example works, and more examples of calling methods asynchronously by using delegates, see [Calling Synchronous Methods Asynchronously](/dotnet/standard/asynchronous-programming-patterns/calling-synchronous-methods-asynchronously).
 
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/callback.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/callback.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/callback.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -225,9 +225,9 @@
  For more information and more examples of calling methods asynchronously by using delegates, see [Calling Synchronous Methods Asynchronously](/dotnet/standard/asynchronous-programming-patterns/calling-synchronous-methods-asynchronously).
 
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/waithandle.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/WaitHandle.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/WaitHandle.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -358,9 +358,9 @@
  For more information and more examples of calling methods asynchronously by using delegates, see [Calling Synchronous Methods Asynchronously](/dotnet/standard/asynchronous-programming-patterns/calling-synchronous-methods-asynchronously).
 
  :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/TestMethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/TestMethod.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/TestMethod.vb" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System/IAsyncResult/Overview/polling.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AsyncDelegateExamples/VB/polling.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System/IAsyncResult/Overview/polling.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/IComparable.xml b/xml/System/IComparable.xml
index 96e6dc7f0e8..4fade8aa2a5 100644
--- a/xml/System/IComparable.xml
+++ b/xml/System/IComparable.xml
@@ -76,7 +76,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/IComparable/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/IComparable/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IComparable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IComparable/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -166,7 +166,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/IComparable/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/IComparable/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IComparable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IComparable/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/IComparable`1.xml b/xml/System/IComparable`1.xml
index 8571195f5a4..94d52934982 100644
--- a/xml/System/IComparable`1.xml
+++ b/xml/System/IComparable`1.xml
@@ -83,7 +83,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/IComparableT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/IComparableT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IComparable`1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IComparableT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -184,7 +184,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/IComparableT/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/IComparableT/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/IComparable`1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/IComparableT/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Int16.xml b/xml/System/Int16.xml
index 0c001b4f50d..de3d944c203 100644
--- a/xml/System/Int16.xml
+++ b/xml/System/Int16.xml
@@ -454,7 +454,7 @@
  The following code example demonstrates generic and nongeneric versions of the <xref:System.Int16.CompareTo%2A> method for several value and reference types.
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -927,7 +927,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Int16/Equals/int16_equals.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Int16_Equals/FS/int16_equals.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Int16_Equals/VB/int16_equals.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Int16/Equals/int16_equals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Int32.xml b/xml/System/Int32.xml
index 4be344a2c74..3f0ef1170cd 100644
--- a/xml/System/Int32.xml
+++ b/xml/System/Int32.xml
@@ -968,7 +968,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Int32/Equals/int32_equals.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Int32_Equals/FS/int32_equals.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Int32_Equals/VB/int32_equals.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Int32/Equals/int32_equals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2134,7 +2134,7 @@ For <xref:System.Numerics.IFloatingPointIeee754%601> this method matches the IEE
  The following example is the button click event handler of a Web form. It uses the array returned by the <xref:System.Web.HttpRequest.UserLanguages%2A?displayProperty=nameWithType> property to determine the user's locale. It then instantiates a <xref:System.Globalization.CultureInfo> object that corresponds to that locale. The <xref:System.Globalization.NumberFormatInfo> object that belongs to that <xref:System.Globalization.CultureInfo> object is then passed to the <xref:System.Int32.Parse%28System.String%2CSystem.IFormatProvider%29> method to convert the user's input to an <xref:System.Int32> value.
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Parse/Default.aspx.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Int64.xml b/xml/System/Int64.xml
index c04151b833b..3efe481406e 100644
--- a/xml/System/Int64.xml
+++ b/xml/System/Int64.xml
@@ -475,7 +475,7 @@
  The following code example demonstrates generic and nongeneric versions of the <xref:System.Int64.CompareTo%2A> method for several value and reference types.
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -947,7 +947,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Int64/Equals/int64_equals.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/Int64_Equals/FS/int64_equals.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Int64_Equals/VB/int64_equals.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Int64/Equals/int64_equals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2078,7 +2078,7 @@ For <xref:System.Numerics.IFloatingPointIeee754%601> this method matches the IEE
  The following example is the button click event handler of a Web form. It uses the array returned by the <xref:System.Web.HttpRequest.UserLanguages%2A?displayProperty=nameWithType> property to determine the user's locale. It then instantiates a <xref:System.Globalization.CultureInfo> object that corresponds to that locale. The <xref:System.Globalization.NumberFormatInfo> object that belongs to that <xref:System.Globalization.CultureInfo> object is then passed to the <xref:System.Int64.Parse%28System.String%2CSystem.IFormatProvider%29> method to convert the user's input to an <xref:System.Int64> value.
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Parse/Default.aspx.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/MarshalByRefObject.xml b/xml/System/MarshalByRefObject.xml
index 994a3dca7f8..8abaacaec9d 100644
--- a/xml/System/MarshalByRefObject.xml
+++ b/xml/System/MarshalByRefObject.xml
@@ -87,7 +87,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/CreateInstanceAndUnwrap2/cpp/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/CreateInstanceAndUnwrap/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/CreateInstanceAndUnwrap/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/CreateInstanceAndUnwrap2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AppDomain/CreateInstanceAndUnwrap/source.vb" id="Snippet1":::
 
  **Example 2**
 
@@ -96,7 +96,7 @@
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR/RemotingServices.SetObjectUriForMarshal/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/MarshalByRefObject/Overview/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MarshalByRefObject/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/RemotingServices.SetObjectUriForMarshal/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MarshalByRefObject/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Math.xml b/xml/System/Math.xml
index 8018d54476a..5a62cab6025 100644
--- a/xml/System/Math.xml
+++ b/xml/System/Math.xml
@@ -69,7 +69,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Overview/mathsample.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Overview/mathsample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Overview/mathsample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -730,7 +730,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Overview/mathsample.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Overview/mathsample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Overview/mathsample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -866,7 +866,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Overview/mathsample.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Overview/mathsample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Overview/mathsample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1002,7 +1002,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Atan/atan.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Atan/atan.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.atanx/VB/atan.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Atan/atan.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1101,7 +1101,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Atan/atan.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Atan/atan.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.atanx/VB/atan.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Atan/atan.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1223,7 +1223,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/BigMul/bigmul.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/BigMul/bigmul.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.bigmul/VB/bigmul.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/BigMul/bigmul.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4416,7 +4416,7 @@ The following example demonstrates how to use the <xref:System.Math.Max%2A> meth
 
 :::code language="csharp" source="~/snippets/csharp/System/Math/Max/max.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Math/Max/max.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.max/VB/max.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/Math/Max/max.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5309,7 +5309,7 @@ The following example demonstrates how to use the <xref:System.Math.Min%2A> meth
 
 :::code language="csharp" source="~/snippets/csharp/System/Math/Min/min.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Math/Min/min.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.min/VB/min.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/Math/Min/min.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6240,7 +6240,7 @@ The following example demonstrates how to use the <xref:System.Math.Min%2A> meth
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Overview/mathsample.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Overview/mathsample.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MathSample/VB/mathsample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Overview/mathsample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7430,7 +7430,7 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Sign/sign.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Sign/sign.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Sign/sign.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7516,7 +7516,7 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Sign/sign.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Sign/sign.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Sign/sign.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7604,7 +7604,7 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Sign/sign.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Sign/sign.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Sign/sign.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7690,7 +7690,7 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Sign/sign.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Sign/sign.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Sign/sign.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7776,7 +7776,7 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Sign/sign.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Sign/sign.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Sign/sign.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7940,7 +7940,7 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Sign/sign.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Sign/sign.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Sign/sign.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8026,7 +8026,7 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Sign/sign.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Sign/sign.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.sign/VB/sign.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Sign/sign.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8400,7 +8400,7 @@ The following example demonstrates how to use the <xref:System.Math.Round%28Syst
 
  :::code language="csharp" source="~/snippets/csharp/System/Math/Atan/atan.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Math/Atan/atan.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/math.atanx/VB/atan.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Math/Atan/atan.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/MissingFieldException.xml b/xml/System/MissingFieldException.xml
index ebce9895726..9bdc56b8ad6 100644
--- a/xml/System/MissingFieldException.xml
+++ b/xml/System/MissingFieldException.xml
@@ -85,7 +85,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/MissingFieldException/Overview/MissingMethodException.cs"  interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MissingFieldException/Overview/MissingMethodException.fs"  id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MissingMethodException/vb/missingmethodexception.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MissingFieldException/Overview/missingmethodexception.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -444,7 +444,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/MissingFieldException/Overview/MissingMethodException.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MissingFieldException/Overview/MissingMethodException.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MissingMethodException/vb/missingmethodexception.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MissingFieldException/Overview/missingmethodexception.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/MissingMemberException.xml b/xml/System/MissingMemberException.xml
index 0e513307cde..a85a6a2cc0e 100644
--- a/xml/System/MissingMemberException.xml
+++ b/xml/System/MissingMemberException.xml
@@ -89,7 +89,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/MissingFieldException/Overview/MissingMethodException.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MissingFieldException/Overview/MissingMethodException.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MissingMethodException/vb/missingmethodexception.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MissingFieldException/Overview/missingmethodexception.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -626,7 +626,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/MissingFieldException/Overview/MissingMethodException.cs" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MissingFieldException/Overview/MissingMethodException.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MissingMethodException/vb/missingmethodexception.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MissingFieldException/Overview/missingmethodexception.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/MissingMethodException.xml b/xml/System/MissingMethodException.xml
index 8a14ae9f330..7dc322ef1e5 100644
--- a/xml/System/MissingMethodException.xml
+++ b/xml/System/MissingMethodException.xml
@@ -90,7 +90,7 @@ The exact timing of when statically referenced methods are loaded is unspecified
 
  :::code language="csharp" source="~/snippets/csharp/System/MissingFieldException/Overview/MissingMethodException.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MissingFieldException/Overview/MissingMethodException.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MissingMethodException/vb/missingmethodexception.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MissingFieldException/Overview/missingmethodexception.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -453,7 +453,7 @@ The exact timing of when statically referenced methods are loaded is unspecified
 
  :::code language="csharp" source="~/snippets/csharp/System/MissingFieldException/Overview/MissingMethodException.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MissingFieldException/Overview/MissingMethodException.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MissingMethodException/vb/missingmethodexception.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MissingFieldException/Overview/missingmethodexception.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/MulticastDelegate.xml b/xml/System/MulticastDelegate.xml
index 2600887cbc6..b55d1eb8251 100644
--- a/xml/System/MulticastDelegate.xml
+++ b/xml/System/MulticastDelegate.xml
@@ -91,7 +91,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/MulticastDelegate/Overview/delegatestring.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MulticastDelegate/Overview/delegatestring.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Multicast Delegate Introduction/VB/delegatestring.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MulticastDelegate/Overview/delegatestring.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Object.xml b/xml/System/Object.xml
index 2cfed09ff01..3f8e3d14cd1 100644
--- a/xml/System/Object.xml
+++ b/xml/System/Object.xml
@@ -68,7 +68,7 @@ The following example defines a Point type derived from the <xref:System.Object>
 
 :::code language="csharp" source="~/snippets/csharp/System/Object/Overview/ObjectX.cs" interactive="try-dotnet" id="snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Object/Overview/ObjectX.fs" id="snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjectX/vb/objectX.vb" id="snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/Object/Overview/objectX.vb" id="snippet1":::
       ]]></format>
     </example>
     <threadsafe>Public static (<see langword="Shared" /> in Visual Basic) members of this type are thread safe. Instance members are not guaranteed to be thread-safe.</threadsafe>
@@ -535,7 +535,7 @@ For an additional example that overrides the <xref:System.Object.Finalize%2A> me
 
  :::code language="csharp" source="~/snippets/csharp/System/Object/GetType/gettype.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Object/GetType/gettype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ECMA-System.Object.GetType/VB/gettype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Object/GetType/gettype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -711,7 +711,7 @@ To illustrate the difference between a shallow and a deep copy operation, consid
 
  :::code language="csharp" source="~/snippets/csharp/System/Object/ReferenceEquals/referenceequals.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Object/ReferenceEquals/referenceequals.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ECMA-System.Object.ReferenceEquals/vb/referenceequals.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Object/ReferenceEquals/referenceequals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/ObjectDisposedException.xml b/xml/System/ObjectDisposedException.xml
index 2b1b6db63e2..a66a073b650 100644
--- a/xml/System/ObjectDisposedException.xml
+++ b/xml/System/ObjectDisposedException.xml
@@ -89,7 +89,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/ObjectDisposedException/Overview/objdispexc.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/ObjectDisposedException/Overview/objdispexc.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObjDispEx/VB/objdispexc.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/ObjectDisposedException/Overview/objdispexc.vb" id="Snippet1":::
 
  This code produces the following output:
 
diff --git a/xml/System/ObsoleteAttribute.xml b/xml/System/ObsoleteAttribute.xml
index e43a7e87bac..0a0db3f73e4 100644
--- a/xml/System/ObsoleteAttribute.xml
+++ b/xml/System/ObsoleteAttribute.xml
@@ -81,7 +81,7 @@ The following example defines a class that contains a property and a method that
 
 :::code language="csharp" source="~/snippets/csharp/System/ObsoleteAttribute/Overview/obsoleteattributeex1.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/ObsoleteAttribute/Overview/obsoleteattributeex1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ObsoleteAttribute/vb/obsoleteattributeex1.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/ObsoleteAttribute/Overview/obsoleteattributeex1.vb" id="Snippet1":::
       ]]></format>
     </example>
     <altmember cref="T:System.Attribute" />
diff --git a/xml/System/OperatingSystem.xml b/xml/System/OperatingSystem.xml
index b39dc3f722b..bd723b68b94 100644
--- a/xml/System/OperatingSystem.xml
+++ b/xml/System/OperatingSystem.xml
@@ -1187,7 +1187,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/OperatingSystem/ServicePack/sp.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/OperatingSystem/ServicePack/sp.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/OperatingSystem.ServicePack/VB/sp.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/OperatingSystem/ServicePack/sp.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1373,7 +1373,7 @@ For a list of Windows operating system versions and their corresponding version
 
  :::code language="csharp" source="~/snippets/csharp/System/OperatingSystem/VersionString/osvs.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/OperatingSystem/VersionString/osvs.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/OperatingSystem.VersionString/VB/osvs.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/OperatingSystem/VersionString/osvs.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/PlatformID.xml b/xml/System/PlatformID.xml
index 9b80370990e..e3b6f308c92 100644
--- a/xml/System/PlatformID.xml
+++ b/xml/System/PlatformID.xml
@@ -75,7 +75,7 @@
   
  :::code language="csharp" source="~/snippets/csharp/System/PlatformID/Overview/pid.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/PlatformID/Overview/pid.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/platformID.class/VB/pid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/PlatformID/Overview/pid.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/RuntimeTypeHandle.xml b/xml/System/RuntimeTypeHandle.xml
index 426dde0eb56..7b5d382d7f2 100644
--- a/xml/System/RuntimeTypeHandle.xml
+++ b/xml/System/RuntimeTypeHandle.xml
@@ -88,7 +88,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/RuntimeTypeHandle/Overview/type_gettypehandle.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/RuntimeTypeHandle/Overview/type_gettypehandle.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeHandle/VB/type_gettypehandle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/RuntimeTypeHandle/Overview/type_gettypehandle.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/SByte.xml b/xml/System/SByte.xml
index 5b8f2425a5b..0d38af4e527 100644
--- a/xml/System/SByte.xml
+++ b/xml/System/SByte.xml
@@ -538,7 +538,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Single.xml b/xml/System/Single.xml
index 13b01da402d..373589188dd 100644
--- a/xml/System/Single.xml
+++ b/xml/System/Single.xml
@@ -1230,7 +1230,7 @@ The following code example demonstrates generic and nongeneric versions of the <
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
           ]]></format>
         </example>
         <altmember cref="M:System.Single.Equals(System.Object)" />
@@ -5232,7 +5232,7 @@ Some examples of `s` are "100", "-123,456,789", "123.45e+6", "+500", "5e2", "3.1
  The following example is the button click event handler of a Web form. It uses the array returned by the <xref:System.Web.HttpRequest.UserLanguages%2A?displayProperty=nameWithType> property to determine the user's locale. It then instantiates a <xref:System.Globalization.CultureInfo> object that corresponds to that locale. The <xref:System.Globalization.NumberFormatInfo> object that belongs to that <xref:System.Globalization.CultureInfo> object is then passed to the <xref:System.Single.Parse%28System.String%2CSystem.IFormatProvider%29> method to convert the user's input to a <xref:System.Single> value.
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Parse/Default.aspx.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/String.xml b/xml/System/String.xml
index 76cbe0f952d..5e480dedb30 100644
--- a/xml/System/String.xml
+++ b/xml/System/String.xml
@@ -828,7 +828,7 @@ The following example demonstrates how you can use this indexer in a routine to
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Chars/uri_ishexdigit.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Chars/uri_ishexdigit.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Uri_IsHexDigit/VB/uri_ishexdigit.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Chars/uri_ishexdigit.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1036,7 +1036,7 @@ In the following example, the `ReverseStringComparer` class demonstrates how you
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Compare/ArrayListSample.cs" interactive="try-dotnet" id="Snippet7":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Compare/ArrayListSample.fs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ArrayList/VB/ArrayListSample.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Compare/ArrayListSample.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1400,7 +1400,7 @@ The following example demonstrates how culture can affect a comparison. In Czech
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Compare/string.comp4.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Compare/string.comp4.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.comp4/VB/string.comp4.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Compare/string.comp4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1635,7 +1635,7 @@ The following example compares two substrings.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Compare/comp3.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Compare/comp3.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.compare3/VB/comp3.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Compare/comp3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1769,7 +1769,7 @@ The following example performs two comparisons of two substrings that only diffe
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Compare/comp4.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Compare/comp4.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.compare4/VB/comp4.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Compare/comp4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1906,7 +1906,7 @@ The following example compares two substrings.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Compare/comp3.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Compare/comp3.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.compare3/VB/comp3.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Compare/comp3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2041,7 +2041,7 @@ The following example compares two substrings using different cultures and ignor
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Compare/comp5.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Compare/comp5.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.compare5/VB/comp5.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Compare/comp5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2288,7 +2288,7 @@ The following example performs and ordinal comparison of two strings that only d
 
 :::code language="csharp" source="~/snippets/csharp/System/String/CompareOrdinal/comp0.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/CompareOrdinal/comp0.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.compareordinal/VB/comp0.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/CompareOrdinal/comp0.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2397,7 +2397,7 @@ This following example demonstrates that <xref:System.String.CompareOrdinal%2A>
 
 :::code language="csharp" source="~/snippets/csharp/System/String/CompareOrdinal/stringcompareordinal.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/CompareOrdinal/stringcompareordinal.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StringCompareOrdinal/VB/stringcompareordinal.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/CompareOrdinal/stringcompareordinal.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2526,7 +2526,7 @@ The following example uses the <xref:System.String.CompareTo%2A> method with an
 
 :::code language="csharp" source="~/snippets/csharp/System/String/CompareTo/extostring.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/CompareTo/extostring.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ExToString/VB/extostring.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/CompareTo/extostring.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2644,13 +2644,13 @@ The following example uses the <xref:System.String.CompareTo%2A> method to compa
 
 :::code language="csharp" source="~/snippets/csharp/System/String/CompareTo/stringcompareto.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/CompareTo/stringcompareto.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/StringCompareTo/VB/stringcompareto.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/CompareTo/stringcompareto.vb" id="Snippet1":::
 
 The following example demonstrates generic and non-generic versions of the CompareTo method for several value and reference types.
 
 :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2840,7 +2840,7 @@ The following example demonstrates the <xref:System.String.Concat%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Concat/string.concat5.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Concat/string.concat5.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.concat5/VB/string.concat5.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Concat/string.concat5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2919,7 +2919,7 @@ The following example demonstrates the use of the <xref:System.String.Concat%2A>
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Concat/stringconcat1.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Concat/stringconcat1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringconcat1/VB/stringconcat1.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Concat/stringconcat1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3104,7 +3104,7 @@ The following example demonstrates the use of the <xref:System.String.Concat%2A>
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Concat/stringconcat3.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Concat/stringconcat3.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringconcat3/VB/stringconcat3.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Concat/stringconcat3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3178,7 +3178,7 @@ The following example demonstrates the <xref:System.String.Concat%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Concat/string.concat5.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Concat/string.concat5.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.concat5/VB/string.concat5.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Concat/string.concat5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3300,7 +3300,7 @@ The following example concatenates a person's first, middle, and last name.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Concat/stringconcat4.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Concat/stringconcat4.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringconcat4/VB/stringconcat4.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Concat/stringconcat4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3371,7 +3371,7 @@ The following example demonstrates the <xref:System.String.Concat%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Concat/string.concat5.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Concat/string.concat5.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.concat5/VB/string.concat5.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Concat/string.concat5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3913,7 +3913,7 @@ The following example determines whether the string "fox" is a substring of a fa
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Contains/cont.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Contains/cont.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.contains/VB/cont.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Contains/cont.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4205,7 +4205,7 @@ The following example demonstrates the <xref:System.String.CopyTo%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/CopyTo/stringcopyto.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/CopyTo/stringcopyto.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringcopyto/VB/stringcopyto.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/CopyTo/stringcopyto.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4589,7 +4589,7 @@ The following example defines a `StripEndTags` method that uses the <xref:System
 
 :::code language="csharp" source="~/snippets/csharp/System/String/EndsWith/stringendswith.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/EndsWith/stringendswith.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringendswith/VB/stringendswith.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/EndsWith/stringendswith.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4887,7 +4887,7 @@ The following example demonstrates the <xref:System.String.Equals%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Equals/equals.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Equals/equals.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.equals/VB/equals.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Equals/equals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5050,7 +5050,7 @@ The following example demonstrates the <xref:System.String.Equals%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Equals/equals.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Equals/equals.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.equals/VB/equals.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Equals/equals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6910,7 +6910,7 @@ The following example displays the <xref:System.TypeCode> enumerated constant fo
 
 :::code language="csharp" source="~/snippets/csharp/System/String/GetTypeCode/gtc.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/GetTypeCode/gtc.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.gettypecode/VB/gtc.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/GetTypeCode/gtc.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7075,7 +7075,7 @@ The following example uses the <xref:System.String.IndexOf%2A> method to determi
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IndexOf/stringinsert.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IndexOf/stringinsert.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringinsert/VB/stringinsert.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IndexOf/stringinsert.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7160,7 +7160,7 @@ The following example demonstrates the <xref:System.String.IndexOf%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IndexOf/ixof1.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IndexOf/ixof1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.indexof1/VB/ixof1.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IndexOf/ixof1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7293,7 +7293,7 @@ The following example searches for all occurrences of a specified string within
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IndexOf/stringindexof4.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IndexOf/stringindexof4.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringindexof4/VB/stringindexof4.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IndexOf/stringindexof4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7561,7 +7561,7 @@ The following example finds the index of all occurrences of the string "he" with
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IndexOf/ixof8.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IndexOf/ixof8.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.indexof8/VB/ixof8.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IndexOf/ixof8.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7939,7 +7939,7 @@ The following example finds the index of the occurrence of any character of the
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IndexOfAny/ixany2.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IndexOfAny/ixany2.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.indexofany2/VB/ixany2.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IndexOfAny/ixany2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8032,7 +8032,7 @@ The following example finds the index of the occurrence of any character of the
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IndexOfAny/ixany3.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IndexOfAny/ixany3.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.indexofany3/VB/ixany3.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IndexOfAny/ixany3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8128,7 +8128,7 @@ The following console application prompts the users to enter one or more adjecti
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IndexOf/stringinsert.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IndexOf/stringinsert.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringinsert/VB/stringinsert.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IndexOf/stringinsert.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8296,7 +8296,7 @@ The following example demonstrates that literal strings are interned automatical
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IsInterned/isin.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IsInterned/isin.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.isinterned/VB/isin.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IsInterned/isin.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8321,7 +8321,7 @@ The following example determines whether a string is successfully normalized to
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IsNormalized/norm.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IsNormalized/norm.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.normalize/VB/norm.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IsNormalized/norm.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9242,7 +9242,7 @@ The following example demonstrates the <xref:System.String.Join%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Join/stringjoin.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Join/stringjoin.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringjoin/VB/stringjoin.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Join/stringjoin.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9409,7 +9409,7 @@ The following example concatenates two elements from an array of names of fruit.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Join/join2.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Join/join2.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.join2/VB/join2.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Join/join2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9831,7 +9831,7 @@ The following example finds the index of all occurrences of a character in a str
 
 :::code language="csharp" source="~/snippets/csharp/System/String/LastIndexOf/lastixof1.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/LastIndexOf/lastixof1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.lastindexof1/VB/lastixof1.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/LastIndexOf/lastixof1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9912,7 +9912,7 @@ The following example finds the index of all occurrences of a string in target s
 
 :::code language="csharp" source="~/snippets/csharp/System/String/LastIndexOf/lastixof7.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/LastIndexOf/lastixof7.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOf7/VB/lastixof7.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/LastIndexOf/lastixof7.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10099,7 +10099,7 @@ The following example finds the index of all occurrences of a character in a sub
 
 :::code language="csharp" source="~/snippets/csharp/System/String/LastIndexOf/lastixof2.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/LastIndexOf/lastixof2.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.lastindexof2/VB/lastixof2.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/LastIndexOf/lastixof2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10188,7 +10188,7 @@ The following example finds the index of all occurrences of a string in substrin
 
 :::code language="csharp" source="~/snippets/csharp/System/String/LastIndexOf/lastixof8.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/LastIndexOf/lastixof8.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOf8/VB/lastixof8.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/LastIndexOf/lastixof8.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10504,7 +10504,7 @@ The following example finds the index of the last occurrence of any character in
 
 :::code language="csharp" source="~/snippets/csharp/System/String/LastIndexOfAny/lastixany1.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/LastIndexOfAny/lastixany1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny1/VB/lastixany1.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/LastIndexOfAny/lastixany1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10581,7 +10581,7 @@ The following example finds the index of the last occurrence of any character in
 
 :::code language="csharp" source="~/snippets/csharp/System/String/LastIndexOfAny/lastixany2.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/LastIndexOfAny/lastixany2.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny2/VB/lastixany2.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/LastIndexOfAny/lastixany2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10667,7 +10667,7 @@ The following example finds the index of the last occurrence of any character in
 
 :::code language="csharp" source="~/snippets/csharp/System/String/LastIndexOfAny/lastixany3.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/LastIndexOfAny/lastixany3.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.LastIndexOfAny3/VB/lastixany3.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/LastIndexOfAny/lastixany3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10751,7 +10751,7 @@ The following example demonstrates the <xref:System.String.Length%2A> property.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Length/length.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Length/length.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.length/VB/length.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Length/length.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10774,7 +10774,7 @@ The following example normalizes a string to each of four normalization forms, c
 
 :::code language="csharp" source="~/snippets/csharp/System/String/IsNormalized/norm.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/IsNormalized/norm.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.normalize/VB/norm.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/IsNormalized/norm.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11522,7 +11522,7 @@ The following example demonstrates the <xref:System.String.Remove%2A> method. Th
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Remove/r.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Remove/r.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.remove/VB/r.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Remove/r.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11610,7 +11610,7 @@ The following example demonstrates how you can remove the middle name from a com
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Remove/stringremove.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Remove/stringremove.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringremove/VB/stringremove.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Remove/stringremove.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11716,7 +11716,7 @@ The following example creates a comma separated value list by substituting comma
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Replace/string.replace1.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Replace/string.replace1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.replace1/VB/string.replace1.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Replace/string.replace1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11818,7 +11818,7 @@ The following example demonstrates how you can use the <xref:System.String.Repla
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Replace/stringreplace.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Replace/stringreplace.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringreplace/VB/stringreplace.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Replace/stringreplace.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13274,7 +13274,7 @@ The following example defines a `StripStartTags` method that uses the <xref:Syst
 
 :::code language="csharp" source="~/snippets/csharp/System/String/StartsWith/stringstartswith.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/StartsWith/stringstartswith.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/stringstartswith/VB/stringstartswith.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/StartsWith/stringstartswith.vb" id="Snippet1":::
 
           ]]></format>
         </remarks>
@@ -13851,7 +13851,7 @@ The following example uses the <xref:System.String.CompareTo%2A> method with an
 
 :::code language="csharp" source="~/snippets/csharp/System/String/CompareTo/extostring.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/CompareTo/extostring.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ExToString/VB/extostring.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/CompareTo/extostring.vb" id="Snippet1":::
 
           ]]></format>
         </remarks>
@@ -13897,7 +13897,7 @@ The following example displays the <xref:System.TypeCode> enumerated constant fo
 
 :::code language="csharp" source="~/snippets/csharp/System/String/GetTypeCode/gtc.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/GetTypeCode/gtc.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.gettypecode/VB/gtc.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/GetTypeCode/gtc.vb" id="Snippet1":::
 
           ]]></format>
         </remarks>
@@ -15261,7 +15261,7 @@ The following example converts a substring within a string to an array of charac
 
 :::code language="csharp" source="~/snippets/csharp/System/String/ToCharArray/tocharry1.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/ToCharArray/tocharry1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.ToCharArray1/VB/tocharry1.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/ToCharArray/tocharry1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -15595,7 +15595,7 @@ The following example demonstrates the <xref:System.String.ToString%2A> method.N
 
 :::code language="csharp" source="~/snippets/csharp/System/String/ToString/string.tostring.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/ToString/string.tostring.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/string.tostring/VB/string.tostring.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/ToString/string.tostring.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/TimeSpan.xml b/xml/System/TimeSpan.xml
index 6598a9592ae..929802ac1ac 100644
--- a/xml/System/TimeSpan.xml
+++ b/xml/System/TimeSpan.xml
@@ -814,7 +814,7 @@ The specified `days`, `hours`, `minutes`, `seconds`, `milliseconds`, and `micros
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1175,7 +1175,7 @@ The specified `days`, `hours`, `minutes`, `seconds`, `milliseconds`, and `micros
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/TimeoutException.xml b/xml/System/TimeoutException.xml
index 322b6b3bee5..ac1ef30eba7 100644
--- a/xml/System/TimeoutException.xml
+++ b/xml/System/TimeoutException.xml
@@ -86,7 +86,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/TimeoutException/Overview/to.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/TimeoutException/Overview/to.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TimeoutException.class/VB/to.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/TimeoutException/Overview/to.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Type.xml b/xml/System/Type.xml
index 8ce48e5d670..974d7c9b502 100644
--- a/xml/System/Type.xml
+++ b/xml/System/Type.xml
@@ -255,7 +255,7 @@ The code example uses the <xref:System.Reflection.MethodInfo> to invoke the <xre
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/Assembly/type_assembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/Assembly/type_assembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_Assembly/VB/type_assembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/Assembly/type_assembly.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -361,7 +361,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/Assembly/type_assembly.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/Assembly/type_assembly.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_Assembly/VB/type_assembly.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/Assembly/type_assembly.vb" id="Snippet1":::
 
  The following example compares the strings returned by the <xref:System.Type.ToString%2A> method and the <xref:System.Type.Name%2A>, <xref:System.Type.FullName%2A>, and `AssemblyQualifiedName` properties.
 
@@ -522,7 +522,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/BaseType/testbasetype.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/BaseType/testbasetype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TestBaseType/VB/testbasetype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/BaseType/testbasetype.vb" id="Snippet1":::
 
  The following example uses recursion to list the complete inheritance hierarchy of each class found in an assembly. The example defines a class named `C` that derives from a class named `B`, which, in turn, derives from a class named `A`.
 
@@ -680,7 +680,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/DeclaringMethod/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/DeclaringMethod/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/MethodInfo.Generics/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/DeclaringMethod/source.vb" id="Snippet1":::
 
    ]]></format>
         </remarks>
@@ -858,7 +858,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/DefaultBinder/type_defaultbinder.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/DefaultBinder/type_defaultbinder.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_DefaultBinder/VB/type_defaultbinder.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/DefaultBinder/type_defaultbinder.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1181,7 +1181,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/FilterAttribute/type_filterattribute.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/FilterAttribute/type_filterattribute.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_FilterAttribute/VB/type_filterattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/FilterAttribute/type_filterattribute.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1301,7 +1301,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/FilterNameIgnoreCase/type_filternameignorecase.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/FilterNameIgnoreCase/type_filternameignorecase.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_FilterNameIgnoreCase/VB/type_filternameignorecase.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/FilterNameIgnoreCase/type_filternameignorecase.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1394,7 +1394,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/FindInterfaces/type_findinterfaces.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/FindInterfaces/type_findinterfaces.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_FindInterfaces/VB/type_findinterfaces.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/FindInterfaces/type_findinterfaces.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1529,7 +1529,7 @@ The `filter` argument can be a custom delegate of type <xref:System.Reflection.M
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/FindMembers/type_findmembers.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/FindMembers/type_findmembers.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_FindMembers/VB/type_findmembers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/FindMembers/type_findmembers.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1644,7 +1644,7 @@ The `filter` argument can be a custom delegate of type <xref:System.Reflection.M
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/FullName/testfullname.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/FullName/testfullname.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TestFullName/VB/testfullname.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/FullName/testfullname.vb" id="Snippet1":::
 
  The following example compares the strings returned by the <xref:System.Type.ToString%2A> method and the <xref:System.Type.Name%2A>, `FullName`, and <xref:System.Type.AssemblyQualifiedName%2A> properties.
 
@@ -1925,7 +1925,7 @@ The `filter` argument can be a custom delegate of type <xref:System.Reflection.M
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetArrayRank/type_getarrayrank.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetArrayRank/type_getarrayrank.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetArrayRank/VB/type_getarrayrank.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetArrayRank/type_getarrayrank.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2076,7 +2076,7 @@ The `filter` argument can be a custom delegate of type <xref:System.Reflection.M
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetConstructor/type_getconstructor.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetConstructor/type_getconstructor.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor/VB/type_getconstructor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetConstructor/type_getconstructor.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2262,7 +2262,7 @@ The `filter` argument can be a custom delegate of type <xref:System.Reflection.M
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetConstructor/type_getconstructor2.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetConstructor/type_getconstructor2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor2/VB/type_getconstructor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetConstructor/type_getconstructor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2424,7 +2424,7 @@ The `filter` argument can be a custom delegate of type <xref:System.Reflection.M
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetConstructor/type_getconstructor3.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetConstructor/type_getconstructor3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetConstructor3/VB/type_getconstructor3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetConstructor/type_getconstructor3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2899,7 +2899,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetDefaultMembers/type_getdefaultmembers.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetDefaultMembers/type_getdefaultmembers.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetDefaultMembers/VB/type_getdefaultmembers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetDefaultMembers/type_getdefaultmembers.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2970,7 +2970,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetElementType/testgetelementtype.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetElementType/testgetelementtype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TestGetElementType/VB/testgetelementtype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetElementType/testgetelementtype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3327,7 +3327,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetEvent/type_getevent.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetEvent/type_getevent.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetEvent/VB/type_getevent.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetEvent/type_getevent.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3438,7 +3438,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetEvent/type_getevent1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetEvent/type_getevent1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/type_getevent1/VB/type_getevent1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetEvent/type_getevent1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3553,7 +3553,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetEvents/type_getevents1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetEvents/type_getevents1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/type_getevents1/VB/type_getevents1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetEvents/type_getevents1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3657,7 +3657,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetEvents/type_getevents2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetEvents/type_getevents2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/type_getevents2/VB/type_getevents2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetEvents/type_getevents2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3755,7 +3755,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetField/type_getfield.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetField/type_getfield.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetField/VB/type_getfield.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetField/type_getfield.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3883,7 +3883,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetField/type_getfield.cs" interactive="try-dotnet" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetField/type_getfield.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetField/VB/type_getfield.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetField/type_getfield.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3995,7 +3995,7 @@ If the current <xref:System.Type> represents a generic type parameter, the <xref
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetFields/fieldinfo_isspecialname.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetFields/fieldinfo_isspecialname.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/FieldInfo_IsSpecialName/VB/fieldinfo_isspecialname.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetFields/fieldinfo_isspecialname.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4500,7 +4500,7 @@ In .NET 6 and earlier versions, the <xref:System.Type.GetFields%2A> method does
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetHashCode/type_gethashcode_getfields.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetHashCode/type_gethashcode_getfields.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetHashCode_GetFields/VB/type_gethashcode_getfields.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetHashCode/type_gethashcode_getfields.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4603,7 +4603,7 @@ In .NET 6 and earlier versions, the <xref:System.Type.GetFields%2A> method does
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetInterface/type_getinterface.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetInterface/type_getinterface.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetInterface/VB/type_getinterface.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetInterface/type_getinterface.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4706,7 +4706,7 @@ In .NET 6 and earlier versions, the <xref:System.Type.GetFields%2A> method does
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetInterface/type_getinterface.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetInterface/type_getinterface.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetInterface/VB/type_getinterface.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetInterface/type_getinterface.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -4888,7 +4888,7 @@ The current instance or <paramref name="interfaceType" /> argument is an open ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetInterfaces/type_getinterfaces1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetInterfaces/type_getinterfaces1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetInterfaces1/VB/type_getinterfaces1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetInterfaces/type_getinterfaces1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5004,7 +5004,7 @@ The current instance or <paramref name="interfaceType" /> argument is an open ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMember/type_getmember.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMember/type_getmember.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMember/VB/type_getmember.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMember/type_getmember.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5124,7 +5124,7 @@ The current instance or <paramref name="interfaceType" /> argument is an open ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMember/type_getmember.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMember/type_getmember.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMember/VB/type_getmember.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMember/type_getmember.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -5244,7 +5244,7 @@ The current instance or <paramref name="interfaceType" /> argument is an open ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMember/type_getmember.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMember/type_getmember.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMember/VB/type_getmember.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMember/type_getmember.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -5366,7 +5366,7 @@ Members include properties, methods, constructors, fields, events, and nested ty
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMembers/type_getmembers1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMembers/type_getmembers1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMembers1/VB/type_getmembers1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMembers/type_getmembers1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5482,7 +5482,7 @@ In .NET 6 and earlier versions, the <xref:System.Type.GetMembers%2A> method does
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMembers/type_getmembers2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMembers/type_getmembers2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMembers2/VB/type_getmembers2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMembers/type_getmembers2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5646,7 +5646,7 @@ This method can be used to find a constructed generic member given a member from
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMethod/type_getmethod1.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMethod/type_getmethod1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod1/VB/type_getmethod1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMethod/type_getmethod1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5779,7 +5779,7 @@ This method can be used to find a constructed generic member given a member from
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMethod/type_getmethod2.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMethod/type_getmethod2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod2/VB/type_getmethod2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMethod/type_getmethod2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5887,7 +5887,7 @@ This method can be used to find a constructed generic member given a member from
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMethod/type_getmethod4.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMethod/type_getmethod4.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod4/VB/type_getmethod4.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMethod/type_getmethod4.vb" id="Snippet1":::
 
  The following example retrieves <xref:System.Reflection.MethodInfo> objects that represent the `Add` methods  of a non-generic type (the <xref:System.Collections.ArrayList> class), an open generic type (the <xref:System.Collections.Generic.List%601> class), and a closed generic type (the `List(Of String)` type.
 
@@ -6436,7 +6436,7 @@ One of the elements in the <paramref name="types" /> array is <see langword="nul
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMethod/type_getmethod5.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMethod/type_getmethod5.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod5/VB/type_getmethod5.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMethod/type_getmethod5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6714,7 +6714,7 @@ One of the elements in the <paramref name="types" /> array is <see langword="nul
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMethod/type_getmethod3.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetMethod/type_getmethod3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethod3/VB/type_getmethod3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMethod/type_getmethod3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7275,7 +7275,7 @@ If the current <xref:System.Type> represents a type parameter in the definition
  The following example creates a class with two public methods and one protected method, creates a `Type` object corresponding to `MyTypeClass`, gets all public and non-public methods, and displays their names.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetMethods/type_getmethods2.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetMethods2/VB/type_getmethods2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetMethods/type_getmethods2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7605,7 +7605,7 @@ If the current <xref:System.Type> represents a type parameter in the definition
  The following example defines a nested class and a `struct` in `MyClass`, and then obtains objects of the nested types using the type of `MyClass`.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetNestedTypes/type_getnestedtypes.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetNestedTypes/VB/type_getnestedtypes.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetNestedTypes/type_getnestedtypes.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7706,7 +7706,7 @@ If the current <xref:System.Type> represents a type parameter in the definition
  The following example creates two nested public classes and two nested protected classes, and displays information for classes that match the specified binding constraints.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetNestedTypes/type_getnestedclassesabs.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetNestedClassesAbs/VB/type_getnestedclassesabs.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetNestedTypes/type_getnestedclassesabs.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7863,7 +7863,7 @@ If the current <xref:System.Type> represents a type parameter in the definition
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetProperties/type_gettypecode.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetProperties/type_gettypecode.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeCode/VB/type_gettypecode.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetProperties/type_gettypecode.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -7971,7 +7971,7 @@ In .NET 6 and earlier versions, the <xref:System.Type.GetProperties%2A> method d
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetProperties/type_getproperties2.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetProperties/type_getproperties2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperties2/VB/type_getproperties2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetProperties/type_getproperties2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8153,7 +8153,7 @@ The following example retrieves the `Type` object of a user-defined class, retri
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetProperty/type_getproperty2.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetProperty/type_getproperty2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty2/VB/type_getproperty2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetProperty/type_getproperty2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8249,7 +8249,7 @@ The following example retrieves the `Type` object of a user-defined class, retri
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetProperty/type_getproperty_types.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetProperty/type_getproperty_types.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty_Types/VB/type_getproperty_types.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetProperty/type_getproperty_types.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8347,7 +8347,7 @@ The following example retrieves the `Type` object of a user-defined class, retri
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetProperty/type_getproperty3.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetProperty/type_getproperty3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty3/VB/type_getproperty3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetProperty/type_getproperty3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8573,7 +8573,7 @@ The following example retrieves the `Type` object of a user-defined class, retri
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetProperty/type_getproperty21.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetProperty/type_getproperty21.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetProperty5/VB/type_getproperty2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetProperty/type_getproperty21.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9144,7 +9144,7 @@ Type.GetType("System.Collections.Generic.Dictionary`2[System.String,[MyType,MyAs
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetType/type_gettype.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetType/type_gettype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetType/VB/type_gettype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetType/type_gettype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -9356,7 +9356,7 @@ Type.GetType("System.Collections.Generic.Dictionary`2[System.String,[MyType,MyAs
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetType/type_gettype.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetType/type_gettype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetType/VB/type_gettype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetType/type_gettype.vb" id="Snippet1":::
 
 
  ]]></format>
@@ -10077,7 +10077,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetProperties/type_gettypecode.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetProperties/type_gettypecode.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeCode/VB/type_gettypecode.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetProperties/type_gettypecode.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -10672,7 +10672,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetTypeFromHandle/type_gettypefromhandle.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetTypeFromHandle/type_gettypefromhandle.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromHandle/VB/type_gettypefromhandle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetTypeFromHandle/type_gettypefromhandle.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10843,7 +10843,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetTypeFromProgID/type_gettypefromprogid2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetTypeFromProgID/type_gettypefromprogid2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID2/VB/type_gettypefromprogid2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -10928,7 +10928,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetTypeFromProgID/type_gettypefromprogid3.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetTypeFromProgID/type_gettypefromprogid3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID3/VB/type_gettypefromprogid3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11019,7 +11019,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetTypeFromProgID/type_gettypefromprogid4.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetTypeFromProgID/type_gettypefromprogid4.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeFromProgID4/VB/type_gettypefromprogid4.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetTypeFromProgID/type_gettypefromprogid4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11085,7 +11085,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/RuntimeTypeHandle/Overview/type_gettypehandle.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/RuntimeTypeHandle/Overview/type_gettypehandle.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_GetTypeHandle/VB/type_gettypehandle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/RuntimeTypeHandle/Overview/type_gettypehandle.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11150,7 +11150,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GUID/type_guid.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GUID/type_guid.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_Guid/VB/type_guid.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GUID/type_guid.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11218,7 +11218,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/HasElementType/type_haselementtype.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/HasElementType/type_haselementtype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_HasElementType/VB/type_haselementtype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/HasElementType/type_haselementtype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11283,7 +11283,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/HasElementTypeImpl/type_haselementtypeimpl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/HasElementTypeImpl/type_haselementtypeimpl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_HasElementTypeImpl/VB/type_haselementtypeimpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/HasElementTypeImpl/type_haselementtypeimpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11471,7 +11471,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/InvokeMember/invokemem.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/InvokeMember/invokemem.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/InvokeMem/VB/invokemem.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/InvokeMember/invokemem.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -12158,7 +12158,7 @@ Calling this method overload is the same as calling the <xref:System.Type.GetTyp
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsAnsiClass/type_isansiclass.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsAnsiClass/type_isansiclass.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsAnsiClass/VB/type_isansiclass.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsAnsiClass/type_isansiclass.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -12303,7 +12303,7 @@ GetType(Array).IsAssignableFrom(type)
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsArrayImpl/type_isarrayimpl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsArrayImpl/type_isarrayimpl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsArrayImpl/VB/type_isarrayimpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsArrayImpl/type_isarrayimpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -12416,7 +12416,7 @@ GetType(Array).IsAssignableFrom(type)
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsAssignableFrom/testisassignablefrom.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsAssignableFrom/testisassignablefrom.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TestIsAssignableFrom/VB/testisassignablefrom.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsAssignableFrom/testisassignablefrom.vb" id="Snippet1":::
 
  In the following example, the current instance is a <xref:System.Type> object that represents the <xref:System.IO.Stream> class. `GenericWithConstraint` is a generic type whose generic type parameter must be of type <xref:System.IO.Stream>. Passing its generic type parameter to the `IsAssignableFrom` method indicates that an instance of the generic type parameter can be assigned to an <xref:System.IO.Stream> object.
 
@@ -12608,7 +12608,7 @@ GetType(Array).IsAssignableFrom(type)
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsAutoLayout/type_isautolayout.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsAutoLayout/type_isautolayout.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsAutoLayout/VB/type_isautolayout.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsAutoLayout/type_isautolayout.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -12680,7 +12680,7 @@ GetType(Array).IsAssignableFrom(type)
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/HasElementTypeImpl/type_haselementtypeimpl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/HasElementTypeImpl/type_haselementtypeimpl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_HasElementTypeImpl/VB/type_haselementtypeimpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/HasElementTypeImpl/type_haselementtypeimpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -12838,7 +12838,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsClass/type_isclass.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsClass/type_isclass.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsClass/VB/type_isclass.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsClass/type_isclass.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13071,7 +13071,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsContextful/type_iscontextful.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsContextful/type_iscontextful.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsContextful/VB/type_iscontextful.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsContextful/type_iscontextful.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13133,7 +13133,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsContextfulImpl/type_iscontextfulimpl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsContextfulImpl/type_iscontextfulimpl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsContextfulImpl/VB/type_iscontextfulimpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsContextfulImpl/type_iscontextfulimpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13210,7 +13210,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsEnum/testisenum.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsEnum/testisenum.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TestIsEnum/VB/testisenum.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsEnum/testisenum.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13393,7 +13393,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsExplicitLayout/type_isexplicitlayout.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsExplicitLayout/type_isexplicitlayout.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsExplicitLayout/VB/type_isexplicitlayout.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsExplicitLayout/type_isexplicitlayout.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13872,7 +13872,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsInstanceOfType/testisinstanceoftype.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsInstanceOfType/testisinstanceoftype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TestIsInstanceOfType/VB/testisinstanceoftype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsInstanceOfType/testisinstanceoftype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13943,7 +13943,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsInterface/type_isinterface.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsInterface/type_isinterface.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsInterface/VB/type_isinterface.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsInterface/type_isinterface.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14016,7 +14016,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsLayoutSequential/type_islayoutsequential.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsLayoutSequential/type_islayoutsequential.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsLayoutSequential/VB/type_islayoutsequential.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsLayoutSequential/type_islayoutsequential.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14076,7 +14076,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsContextful/type_iscontextful.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsContextful/type_iscontextful.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsContextful/VB/type_iscontextful.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsContextful/type_iscontextful.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14136,7 +14136,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsMarshalByRefImpl/type_ismarshalbyrefimpl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsMarshalByRefImpl/type_ismarshalbyrefimpl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsMarshalByRefImpl/VB/type_ismarshalbyrefimpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsMarshalByRefImpl/type_ismarshalbyrefimpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14755,7 +14755,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/HasElementTypeImpl/type_haselementtypeimpl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/HasElementTypeImpl/type_haselementtypeimpl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_HasElementTypeImpl/VB/type_haselementtypeimpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/HasElementTypeImpl/type_haselementtypeimpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14863,7 +14863,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsContextful/type_iscontextful.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsContextful/type_iscontextful.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsContextful/VB/type_iscontextful.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsContextful/type_iscontextful.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14935,7 +14935,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsPrimitiveImpl/type_isprimitiveimpl.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsPrimitiveImpl/type_isprimitiveimpl.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsPrimitiveImpl/VB/type_isprimitiveimpl.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsPrimitiveImpl/type_isprimitiveimpl.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -15019,7 +15019,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsPublic/type_ispublic.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsPublic/type_ispublic.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type.IsPublic/VB/type_ispublic.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsPublic/type_ispublic.vb" id="Snippet1":::
 
  For nested classes, ignore the results of `IsPublic` and `IsNotPublic` and pay attention only to the results of <xref:System.Type.IsNestedPublic%2A> and <xref:System.Type.IsNestedPrivate%2A>.
 
@@ -15083,7 +15083,7 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsSealed/type_issealed.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsSealed/type_issealed.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsSealed/VB/type_issealed.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsSealed/type_issealed.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -15343,7 +15343,7 @@ Types that are defined in the .NET Standard are not marked with <xref:System.Ser
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsSerializable/type_isserializable.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsSerializable/type_isserializable.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsSerializable/VB/type_isserializable.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsSerializable/type_isserializable.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -15538,7 +15538,7 @@ A signature type is a restricted type that can be passed to the <xref:System.Typ
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsSubclassOf/testissubclassof.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsSubclassOf/testissubclassof.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TestIsSubclassOf/VB/testissubclassof.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsSubclassOf/testissubclassof.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -15778,7 +15778,7 @@ A signature type is a restricted type that can be passed to the <xref:System.Typ
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsValueType/type_isvaluetype.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsValueType/type_isvaluetype.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_IsValueType/VB/type_isvaluetype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsValueType/type_isvaluetype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -16663,7 +16663,7 @@ The following example uses the <xref:System.Type.MakeGenericType%2A> method to c
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/Module/type_tostring.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/Module/type_tostring.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_ToString/VB/type_tostring.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/Module/type_tostring.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -16769,7 +16769,7 @@ The following example uses the <xref:System.Type.MakeGenericType%2A> method to c
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/Module/type_tostring.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/Module/type_tostring.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_ToString/VB/type_tostring.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/Module/type_tostring.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -17139,7 +17139,7 @@ The following example uses the <xref:System.Type.MakeGenericType%2A> method to c
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/StructLayoutAttribute/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/StructLayoutAttribute/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type.StructLayoutAttribute/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/StructLayoutAttribute/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -17406,7 +17406,7 @@ The following example uses the <xref:System.Type.MakeGenericType%2A> method to c
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/Module/type_tostring.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/Module/type_tostring.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_ToString/VB/type_tostring.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/Module/type_tostring.vb" id="Snippet1":::
 
  The following example compares the strings returned by the `ToString` method and the <xref:System.Type.Name%2A>, <xref:System.Type.FullName%2A>, and <xref:System.Type.AssemblyQualifiedName%2A> properties.
 
@@ -17480,7 +17480,7 @@ The following example uses the <xref:System.Type.MakeGenericType%2A> method to c
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/TypeHandle/type_typehandle.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/TypeHandle/type_typehandle.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/Type_TypeHandle/VB/type_typehandle.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/TypeHandle/type_typehandle.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/TypeLoadException.xml b/xml/System/TypeLoadException.xml
index 82a40161832..78a8f2d92f0 100644
--- a/xml/System/TypeLoadException.xml
+++ b/xml/System/TypeLoadException.xml
@@ -224,7 +224,7 @@ The exact timing of when statically referenced types are loaded is unspecified.
  The following code example demonstrates the <xref:System.TypeLoadException.%23ctor%28System.String%29> constructor. It contains a method that generates a <xref:System.TypeLoadException> with a custom message, and displays the error message to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System/TypeLoadException/.ctor/typeloadexception_constructor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_Constructor2/VB/typeloadexception_constructor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_constructor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -296,7 +296,7 @@ The exact timing of when statically referenced types are loaded is unspecified.
  The following example generates an exception, and serializes the exception data to a file, and then reconstitutes the exception. For this code example to run, you must provide the fully qualified assembly name. For information about how to obtain the fully qualified assembly name, see [Assembly Names](/dotnet/standard/assembly/names).
 
  :::code language="csharp" source="~/snippets/csharp/System/TypeLoadException/.ctor/typeloadexception_getobjectdata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_GetObjectData/VB/typeloadexception_getobjectdata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_getobjectdata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -368,7 +368,7 @@ The exact timing of when statically referenced types are loaded is unspecified.
  The following code example demonstrates the <xref:System.TypeLoadException.%23ctor%28System.String%2CSystem.Exception%29> constructor. It contains a method that generates a <xref:System.TypeLoadException>, catches that exception, and throws a new <xref:System.TypeLoadException> with a custom message, including the original <xref:System.TypeLoadException> as the inner exception.
 
  :::code language="csharp" source="~/snippets/csharp/System/TypeLoadException/.ctor/typeloadexception_constructor3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_Constructor3/VB/typeloadexception_constructor3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_constructor3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -451,7 +451,7 @@ The exact timing of when statically referenced types are loaded is unspecified.
  The following example generates an exception, and serializes the exception data to a file, and then reconstitutes the exception. For this code example to run, you must provide the fully qualified assembly name. For information about how to obtain the fully qualified assembly name, see [Assembly Names](/dotnet/standard/assembly/names).
 
  :::code language="csharp" source="~/snippets/csharp/System/TypeLoadException/.ctor/typeloadexception_getobjectdata.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_GetObjectData/VB/typeloadexception_getobjectdata.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/TypeLoadException/.ctor/typeloadexception_getobjectdata.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -522,7 +522,7 @@ The exact timing of when statically referenced types are loaded is unspecified.
  The following example attempts to load a non-existent type from the mscorlib assembly. The resulting exception is caught, and the <xref:System.TypeLoadException.TypeName%2A> and <xref:System.TypeLoadException.Message%2A> values are displayed. For this code example to run, you must provide the fully qualified assembly name. For information about how to obtain the fully qualified assembly name, see [Assembly Names](/dotnet/standard/assembly/names).
 
  :::code language="csharp" source="~/snippets/csharp/System/TypeLoadException/Message/typeloadexception_typename.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_TypeName/VB/typeloadexception_typename.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/TypeLoadException/Message/typeloadexception_typename.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -577,7 +577,7 @@ The exact timing of when statically referenced types are loaded is unspecified.
  The following example attempts to load a non-existent type from the mscorlib assembly. The resulting exception is caught, and the <xref:System.TypeLoadException.TypeName%2A> and <xref:System.TypeLoadException.Message%2A> values are displayed. For this code example to run, you must provide the fully qualified assembly name. For information about how to obtain the fully qualified assembly name, see [Assembly Names](/dotnet/standard/assembly/names).
 
  :::code language="csharp" source="~/snippets/csharp/System/TypeLoadException/Message/typeloadexception_typename.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/TypeLoadException_TypeName/VB/typeloadexception_typename.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/TypeLoadException/Message/typeloadexception_typename.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/UInt16.xml b/xml/System/UInt16.xml
index 6a68d28c104..d749633ea54 100644
--- a/xml/System/UInt16.xml
+++ b/xml/System/UInt16.xml
@@ -413,7 +413,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/UInt16/CompareTo/source.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UInt16/CompareTo/source.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/UInt16 Example/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UInt16/CompareTo/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -507,7 +507,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -792,7 +792,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/UInt16/Equals/uint16_equals.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UInt16/Equals/uint16_equals.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/UInt16_Equals/VB/uint16_equals.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UInt16/Equals/uint16_equals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/UInt32.xml b/xml/System/UInt32.xml
index 29ce9263424..c185b3c31d6 100644
--- a/xml/System/UInt32.xml
+++ b/xml/System/UInt32.xml
@@ -447,7 +447,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/UInt32/CompareTo/source.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UInt32/CompareTo/source.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/UInt32 Example/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UInt32/CompareTo/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -541,7 +541,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -832,7 +832,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/UInt32/Equals/uint32_equals.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UInt32/Equals/uint32_equals.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/UInt32_Equals/VB/uint32_equals.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UInt32/Equals/uint32_equals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1444,7 +1444,7 @@ For <xref:System.Numerics.IFloatingPoint%601> this method matches the IEEE 754:2
 
  :::code language="csharp" source="~/snippets/csharp/System/UInt32/CompareTo/source.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UInt32/CompareTo/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/UInt32 Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UInt32/CompareTo/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1895,7 +1895,7 @@ For <xref:System.Numerics.IFloatingPoint%601> this method matches the IEEE 754:2
  The following example is the button click event handler of a Web form. It uses the array returned by the <xref:System.Web.HttpRequest.UserLanguages%2A?displayProperty=nameWithType> property to determine the user's locale. It then instantiates a <xref:System.Globalization.CultureInfo> object that corresponds to that locale. The <xref:System.Globalization.NumberFormatInfo> object that belongs to that <xref:System.Globalization.CultureInfo> object is then passed to the <xref:System.UInt32.Parse%28System.String%2CSystem.IFormatProvider%29> method to convert the user's input to a <xref:System.UInt32> value.
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Parse/Default.aspx.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/UInt64.xml b/xml/System/UInt64.xml
index 8d8164e4bf9..724f0a5e9c8 100644
--- a/xml/System/UInt64.xml
+++ b/xml/System/UInt64.xml
@@ -445,7 +445,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/UInt64/CompareTo/source.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UInt64/CompareTo/source.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/UInt64 Example/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UInt64/CompareTo/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -539,7 +539,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -900,7 +900,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/UInt64/Equals/uint64_equals.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UInt64/Equals/uint64_equals.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/UInt64_Equals/VB/uint64_equals.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UInt64/Equals/uint64_equals.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1881,7 +1881,7 @@ For <xref:System.Numerics.IFloatingPoint%601> this method matches the IEEE 754:2
  The following example is the button click event handler of a Web form. It uses the array returned by the <xref:System.Web.HttpRequest.UserLanguages%2A?displayProperty=nameWithType> property to determine the user's locale. It then instantiates a <xref:System.Globalization.CultureInfo> object that corresponds to that locale. The <xref:System.Globalization.NumberFormatInfo> object that belongs to that <xref:System.Globalization.CultureInfo> object is then passed to the <xref:System.UInt64.Parse%28System.String%2CSystem.IFormatProvider%29> method to convert the user's input to a <xref:System.UInt64> value.
 
  :::code language="csharp" source="~/snippets/csharp/System/Decimal/Parse/Default.aspx.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/ParseMethod/vb/Default.aspx.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Decimal/Parse/Default.aspx.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/UnhandledExceptionEventArgs.xml b/xml/System/UnhandledExceptionEventArgs.xml
index 7712ed40891..42e92a57161 100644
--- a/xml/System/UnhandledExceptionEventArgs.xml
+++ b/xml/System/UnhandledExceptionEventArgs.xml
@@ -177,7 +177,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/AppDomain/UnhandledException/unhandledexception.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/AppDomain/UnhandledException/unhandledexception.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AppDomain_UnhandledException/VB/unhandledexception.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UnhandledExceptionEventArgs/ExceptionObject/unhandledexception.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Version.xml b/xml/System/Version.xml
index 26994421a53..c1a9faa6cc1 100644
--- a/xml/System/Version.xml
+++ b/xml/System/Version.xml
@@ -759,7 +759,7 @@ The following example uses the <xref:System.Reflection.AssemblyVersionAttribute>
 
  :::code language="csharp" source="~/snippets/csharp/System/Boolean/CompareTo/cat.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Boolean/CompareTo/cat.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/T.CompareTo/VB/cat.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Boolean/CompareTo/cat.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/WeakReference.xml b/xml/System/WeakReference.xml
index f3e8086ecee..df306c57a57 100644
--- a/xml/System/WeakReference.xml
+++ b/xml/System/WeakReference.xml
@@ -88,7 +88,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/WeakReference/Overview/program.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/WeakReference/Overview/program.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WeakReference/vb/Module1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/WeakReference/Overview/Module1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -223,7 +223,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/WeakReference/Overview/program.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/WeakReference/Overview/program.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WeakReference/vb/Module1.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/WeakReference/Overview/Module1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -557,7 +557,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/WeakReference/Overview/program.cs" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/WeakReference/Overview/program.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/WeakReference/vb/Module1.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/WeakReference/Overview/Module1.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>