diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.ClassesRoot Example/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/Registry/ClassesRoot/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.ClassesRoot Example/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/Registry/ClassesRoot/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.CurrentConfig Example/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/Registry/CurrentConfig/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.CurrentConfig Example/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/Registry/CurrentConfig/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.CurrentUser Example/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/Registry/CurrentUser/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.CurrentUser Example/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/Registry/CurrentUser/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.LocalMachine Example/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/Registry/LocalMachine/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.LocalMachine Example/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/Registry/LocalMachine/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.Users Example/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.Users Example/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.PerformanceData Example/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/Registry/PerformanceData/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.PerformanceData Example/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/Registry/PerformanceData/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RegistryKey.GetValue Example/VB/source.vb b/snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic RegistryKey.GetValue Example/VB/source.vb
rename to snippets/visualbasic/Microsoft.Win32/RegistryKey/GetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic CompilerError Example/VB/source.vb b/snippets/visualbasic/System.CodeDom.Compiler/CompilerError/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic CompilerError Example/VB/source.vb
rename to snippets/visualbasic/System.CodeDom.Compiler/CompilerError/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Add Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.BinarySearch1 Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/BinarySearch/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.BinarySearch1 Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/BinarySearch/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.BinarySearch1 Example/VB/source2.vb b/snippets/visualbasic/System.Collections/ArrayList/BinarySearch/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.BinarySearch1 Example/VB/source2.vb
rename to snippets/visualbasic/System.Collections/ArrayList/BinarySearch/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Clear Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.CopyTo Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/CopyTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.CopyTo Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/CopyTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.CopyTo1 Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/CopyTo/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.CopyTo1 Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/CopyTo/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsFixedSize Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/FixedSize/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsFixedSize Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/FixedSize/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.SetRange Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/GetRange/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.SetRange Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/GetRange/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IndexOf Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/IndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IndexOf Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/IndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Insert Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Insert/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Insert Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Insert/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.ReadOnly1 Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/IsReadOnly/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.ReadOnly1 Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/IsReadOnly/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source2.vb b/snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source2.vb
rename to snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.LastIndexOf Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/LastIndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.LastIndexOf Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/LastIndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Remove Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Remove Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Repeat Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Repeat/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Repeat Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Repeat/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Reverse Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Reverse/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Reverse Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Reverse/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Reverse1 Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Reverse/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Reverse1 Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Reverse/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Sort Example/VB/source.vb b/snippets/visualbasic/System.Collections/ArrayList/Sort/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Sort Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/ArrayList/Sort/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.And Example/VB/source.vb b/snippets/visualbasic/System.Collections/BitArray/And/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.And Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/BitArray/And/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.CopyTo Example/VB/source.vb b/snippets/visualbasic/System.Collections/BitArray/CopyTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.CopyTo Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/BitArray/CopyTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Get Example/VB/source.vb b/snippets/visualbasic/System.Collections/BitArray/Get/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Get Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/BitArray/Get/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Not Example/VB/source.vb b/snippets/visualbasic/System.Collections/BitArray/Not/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Not Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/BitArray/Not/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Or Example/VB/source.vb b/snippets/visualbasic/System.Collections/BitArray/Or/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Or Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/BitArray/Or/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray Example/VB/source.vb b/snippets/visualbasic/System.Collections/BitArray/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/BitArray/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray Example/VB/source2.vb b/snippets/visualbasic/System.Collections/BitArray/Overview/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray Example/VB/source2.vb
rename to snippets/visualbasic/System.Collections/BitArray/Overview/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Xor Example/VB/source.vb b/snippets/visualbasic/System.Collections/BitArray/Xor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Xor Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/BitArray/Xor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Add Example/VB/source.vb b/snippets/visualbasic/System.Collections/Hashtable/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Hashtable/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Clear Example/VB/source.vb b/snippets/visualbasic/System.Collections/Hashtable/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Hashtable/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Contains Example/VB/source.vb b/snippets/visualbasic/System.Collections/Hashtable/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Contains Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Hashtable/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.CopyTo Example/VB/source.vb b/snippets/visualbasic/System.Collections/Hashtable/CopyTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.CopyTo Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Hashtable/CopyTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable Example/VB/source2.vb b/snippets/visualbasic/System.Collections/Hashtable/GetEnumerator/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable Example/VB/source2.vb
rename to snippets/visualbasic/System.Collections/Hashtable/GetEnumerator/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/remarks.vb b/snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/remarks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/remarks.vb
rename to snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/remarks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/source.vb b/snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Remove Example/VB/source.vb b/snippets/visualbasic/System.Collections/Hashtable/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Remove Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Hashtable/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.Clear Example/VB/source.vb b/snippets/visualbasic/System.Collections/Queue/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Queue/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.CopyTo Example/VB/source.vb b/snippets/visualbasic/System.Collections/Queue/CopyTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.CopyTo Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Queue/CopyTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.Enqueue Example/VB/source.vb b/snippets/visualbasic/System.Collections/Queue/Dequeue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.Enqueue Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Queue/Dequeue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source.vb b/snippets/visualbasic/System.Collections/Queue/IsSynchronized/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Queue/IsSynchronized/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source2.vb b/snippets/visualbasic/System.Collections/Queue/IsSynchronized/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source2.vb
rename to snippets/visualbasic/System.Collections/Queue/IsSynchronized/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue Example/VB/source.vb b/snippets/visualbasic/System.Collections/Queue/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Queue/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Add Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Clear Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Contains Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Contains Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.CopyTo Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/CopyTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.CopyTo Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/CopyTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.GetByIndex Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/GetByIndex/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.GetByIndex Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/GetByIndex/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IndexOfKey Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/IndexOfKey/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IndexOfKey Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/IndexOfKey/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source2.vb b/snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source2.vb
rename to snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList Example/VB/remarks.vb b/snippets/visualbasic/System.Collections/SortedList/Overview/remarks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList Example/VB/remarks.vb
rename to snippets/visualbasic/System.Collections/SortedList/Overview/remarks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.RemoveAt Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.RemoveAt Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.SetByIndex Example/VB/source.vb b/snippets/visualbasic/System.Collections/SortedList/SetByIndex/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.SetByIndex Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/SortedList/SetByIndex/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.Clear Example/VB/source.vb b/snippets/visualbasic/System.Collections/Stack/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Stack/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.CopyTo Example/VB/source.vb b/snippets/visualbasic/System.Collections/Stack/CopyTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.CopyTo Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Stack/CopyTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source.vb b/snippets/visualbasic/System.Collections/Stack/IsSynchronized/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Stack/IsSynchronized/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source2.vb b/snippets/visualbasic/System.Collections/Stack/IsSynchronized/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source2.vb
rename to snippets/visualbasic/System.Collections/Stack/IsSynchronized/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack Example/VB/source.vb b/snippets/visualbasic/System.Collections/Stack/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Stack/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.Peek Example/VB/source.vb b/snippets/visualbasic/System.Collections/Stack/Peek/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.Peek Example/VB/source.vb
rename to snippets/visualbasic/System.Collections/Stack/Peek/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.Enabled Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/BooleanSwitch/Enabled/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.Enabled Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/BooleanSwitch/Enabled/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.BooleanSwitch Example/VB/remarks.vb b/snippets/visualbasic/System.Diagnostics/BooleanSwitch/Overview/remarks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.BooleanSwitch Example/VB/remarks.vb
rename to snippets/visualbasic/System.Diagnostics/BooleanSwitch/Overview/remarks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.BooleanSwitch Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/BooleanSwitch/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.BooleanSwitch Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/BooleanSwitch/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Assert/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Assert/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Assert/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Assert/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Assert/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Assert/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Close Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Close/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Close Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Close/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Fail Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Fail/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Fail Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Fail/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Fail1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Fail/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Fail1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Fail/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.IndentLevel Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Indent/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.IndentLevel Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Indent/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Listeners Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Listeners/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Listeners Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Listeners/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Write Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/Write/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Write Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/Write/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Clear Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.SourceExists1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/CreateEventSource/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.SourceExists1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/CreateEventSource/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Delete1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/Delete/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Delete1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/Delete/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.DeleteEventSource Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/Delete/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.DeleteEventSource Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/Delete/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EnableRaisingEvents Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/EnableRaisingEvents/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EnableRaisingEvents Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/EnableRaisingEvents/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Entries Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/Entries/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Entries Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/Entries/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EntryWritten Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/EntryWritten/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EntryWritten Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/EntryWritten/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.GetEventLogs1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.GetEventLogs1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Log Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/Log/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Log Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/Log/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.MachineName Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/MachineName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.MachineName Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/MachineName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.CreateEventSource Example/VB/makefile b/snippets/visualbasic/System.Diagnostics/EventLog/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.CreateEventSource Example/VB/makefile
rename to snippets/visualbasic/System.Diagnostics/EventLog/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.CreateEventSource Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.CreateEventSource Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Source Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/Source/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Source Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/Source/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLogTraceListener Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/EventLogTraceListener/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLogTraceListener Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/EventLogTraceListener/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/Classic FileVersionInfo.Comments Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/Comments/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/Classic FileVersionInfo.Comments Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/Comments/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.CompanyName Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/CompanyName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.CompanyName Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/CompanyName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileBuildPart Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileBuildPart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileBuildPart Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileBuildPart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileDescription Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileDescription/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileDescription Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileDescription/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileMajorPart Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileMajorPart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileMajorPart Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileMajorPart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileMinorPart Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileMinorPart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileMinorPart Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileMinorPart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileName Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileName Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FilePrivatePart Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FilePrivatePart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FilePrivatePart Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/FilePrivatePart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.InternalName Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/InternalName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.InternalName Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/InternalName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsDebug Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsDebug/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsDebug Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsDebug/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPatched Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPatched/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPatched Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPatched/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPreRelease Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPreRelease/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPreRelease Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPreRelease/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPrivateBuild Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPrivateBuild/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPrivateBuild Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPrivateBuild/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsSpecialBuild Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsSpecialBuild/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsSpecialBuild Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsSpecialBuild/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.LegalCopyright Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/LegalCopyright/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.LegalCopyright Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/LegalCopyright/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.LegalTrademarks Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/LegalTrademarks/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.LegalTrademarks Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/LegalTrademarks/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.OriginalFilename Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/OriginalFilename/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.OriginalFilename Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/OriginalFilename/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.PrivateBuild Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/PrivateBuild/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.PrivateBuild Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/PrivateBuild/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductBuildPart Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductBuildPart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductBuildPart Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductBuildPart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductMajorPart Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductMajorPart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductMajorPart Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductMajorPart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductMinorPart Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductMinorPart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductMinorPart Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductMinorPart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductName Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductName Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductPrivatePart Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductPrivatePart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductPrivatePart Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductPrivatePart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductVersion Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductVersion/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductVersion Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductVersion/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.SpecialBuild Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/SpecialBuild/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.SpecialBuild Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/SpecialBuild/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ToString Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ToString Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/FileVersionInfo/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Switch Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Switch/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Switch Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Switch/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Close Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Close Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.WriteLine Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.WriteLine Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Write Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Write/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Write Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Write/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Writer Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Writer/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Writer Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Writer/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Assert/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Assert/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Assert/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Assert/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Assert/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Assert/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Flush Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Close/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Flush Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Close/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Fail Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Fail/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Fail Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Fail/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Fail1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Fail/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Fail1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Fail/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.IndentLevel Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Indent/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.IndentLevel Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Indent/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Listeners Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Listeners/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Listeners Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Listeners/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Write/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Write/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Write/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Write/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Write/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Write/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/Write/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/Write/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf1 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf1 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf2 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf2 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf3 Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf3 Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceListenerCollection.Add Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TraceListenerCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceListenerCollection.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TraceListenerCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.Level Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TraceSwitch/Level/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.Level Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TraceSwitch/Level/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/remarks.vb b/snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/remarks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/remarks.vb
rename to snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/remarks.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceInfo Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TraceSwitch/TraceInfo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceInfo Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TraceSwitch/TraceInfo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceWarning Example/VB/source.vb b/snippets/visualbasic/System.Diagnostics/TraceSwitch/TraceWarning/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceWarning Example/VB/source.vb
rename to snippets/visualbasic/System.Diagnostics/TraceSwitch/TraceWarning/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DateTimeFormatInfo.GetAllDateTimePatterns Example/VB/source.vb b/snippets/visualbasic/System.Globalization/DateTimeFormatInfo/GetAllDateTimePatterns/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic DateTimeFormatInfo.GetAllDateTimePatterns Example/VB/source.vb
rename to snippets/visualbasic/System.Globalization/DateTimeFormatInfo/GetAllDateTimePatterns/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NumberFormatInfo.NumberGroupSizes Example/VB/source.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSizes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic NumberFormatInfo.NumberGroupSizes Example/VB/source.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSizes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NumberFormatInfo.NumberNegativePattern Example/VB/source.vb b/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberNegativePattern/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic NumberFormatInfo.NumberNegativePattern Example/VB/source.vb
rename to snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberNegativePattern/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DirectoryInfo.Name Example/VB/source.vb b/snippets/visualbasic/System.IO/DirectoryInfo/Name/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic DirectoryInfo.Name Example/VB/source.vb
rename to snippets/visualbasic/System.IO/DirectoryInfo/Name/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ErrorEventArgs.ErrorEventArgs Example/VB/source.vb b/snippets/visualbasic/System.IO/ErrorEventArgs/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ErrorEventArgs.ErrorEventArgs Example/VB/source.vb
rename to snippets/visualbasic/System.IO/ErrorEventArgs/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ErrorEventArgs Example/VB/source.vb b/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ErrorEventArgs Example/VB/source.vb
rename to snippets/visualbasic/System.IO/ErrorEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileAccess Example/VB/source.vb b/snippets/visualbasic/System.IO/FileAccess/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileAccess Example/VB/source.vb
rename to snippets/visualbasic/System.IO/FileAccess/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.CanRead Example/VB/source.vb b/snippets/visualbasic/System.IO/FileStream/CanRead/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.CanRead Example/VB/source.vb
rename to snippets/visualbasic/System.IO/FileStream/CanRead/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.CanWrite Example/VB/source.vb b/snippets/visualbasic/System.IO/FileStream/CanWrite/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.CanWrite Example/VB/source.vb
rename to snippets/visualbasic/System.IO/FileStream/CanWrite/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.Length Example/VB/source.vb b/snippets/visualbasic/System.IO/FileStream/Length/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.Length Example/VB/source.vb
rename to snippets/visualbasic/System.IO/FileStream/Length/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb b/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb
rename to snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stream.CanWrite Example/VB/source.vb b/snippets/visualbasic/System.IO/Stream/CanWrite/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stream.CanWrite Example/VB/source.vb
rename to snippets/visualbasic/System.IO/Stream/CanWrite/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stream.Read Example/VB/source.vb b/snippets/visualbasic/System.IO/Stream/Read/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stream.Read Example/VB/source.vb
rename to snippets/visualbasic/System.IO/Stream/Read/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic StreamWriter.Write2 Example/VB/source.vb b/snippets/visualbasic/System.IO/StreamWriter/Write/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic StreamWriter.Write2 Example/VB/source.vb
rename to snippets/visualbasic/System.IO/StreamWriter/Write/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodRental.SwapMethodBody Example/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/MethodRental/SwapMethodBody/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodRental.SwapMethodBody Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/MethodRental/SwapMethodBody/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb b/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic AmbiguousMatchException.AmbiguousMatchException2 Example/VB/source.vb b/snippets/visualbasic/System.Reflection/AmbiguousMatchException/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic AmbiguousMatchException.AmbiguousMatchException2 Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/AmbiguousMatchException/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Assembly.GetModules Example/VB/source.vb b/snippets/visualbasic/System.Reflection/Assembly/GetModules/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Assembly.GetModules Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/Assembly/GetModules/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.MemberType Example/VB/source.vb b/snippets/visualbasic/System.Reflection/ConstructorInfo/MemberType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.MemberType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/ConstructorInfo/MemberType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldAttributes Example/VB/source.vb b/snippets/visualbasic/System.Reflection/FieldAttributes/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldAttributes Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/FieldAttributes/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.FieldType Example/VB/source.vb b/snippets/visualbasic/System.Reflection/FieldInfo/FieldType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.FieldType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/FieldType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsAssembly Example/VB/source.vb b/snippets/visualbasic/System.Reflection/FieldInfo/IsAssembly/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsAssembly Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/IsAssembly/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsInitOnly Example/VB/source.vb b/snippets/visualbasic/System.Reflection/FieldInfo/IsInitOnly/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsInitOnly Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/IsInitOnly/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsPublic Example/VB/source.vb b/snippets/visualbasic/System.Reflection/FieldInfo/IsPublic/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsPublic Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/IsPublic/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsStatic Example/VB/source.vb b/snippets/visualbasic/System.Reflection/FieldInfo/IsStatic/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsStatic Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/IsStatic/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.MemberType Example/VB/source.vb b/snippets/visualbasic/System.Reflection/FieldInfo/MemberType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.MemberType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/FieldInfo/MemberType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic IReflect.InvokeMember Example/VB/source.vb b/snippets/visualbasic/System.Reflection/IReflect/InvokeMember/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic IReflect.InvokeMember Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/IReflect/InvokeMember/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.DeclaringType Example/VB/Example2.vb b/snippets/visualbasic/System.Reflection/MemberInfo/DeclaringType/Example2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.DeclaringType Example/VB/Example2.vb
rename to snippets/visualbasic/System.Reflection/MemberInfo/DeclaringType/Example2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.Name Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MemberInfo/Name/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.Name Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MemberInfo/Name/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.ReflectedType Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MemberInfo/ReflectedType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.ReflectedType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MemberInfo/ReflectedType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodAttributes Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodAttributes/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodAttributes Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodAttributes/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.Invoke1 Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodBase/Invoke/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.Invoke1 Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodBase/Invoke/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAbstract Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodBase/IsAbstract/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAbstract Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodBase/IsAbstract/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAssembly Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodBase/IsAssembly/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAssembly Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodBase/IsAssembly/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsVirtual Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodBase/IsFinal/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsVirtual Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodBase/IsFinal/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsPublic Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodBase/IsPublic/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsPublic Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodBase/IsPublic/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.IsSpecialName Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodBase/IsSpecialName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.IsSpecialName Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodBase/IsSpecialName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodInfo.MemberType Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodInfo/MemberType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodInfo.MemberType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodInfo/MemberType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodInfo.ReturnType Example/VB/source.vb b/snippets/visualbasic/System.Reflection/MethodInfo/ReturnType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodInfo.ReturnType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/MethodInfo/ReturnType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Module.Name Example/VB/source.vb b/snippets/visualbasic/System.Reflection/Module/Name/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Module.Name Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/Module/Name/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Module.ScopeName Example/VB/source.vb b/snippets/visualbasic/System.Reflection/Module/ScopeName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Module.ScopeName Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/Module/ScopeName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterAttributes Example/VB/source.vb b/snippets/visualbasic/System.Reflection/ParameterAttributes/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterAttributes Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/ParameterAttributes/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.IsOut Example/VB/source.vb b/snippets/visualbasic/System.Reflection/ParameterInfo/IsOut/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.IsOut Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/ParameterInfo/IsOut/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.Name Example/VB/source.vb b/snippets/visualbasic/System.Reflection/ParameterInfo/Name/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.Name Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/ParameterInfo/Name/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.ParameterType Example/VB/source.vb b/snippets/visualbasic/System.Reflection/ParameterInfo/ParameterType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.ParameterType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/ParameterInfo/ParameterType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyAttributes Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyAttributes/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyAttributes Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyAttributes/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.CanRead Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/CanRead/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.CanRead Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/CanRead/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.CanWrite Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/CanWrite/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.CanWrite Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/CanWrite/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetAccessors1 Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/GetAccessors/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetAccessors1 Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/GetAccessors/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetGetMethod1 Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/GetGetMethod/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetGetMethod1 Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/GetGetMethod/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetIndexParameters Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/GetIndexParameters/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetIndexParameters Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/GetIndexParameters/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetSetMethod1 Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/GetSetMethod/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetSetMethod1 Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/GetSetMethod/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.MemberType Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/MemberType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.MemberType Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/MemberType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.SetValue1 Example/VB/source.vb b/snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.SetValue1 Example/VB/source.vb
rename to snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ResourceWriter Example/VB/source.vb b/snippets/visualbasic/System.Resources/ResourceWriter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ResourceWriter Example/VB/source.vb
rename to snippets/visualbasic/System.Resources/ResourceWriter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ClassInterfaceAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/ClassInterfaceAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ClassInterfaceAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ClassInterfaceAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComAliasNameAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/ComAliasNameAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComAliasNameAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ComAliasNameAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComRegisterFunctionAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/ComRegisterFunctionAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComRegisterFunctionAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ComRegisterFunctionAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComSourceInterfacesAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/ComSourceInterfacesAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComSourceInterfacesAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ComSourceInterfacesAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComVisibleAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/ComVisibleAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComVisibleAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ComVisibleAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DispIdAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/DispIdAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic DispIdAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/DispIdAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ExtensibleClassFactory Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/ExtensibleClassFactory/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ExtensibleClassFactory Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/ExtensibleClassFactory/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldOffsetAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/FieldOffsetAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldOffsetAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/FieldOffsetAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic GuidAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/GuidAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic GuidAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/GuidAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic InterfaceTypeAttribute Example/VB/source.vb b/snippets/visualbasic/System.Runtime.InteropServices/InterfaceTypeAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic InterfaceTypeAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.InteropServices/InterfaceTypeAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DES Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic DES Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA256 Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/ComputeHash/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA256 Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/ComputeHash/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic HashAlgorithm Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic HashAlgorithm Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/RandomNumberGenerator/GetBytes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/RandomNumberGenerator/GetBytes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/SHA384/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/SHA384/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/vb.vbproj b/snippets/visualbasic/System.Security.Cryptography/SHA384/Overview/vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/vb.vbproj
rename to snippets/visualbasic/System.Security.Cryptography/SHA384/Overview/vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/SHA384Managed/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/SHA384Managed/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/vb.vbproj b/snippets/visualbasic/System.Security.Cryptography/SHA384Managed/Overview/vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/vb.vbproj
rename to snippets/visualbasic/System.Security.Cryptography/SHA384Managed/Overview/vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/SHA512/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/SHA512/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/vb.vbproj b/snippets/visualbasic/System.Security.Cryptography/SHA512/Overview/vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/vb.vbproj
rename to snippets/visualbasic/System.Security.Cryptography/SHA512/Overview/vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/SHA512Managed/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/SHA512Managed/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/vb.vbproj b/snippets/visualbasic/System.Security.Cryptography/SHA512Managed/Overview/vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/vb.vbproj
rename to snippets/visualbasic/System.Security.Cryptography/SHA512Managed/Overview/vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic CryptoStream Example/VB/source.vb b/snippets/visualbasic/System.Security.Cryptography/SymmetricAlgorithm/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic CryptoStream Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Cryptography/SymmetricAlgorithm/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic CodeGroup.PolicyStatement Example/VB/source.vb b/snippets/visualbasic/System.Security.Policy/CodeGroup/PolicyStatement/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic CodeGroup.PolicyStatement Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Policy/CodeGroup/PolicyStatement/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hash.SHA1 Example/VB/source.vb b/snippets/visualbasic/System.Security.Policy/Hash/SHA1/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hash.SHA1 Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Policy/Hash/SHA1/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsImpersonationContext.Undo Example/VB/source.vb b/snippets/visualbasic/System.Security.Principal/WindowsImpersonationContext/Undo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsImpersonationContext.Undo Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Principal/WindowsImpersonationContext/Undo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsPrincipal.WindowsPrincipal Example/VB/source.vb b/snippets/visualbasic/System.Security.Principal/WindowsPrincipal/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsPrincipal.WindowsPrincipal Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Principal/WindowsPrincipal/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsPrincipal.Identity Example/VB/source.vb b/snippets/visualbasic/System.Security.Principal/WindowsPrincipal/Identity/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsPrincipal.Identity Example/VB/source.vb
rename to snippets/visualbasic/System.Security.Principal/WindowsPrincipal/Identity/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ServiceInstaller Example/VB/source.vb b/snippets/visualbasic/System.ServiceProcess/ServiceAccount/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ServiceInstaller Example/VB/source.vb
rename to snippets/visualbasic/System.ServiceProcess/ServiceAccount/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Decoder Example/VB/source.vb b/snippets/visualbasic/System.Text/Decoder/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Decoder Example/VB/source.vb
rename to snippets/visualbasic/System.Text/Decoder/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ThreadExceptionEventArgs Example/VB/source.vb b/snippets/visualbasic/System.Threading/ThreadExceptionEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic ThreadExceptionEventArgs Example/VB/source.vb
rename to snippets/visualbasic/System.Threading/ThreadExceptionEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Timer Example/VB/source.vb b/snippets/visualbasic/System.Timers/ElapsedEventHandler/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Timer Example/VB/source.vb
rename to snippets/visualbasic/System.Timers/ElapsedEventHandler/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Timer.Timer1 Example/VB/source.vb b/snippets/visualbasic/System.Timers/Timer/AutoReset/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Timer.Timer1 Example/VB/source.vb
rename to snippets/visualbasic/System.Timers/Timer/AutoReset/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb b/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb
rename to snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.BinarySearch Example/VB/source.vb b/snippets/visualbasic/System/Array/BinarySearch/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.BinarySearch Example/VB/source.vb
rename to snippets/visualbasic/System/Array/BinarySearch/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Copy1 Example/VB/source.vb b/snippets/visualbasic/System/Array/Copy/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Copy1 Example/VB/source.vb
rename to snippets/visualbasic/System/Array/Copy/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CopyTo Example/VB/source.vb b/snippets/visualbasic/System/Array/CopyTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CopyTo Example/VB/source.vb
rename to snippets/visualbasic/System/Array/CopyTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CopyTo Example/VB/source2.vb b/snippets/visualbasic/System/Array/CopyTo/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CopyTo Example/VB/source2.vb
rename to snippets/visualbasic/System/Array/CopyTo/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance Example/VB/source.vb b/snippets/visualbasic/System/Array/CreateInstance/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance Example/VB/source.vb
rename to snippets/visualbasic/System/Array/CreateInstance/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance1 Example/VB/source.vb b/snippets/visualbasic/System/Array/CreateInstance/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance1 Example/VB/source.vb
rename to snippets/visualbasic/System/Array/CreateInstance/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance2 Example/VB/source.vb b/snippets/visualbasic/System/Array/CreateInstance/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance2 Example/VB/source.vb
rename to snippets/visualbasic/System/Array/CreateInstance/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance3 Example/VB/source.vb b/snippets/visualbasic/System/Array/CreateInstance/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance3 Example/VB/source.vb
rename to snippets/visualbasic/System/Array/CreateInstance/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.IndexOf Example/VB/source.vb b/snippets/visualbasic/System/Array/IndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.IndexOf Example/VB/source.vb
rename to snippets/visualbasic/System/Array/IndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.LastIndexOf Example/VB/source.vb b/snippets/visualbasic/System/Array/LastIndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.LastIndexOf Example/VB/source.vb
rename to snippets/visualbasic/System/Array/LastIndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array Example/VB/source.vb b/snippets/visualbasic/System/Array/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array Example/VB/source.vb
rename to snippets/visualbasic/System/Array/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array Example/VB/source3.vb b/snippets/visualbasic/System/Array/Overview/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array Example/VB/source3.vb
rename to snippets/visualbasic/System/Array/Overview/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Reverse Example/VB/source.vb b/snippets/visualbasic/System/Array/Reverse/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Reverse Example/VB/source.vb
rename to snippets/visualbasic/System/Array/Reverse/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Reverse1 Example/VB/source.vb b/snippets/visualbasic/System/Array/Reverse/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Reverse1 Example/VB/source.vb
rename to snippets/visualbasic/System/Array/Reverse/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic AttributeUsageAttribute.AttributeUsageAttribute Example/VB/source.vb b/snippets/visualbasic/System/AttributeUsageAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic AttributeUsageAttribute.AttributeUsageAttribute Example/VB/source.vb
rename to snippets/visualbasic/System/AttributeUsageAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DateTime.ToString2 Example/VB/source.vb b/snippets/visualbasic/System/DateTime/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic DateTime.ToString2 Example/VB/source.vb
rename to snippets/visualbasic/System/DateTime/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Enum.ToString2 Example/VB/source.vb b/snippets/visualbasic/System/Enum/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Enum.ToString2 Example/VB/source.vb
rename to snippets/visualbasic/System/Enum/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MarshalByRefObject.InitializeLifetimeService Example/VB/source.vb b/snippets/visualbasic/System/MarshalByRefObject/InitializeLifetimeService/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MarshalByRefObject.InitializeLifetimeService Example/VB/source.vb
rename to snippets/visualbasic/System/MarshalByRefObject/InitializeLifetimeService/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Math.Round Example/VB/source.vb b/snippets/visualbasic/System/Math/Round/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Math.Round Example/VB/source.vb
rename to snippets/visualbasic/System/Math/Round/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Math.Round2 Example/VB/source.vb b/snippets/visualbasic/System/Math/Round/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Math.Round2 Example/VB/source.vb
rename to snippets/visualbasic/System/Math/Round/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Random.NextBytes Example/VB/source.vb b/snippets/visualbasic/System/Random/NextBytes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Random.NextBytes Example/VB/source.vb
rename to snippets/visualbasic/System/Random/NextBytes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadLeft Example/VB/source.vb b/snippets/visualbasic/System/String/PadLeft/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadLeft Example/VB/source.vb
rename to snippets/visualbasic/System/String/PadLeft/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadLeft1 Example/VB/source.vb b/snippets/visualbasic/System/String/PadLeft/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadLeft1 Example/VB/source.vb
rename to snippets/visualbasic/System/String/PadLeft/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadRight Example/VB/source.vb b/snippets/visualbasic/System/String/PadRight/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadRight Example/VB/source.vb
rename to snippets/visualbasic/System/String/PadRight/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadRight1 Example/VB/source.vb b/snippets/visualbasic/System/String/PadRight/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadRight1 Example/VB/source.vb
rename to snippets/visualbasic/System/String/PadRight/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.Substring1 Example/VB/source.vb b/snippets/visualbasic/System/String/Substring/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.Substring1 Example/VB/source.vb
rename to snippets/visualbasic/System/String/Substring/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.DeclaringType Example/VB/source.vb b/snippets/visualbasic/System/Type/DeclaringType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.DeclaringType Example/VB/source.vb
rename to snippets/visualbasic/System/Type/DeclaringType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.EmptyTypes Example/VB/source.vb b/snippets/visualbasic/System/Type/EmptyTypes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.EmptyTypes Example/VB/source.vb
rename to snippets/visualbasic/System/Type/EmptyTypes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.Equals1 Example/VB/source.vb b/snippets/visualbasic/System/Type/Equals/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.Equals1 Example/VB/source.vb
rename to snippets/visualbasic/System/Type/Equals/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.FilterName Example/VB/source.vb b/snippets/visualbasic/System/Type/FilterName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.FilterName Example/VB/source.vb
rename to snippets/visualbasic/System/Type/FilterName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.GetConstructors Example/VB/source1.vb b/snippets/visualbasic/System/Type/GetConstructors/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.GetConstructors Example/VB/source1.vb
rename to snippets/visualbasic/System/Type/GetConstructors/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.GetConstructors Example/VB/source2.vb b/snippets/visualbasic/System/Type/GetConstructors/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.GetConstructors Example/VB/source2.vb
rename to snippets/visualbasic/System/Type/GetConstructors/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.Attributes Example/VB/source.vb b/snippets/visualbasic/System/Type/GetFields/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.Attributes Example/VB/source.vb
rename to snippets/visualbasic/System/Type/GetFields/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.IsNotPublic Example/VB/source.vb b/snippets/visualbasic/System/Type/IsNotPublic/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.IsNotPublic Example/VB/source.vb
rename to snippets/visualbasic/System/Type/IsNotPublic/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.MemberType Example/VB/source.vb b/snippets/visualbasic/System/Type/MemberType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.MemberType Example/VB/source.vb
rename to snippets/visualbasic/System/Type/MemberType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.Missing Example/VB/source.vb b/snippets/visualbasic/System/Type/Missing/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.Missing Example/VB/source.vb
rename to snippets/visualbasic/System/Type/Missing/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.ReflectedType Example/VB/source.vb b/snippets/visualbasic/System/Type/ReflectedType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.ReflectedType Example/VB/source.vb
rename to snippets/visualbasic/System/Type/ReflectedType/source.vb
diff --git a/xml/Microsoft.Win32/Registry.xml b/xml/Microsoft.Win32/Registry.xml
index ce525707b02..a33896a232d 100644
--- a/xml/Microsoft.Win32/Registry.xml
+++ b/xml/Microsoft.Win32/Registry.xml
@@ -53,7 +53,7 @@ The following code example demonstrates how to retrieve the subkeys of the `HKEY
 
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic Registry.Users Example/CPP/source.cpp" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/Overview/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.Users Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/Overview/source.vb" id="Snippet1":::
 
 The following code example stores values of several data types in an example key, creating the key as it does so, and then retrieves and displays the values. The example demonstrates storing and retrieving the default (nameless) name/value pair, and the use of `defaultValue` when a name/value pair does not exist.
 
@@ -110,7 +110,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic Registry.ClassesRoot Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/ClassesRoot/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.ClassesRoot Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/ClassesRoot/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -163,7 +163,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic Registry.CurrentConfig Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/CurrentConfig/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.CurrentConfig Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/CurrentConfig/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic Registry.CurrentUser Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/CurrentUser/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.CurrentUser Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/CurrentUser/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -405,7 +405,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic Registry.LocalMachine Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/LocalMachine/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.LocalMachine Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/LocalMachine/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -465,7 +465,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic Registry.PerformanceData Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/PerformanceData/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.PerformanceData Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/Registry/PerformanceData/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -740,7 +740,7 @@ The following code example stores values of several data types in an example key
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic Registry.Users Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/Registry/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Registry.Users Example/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/RegistryKey.xml b/xml/Microsoft.Win32/RegistryKey.xml
index 06be1b59a9f..e2eb19407b4 100644
--- a/xml/Microsoft.Win32/RegistryKey.xml
+++ b/xml/Microsoft.Win32/RegistryKey.xml
@@ -1704,7 +1704,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic RegistryKey.GetValue Example/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_Classic/classic RegistryKey.GetValue Example/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/System.CodeDom.Compiler/CompilerError.xml b/xml/System.CodeDom.Compiler/CompilerError.xml
index 3d071f378ad..6b9aa7d9423 100644
--- a/xml/System.CodeDom.Compiler/CompilerError.xml
+++ b/xml/System.CodeDom.Compiler/CompilerError.xml
@@ -54,7 +54,7 @@
  The following example compiles a CodeDOM program graph and provides an example of how to programmatically access CompilerError data.
 
  :::code language="csharp" source="~/snippets/csharp/System.CodeDom.Compiler/CompilerError/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic CompilerError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.CodeDom.Compiler/CompilerError/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Collections/ArrayList.xml b/xml/System.Collections/ArrayList.xml
index 7ec51290172..bdd2850e2c0 100644
--- a/xml/System.Collections/ArrayList.xml
+++ b/xml/System.Collections/ArrayList.xml
@@ -137,7 +137,7 @@
  The following example shows how to create and initialize an <xref:System.Collections.ArrayList> and how to display its values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -491,7 +491,7 @@ This method is an `O(1)` operation.
  The following code example shows how to add elements to the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -579,7 +579,7 @@ This method is an `O(1)` operation.
  The following code example shows how to add elements to the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -678,7 +678,7 @@ This method is an `O(1)` operation.
  The following code example shows how to use <xref:System.Collections.ArrayList.BinarySearch%2A> to locate a specific object in the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/BinarySearch/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.BinarySearch1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/BinarySearch/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -767,7 +767,7 @@ This method is an `O(1)` operation.
  The following example creates an <xref:System.Collections.ArrayList> of colored animals. The provided <xref:System.Collections.IComparer> performs the string comparison for the binary search. The results of both an iterative search and a binary search are displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/BinarySearch/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.BinarySearch1 Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/BinarySearch/source2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1009,7 +1009,7 @@ This method is an `O(1)` operation.
  The following code example shows how to trim the unused portions of the <xref:System.Collections.ArrayList> and how to clear the values of the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Clear/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1235,7 +1235,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to copy an <xref:System.Collections.ArrayList> into a one-dimensional <xref:System.Array?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/CopyTo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1322,7 +1322,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to copy an <xref:System.Collections.ArrayList> into a one-dimensional <xref:System.Array?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/CopyTo/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.CopyTo1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/CopyTo/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1412,7 +1412,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to copy an <xref:System.Collections.ArrayList> into a one-dimensional <xref:System.Array?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/CopyTo/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.CopyTo1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/CopyTo/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1580,7 +1580,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to create a fixed-size wrapper around an <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IsFixedSize/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsFixedSize Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/FixedSize/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1915,7 +1915,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to set and get a range of elements in the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/SetRange/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.SetRange Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/GetRange/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2018,7 +2018,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine the index of the first occurrence of a specified element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IndexOf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2096,7 +2096,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine the index of the first occurrence of a specified element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IndexOf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2178,7 +2178,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine the index of the first occurrence of a specified element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IndexOf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2272,7 +2272,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to insert elements into the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Insert/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Insert Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Insert/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2365,7 +2365,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to insert elements into the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Insert/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Insert Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Insert/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2455,7 +2455,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to create a fixed-size wrapper around an <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IsFixedSize/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsFixedSize Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/FixedSize/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2527,7 +2527,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to create a read-only wrapper around an <xref:System.Collections.ArrayList> and how to determine if an <xref:System.Collections.ArrayList> is read-only.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/ReadOnly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.ReadOnly1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IsReadOnly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2598,14 +2598,14 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.ArrayList.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source2.vb" id="Snippet2":::
 
  Retrieving the value of this property is an `O(1)` operation.
 
  The following code example shows how to synchronize an <xref:System.Collections.ArrayList>, determine if an <xref:System.Collections.ArrayList> is synchronized and use a synchronized <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2785,7 +2785,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine the index of the last occurrence of a specified element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/LastIndexOf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.LastIndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/LastIndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2863,7 +2863,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine the index of the last occurrence of a specified element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/LastIndexOf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.LastIndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/LastIndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2945,7 +2945,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine the index of the last occurrence of a specified element. Note that `LastIndexOf` is a backward search; therefore, `count` must be less than or equal to `startIndex` + 1.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/LastIndexOf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.LastIndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/LastIndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3039,7 +3039,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to create a read-only wrapper around an <xref:System.Collections.ArrayList> and how to determine if an <xref:System.Collections.ArrayList> is read-only.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/ReadOnly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.ReadOnly1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IsReadOnly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3192,7 +3192,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to remove elements from the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Remove/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Remove Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3276,7 +3276,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to remove elements from the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Remove/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Remove Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3362,7 +3362,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to remove elements from the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Remove/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Remove Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3461,7 +3461,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to create and initialize a new <xref:System.Collections.ArrayList> with the same value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Repeat/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Repeat Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Repeat/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3538,7 +3538,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to reverse the sort order of the values in an <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Reverse/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Reverse Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Reverse/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3610,7 +3610,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to reverse the sort order of the values in a range of elements in an <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Reverse/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Reverse1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Reverse/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3692,7 +3692,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to set and get a range of elements in the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/SetRange/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.SetRange Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/GetRange/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3780,7 +3780,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to sort the values in an <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Sort/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Sort Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Sort/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4031,14 +4031,14 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.ArrayList.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source2.vb" id="Snippet2":::
 
  This method is an `O(1)` operation.
 
  The following code example shows how to synchronize an <xref:System.Collections.ArrayList>, determine if an <xref:System.Collections.ArrayList> is synchronized and use a synchronized <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4112,7 +4112,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.ArrayList.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source2.vb" id="Snippet2":::
 
  This method is an `O(1)` operation.
 
@@ -4187,7 +4187,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.ArrayList.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/IsSynchronized/source2.vb" id="Snippet2":::
 
  Retrieving the value of this property is an `O(1)` operation.
 
@@ -4410,7 +4410,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to trim the unused portions of the <xref:System.Collections.ArrayList> and how to clear the values of the <xref:System.Collections.ArrayList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/ArrayList/Clear/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ArrayList.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/ArrayList/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/BitArray.xml b/xml/System.Collections/BitArray.xml
index 8290a60923c..bdd8f8c5529 100644
--- a/xml/System.Collections/BitArray.xml
+++ b/xml/System.Collections/BitArray.xml
@@ -96,7 +96,7 @@
  The following code example shows how to create and initialize a <xref:System.Collections.BitArray> and how to print out its values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -497,7 +497,7 @@
  The following code example shows how to perform the bitwise AND operation between two <xref:System.Collections.BitArray> objects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/And/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.And Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/And/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -625,7 +625,7 @@
  The following code example shows how to copy a <xref:System.Collections.BitArray> into a one-dimensional <xref:System.Array>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/CopyTo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -752,7 +752,7 @@
  The following code example shows how to set and get specific elements in a <xref:System.Collections.BitArray>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Get/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Get Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Get/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1004,7 +1004,7 @@
  The following code example shows how to lock the collection using the <xref:System.Collections.BitArray.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Overview/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Overview/source2.vb" id="Snippet2":::
 
  This method is an `O(1)` operation.
 
@@ -1238,7 +1238,7 @@ The current <xref:System.Collections.BitArray> is updated and returned.
  The following code example shows how to apply NOT to a <xref:System.Collections.BitArray>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Not/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Not Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Not/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1302,7 +1302,7 @@ The current <xref:System.Collections.BitArray> is updated and returned.
  The following code example shows how to perform the OR operation between two <xref:System.Collections.BitArray> objects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Or/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Or Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Or/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1419,7 +1419,7 @@ The current <xref:System.Collections.BitArray> is updated and returned.
  The following code example shows how to set and get specific elements in a <xref:System.Collections.BitArray>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Get/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Get Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Get/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1486,7 +1486,7 @@ The current <xref:System.Collections.BitArray> is updated and returned.
  The following code example shows how to set and get specific elements in a <xref:System.Collections.BitArray>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Get/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Get Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Get/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1547,7 +1547,7 @@ The current <xref:System.Collections.BitArray> is updated and returned.
  The following code example shows how to lock the collection using the <xref:System.Collections.BitArray.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Overview/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Overview/source2.vb" id="Snippet2":::
 
  Retrieving the value of this property is an `O(1)` operation.
 
@@ -1765,7 +1765,7 @@ This member is an explicit interface member implementation. It can be used only
  The following code example shows how to perform the XOR operation between two <xref:System.Collections.BitArray> objects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/BitArray/Xor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BitArray.Xor Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/BitArray/Xor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/Hashtable.xml b/xml/System.Collections/Hashtable.xml
index 5cbacd7c9ee..efa890d2b04 100644
--- a/xml/System.Collections/Hashtable.xml
+++ b/xml/System.Collections/Hashtable.xml
@@ -1786,7 +1786,7 @@ Each element is a key/value pair stored in a <xref:System.Collections.Dictionary
  The following example shows how to add elements to the <xref:System.Collections.Hashtable>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1872,7 +1872,7 @@ Each element is a key/value pair stored in a <xref:System.Collections.Dictionary
  The following example shows how to clear the values of the <xref:System.Collections.Hashtable>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/Clear/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2091,7 +2091,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to determine whether the <xref:System.Collections.Hashtable> contains a specific element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/Contains/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Contains Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2166,7 +2166,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to determine whether the <xref:System.Collections.Hashtable> contains a specific element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/Contains/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Contains Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2242,7 +2242,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to determine whether the <xref:System.Collections.Hashtable> contains a specific element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/Contains/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Contains Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2322,7 +2322,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to copy the list of keys or the list of values in a <xref:System.Collections.Hashtable> into a one-dimensional <xref:System.Array>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/CopyTo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2553,7 +2553,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example compares the use of <xref:System.Collections.Hashtable.GetEnumerator%2A> and `foreach` to enumerate the contents of a <xref:System.Collections.Hashtable>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/GetEnumerator/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/GetEnumerator/source2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2977,7 +2977,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.Hashtable.SyncRoot%2A> during the entire enumeration:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/IsSynchronized/remarks.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/remarks.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/remarks.vb" id="Snippet2":::
 
 
 
@@ -2985,7 +2985,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to synchronize a <xref:System.Collections.Hashtable>, determine if a <xref:System.Collections.Hashtable> is synchronized, and use a synchronized <xref:System.Collections.Hashtable>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3374,7 +3374,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to remove elements from the <xref:System.Collections.Hashtable>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/Remove/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.Remove Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3450,7 +3450,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.Hashtable.SyncRoot%2A> during the entire enumeration:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/IsSynchronized/remarks.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/remarks.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/remarks.vb" id="Snippet2":::
 
  This method is an `O(1)` operation.
 
@@ -3460,7 +3460,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to synchronize a <xref:System.Collections.Hashtable>, determine if a <xref:System.Collections.Hashtable> is synchronized, and use a synchronized <xref:System.Collections.Hashtable>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3530,7 +3530,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.Hashtable.SyncRoot%2A> during the entire enumeration:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Hashtable/IsSynchronized/remarks.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hashtable.IsSynchronized Example/VB/remarks.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Hashtable/IsSynchronized/remarks.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/Queue.xml b/xml/System.Collections/Queue.xml
index 0d210bf6695..54e44abefd7 100644
--- a/xml/System.Collections/Queue.xml
+++ b/xml/System.Collections/Queue.xml
@@ -117,7 +117,7 @@ This class implements a queue as a circular array. Objects stored in a <xref:Sys
  The following example shows how to create and add values to a <xref:System.Collections.Queue> and how to print out its values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -426,7 +426,7 @@ This class implements a queue as a circular array. Objects stored in a <xref:Sys
  The following example shows how to clear the values of the <xref:System.Collections.Queue>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/Clear/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -614,7 +614,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to copy a <xref:System.Collections.Queue> into a one-dimensional array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/CopyTo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -748,7 +748,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to add elements to the <xref:System.Collections.Queue>, remove elements from the <xref:System.Collections.Queue>, or view the element at the beginning of the <xref:System.Collections.Queue>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/Dequeue/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.Enqueue Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/Dequeue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -817,7 +817,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to add elements to the <xref:System.Collections.Queue>, remove elements from the <xref:System.Collections.Queue>, or view the element at the beginning of the <xref:System.Collections.Queue>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/Dequeue/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.Enqueue Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/Dequeue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -952,12 +952,12 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.Queue.SyncRoot%2A> during the entire enumeration. Retrieving the value of this property is an `O(1)` operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/IsSynchronized/source2.vb" id="Snippet2":::
 
  The following example shows how to synchronize a <xref:System.Collections.Queue>, determine if a <xref:System.Collections.Queue> is synchronized, and use a synchronized <xref:System.Collections.Queue>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1023,7 +1023,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to add elements to the <xref:System.Collections.Queue>, remove elements from the <xref:System.Collections.Queue>, or view the element at the beginning of the <xref:System.Collections.Queue>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/Dequeue/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.Enqueue Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/Dequeue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1092,12 +1092,12 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.Queue.SyncRoot%2A> during the entire enumeration. This method is an `O(1)` operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/IsSynchronized/source2.vb" id="Snippet2":::
 
  The following example shows how to synchronize a <xref:System.Collections.Queue>, determine if a <xref:System.Collections.Queue> is synchronized and use a synchronized <xref:System.Collections.Queue>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1164,7 +1164,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.Queue.SyncRoot%2A> during the entire enumeration. Retrieving the value of this property is an `O(1)` operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/IsSynchronized/source2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1228,7 +1228,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following example shows how to copy a <xref:System.Collections.Queue> into a one-dimensional array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Queue/CopyTo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Queue.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Queue/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/SortedList.xml b/xml/System.Collections/SortedList.xml
index ea1b15f5809..00659a6e2b3 100644
--- a/xml/System.Collections/SortedList.xml
+++ b/xml/System.Collections/SortedList.xml
@@ -114,7 +114,7 @@ A <xref:System.Collections.SortedList> element can be accessed by its key, like
  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.SortedList> object is a key/value pair, the element type is not the type of the key or the type of the value. Rather, the element type is <xref:System.Collections.DictionaryEntry>. For example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Overview/remarks.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList Example/VB/remarks.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Overview/remarks.vb" id="Snippet2":::
 
  The `foreach` statement is a wrapper around the enumerator, which allows only reading from, not writing to, the collection.
 
@@ -124,7 +124,7 @@ A <xref:System.Collections.SortedList> element can be accessed by its key, like
  The following code example shows how to create and initialize a <xref:System.Collections.SortedList> object and how to print out its keys and values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -677,7 +677,7 @@ A <xref:System.Collections.SortedList> element can be accessed by its key, like
  The following code example shows how to add elements to a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -819,7 +819,7 @@ A <xref:System.Collections.SortedList> element can be accessed by its key, like
  The following code example shows how to trim the unused portions of a <xref:System.Collections.SortedList> object and how to clear the values of the <xref:System.Collections.SortedList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Clear/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -956,7 +956,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine whether a <xref:System.Collections.SortedList> object contains a specific element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Contains/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Contains Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1029,7 +1029,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine whether a <xref:System.Collections.SortedList> object contains a specific element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Contains/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Contains Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1102,7 +1102,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine whether a <xref:System.Collections.SortedList> object contains a specific element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Contains/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Contains Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1177,7 +1177,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to copy the values in a <xref:System.Collections.SortedList> object into a one-dimensional <xref:System.Array> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/CopyTo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1316,7 +1316,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to get one or all the keys or values in a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/GetByIndex/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.GetByIndex Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/GetByIndex/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1454,7 +1454,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to get one or all the keys or values in a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/GetByIndex/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.GetByIndex Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/GetByIndex/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1521,7 +1521,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to get one or all the keys or values in a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/GetByIndex/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.GetByIndex Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/GetByIndex/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1589,7 +1589,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to get one or all the keys or values in a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/GetByIndex/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.GetByIndex Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/GetByIndex/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1658,7 +1658,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine the index of a key or a value in a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/IndexOfKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IndexOfKey Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/IndexOfKey/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1731,7 +1731,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to determine the index of a key or a value in a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/IndexOfKey/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IndexOfKey Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/IndexOfKey/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1914,14 +1914,14 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock a collection using the <xref:System.Collections.SortedList.SyncRoot%2A> property during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source2.vb" id="Snippet2":::
 
  Retrieving the value of this property is an `O(1)` operation.
 
  The following code example shows how to synchronize a <xref:System.Collections.SortedList> object, determine whether a <xref:System.Collections.SortedList> is synchronized, and use a synchronized <xref:System.Collections.SortedList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2141,7 +2141,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to remove elements from a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Remove/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.RemoveAt Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2215,7 +2215,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to remove elements from a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Remove/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.RemoveAt Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2289,7 +2289,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to replace the value of an existing element in a <xref:System.Collections.SortedList> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/SetByIndex/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.SetByIndex Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/SetByIndex/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2357,14 +2357,14 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.SortedList.SyncRoot%2A> property during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source2.vb" id="Snippet2":::
 
  This method is an `O(1)` operation.
 
  The following code example shows how to synchronize a <xref:System.Collections.SortedList> object, determine whether a <xref:System.Collections.SortedList> is synchronized, and use a synchronized <xref:System.Collections.SortedList>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2431,7 +2431,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to lock the collection using the <xref:System.Collections.SortedList.SyncRoot%2A> property during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/IsSynchronized/source2.vb" id="Snippet2":::
 
  Retrieving the value of this property is an `O(1)` operation.
 
@@ -2568,7 +2568,7 @@ This method uses the collection's objects' <xref:System.Object.Equals%2A> and <x
  The following code example shows how to trim the unused portions of a <xref:System.Collections.SortedList> object and how to clear its values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/SortedList/Clear/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SortedList.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/SortedList/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/Stack.xml b/xml/System.Collections/Stack.xml
index e6e4664d771..2e209d8f434 100644
--- a/xml/System.Collections/Stack.xml
+++ b/xml/System.Collections/Stack.xml
@@ -103,7 +103,7 @@ If <xref:System.Collections.Stack.Count%2A> is less than the capacity of the sta
  The following example shows how to create and add values to a Stack and how to display its values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -345,7 +345,7 @@ If <xref:System.Collections.Stack.Count%2A> is less than the capacity of the sta
  The following example shows how to clear the values of the <xref:System.Collections.Stack>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/Clear/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -532,7 +532,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following example shows how to copy a <xref:System.Collections.Stack> into a one-dimensional array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/CopyTo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -732,7 +732,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following code example shows how to lock the collection using the <xref:System.Collections.Stack.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/IsSynchronized/source2.vb" id="Snippet2":::
 
  Retrieving the value of this property is an `O(1)` operation.
 
@@ -742,7 +742,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following example shows how to synchronize a <xref:System.Collections.Stack>, determine if a <xref:System.Collections.Stack> is synchronized, and use a synchronized <xref:System.Collections.Stack>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -806,7 +806,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following example shows how to add elements to the <xref:System.Collections.Stack>, remove elements from the <xref:System.Collections.Stack>, or view the element at the top of the <xref:System.Collections.Stack>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/Peek/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.Peek Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/Peek/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -873,7 +873,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following example shows how to add elements to the <xref:System.Collections.Stack>, remove elements from the <xref:System.Collections.Stack>, or view the element at the top of the <xref:System.Collections.Stack>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/Peek/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.Peek Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/Peek/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -942,7 +942,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following example shows how to add elements to the <xref:System.Collections.Stack>, remove elements from the <xref:System.Collections.Stack>, or view the element at the top of the <xref:System.Collections.Stack>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/Peek/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.Peek Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/Peek/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1005,7 +1005,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following code example shows how to lock the collection using the <xref:System.Collections.Stack.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/IsSynchronized/source2.vb" id="Snippet2":::
 
  This method is an `O(1)` operation.
 
@@ -1015,7 +1015,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following example shows how to synchronize a <xref:System.Collections.Stack>, determine if a <xref:System.Collections.Stack> is synchronized, and use a synchronized <xref:System.Collections.Stack>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/IsSynchronized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/IsSynchronized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1077,7 +1077,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following code example shows how to lock the collection using the <xref:System.Collections.Stack.SyncRoot%2A> during the entire enumeration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/IsSynchronized/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.IsSynchronized Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/IsSynchronized/source2.vb" id="Snippet2":::
 
  Retrieving the value of this property is an `O(1)` operation.
 
@@ -1141,7 +1141,7 @@ This method tests for equality by passing the `obj` argument to the <xref:System
  The following example shows how to copy a <xref:System.Collections.Stack> into a one-dimensional array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections/Stack/CopyTo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stack.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections/Stack/CopyTo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/BooleanSwitch.xml b/xml/System.Diagnostics/BooleanSwitch.xml
index 1aba439c28c..802e84bd1ba 100644
--- a/xml/System.Diagnostics/BooleanSwitch.xml
+++ b/xml/System.Diagnostics/BooleanSwitch.xml
@@ -77,7 +77,7 @@ For .NET Framework apps only, you can also enable or disable a <xref:System.Diag
  This example configuration section defines a <xref:System.Diagnostics.BooleanSwitch> with the <xref:System.Diagnostics.Switch.DisplayName%2A> property set to `mySwitch` and the <xref:System.Diagnostics.BooleanSwitch.Enabled%2A> value set to `true`. Within your .NET Framework application, you can use the configured switch value by creating a <xref:System.Diagnostics.BooleanSwitch> with the same name, as shown in the following code example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/BooleanSwitch/Overview/remarks.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.BooleanSwitch Example/VB/remarks.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/BooleanSwitch/Overview/remarks.vb" id="Snippet2":::
 
 For .NET Core and .NET 5+ apps, the <xref:System.Diagnostics.BooleanSwitch.Enabled> property of the new switch is set to `false` by default.
 
@@ -101,7 +101,7 @@ For .NET Framework apps, the <xref:System.Diagnostics.BooleanSwitch.Enabled%2A>
  The following example creates a <xref:System.Diagnostics.BooleanSwitch> and uses the switch to determine whether to print an error message. You create the switch at the class level. The `Main` method passes its location to `MyMethod`, which prints an error message and where the error occurred.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/BooleanSwitch/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.BooleanSwitch Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/BooleanSwitch/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -204,7 +204,7 @@ For .NET Framework apps, the <xref:System.Diagnostics.BooleanSwitch.Enabled%2A>
  The following example creates a <xref:System.Diagnostics.BooleanSwitch> and uses the switch to determine whether to print an error message. The switch is created at the class level. The `Main` method passes its location to `MyMethod`, which prints an error message and where the error occurred.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/BooleanSwitch/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.BooleanSwitch Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/BooleanSwitch/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -323,7 +323,7 @@ For .NET Framework apps, the <xref:System.Diagnostics.BooleanSwitch.Enabled%2A>
  The following code example creates a <xref:System.Diagnostics.BooleanSwitch> and uses the switch to determine whether to print an error message. The switch is created at the class level. The `Main` method passes its location to `MyMethod`, which prints an error message and the location where the error occurred.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/BooleanSwitch/Enabled/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic BooleanSwitch.Enabled Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/BooleanSwitch/Enabled/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/Debug.xml b/xml/System.Diagnostics/Debug.xml
index 76e70b78f5c..c962ce3c1fc 100644
--- a/xml/System.Diagnostics/Debug.xml
+++ b/xml/System.Diagnostics/Debug.xml
@@ -110,7 +110,7 @@ For .NET Framework apps, you can set the <xref:System.Diagnostics.Debug.AutoFlus
 The following example uses <xref:System.Diagnostics.Debug> to indicate the beginning and end of a program's execution. The example also uses <xref:System.Diagnostics.Debug.Indent%2A> and <xref:System.Diagnostics.Debug.Unindent%2A> to distinguish the tracing output.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -232,7 +232,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
 The following example creates an index for an array, performs some action to set the value of the index, and then calls <xref:System.Diagnostics.Debug.Assert%2A> to confirm that the index value is valid. If it is not valid, <xref:System.Diagnostics.Debug.Assert%2A> outputs the call stack.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Assert/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Assert/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -438,7 +438,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
 The following example checks whether the `type` parameter is valid. If `type` is `null`, <xref:System.Diagnostics.Trace.Assert%2A> outputs a message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Assert/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Assert/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -645,7 +645,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
 The following example checks whether the `type` parameter is valid. If `type` is `null`, <xref:System.Diagnostics.Trace.Assert%2A> outputs two messages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Assert/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Assert2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Assert/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -908,7 +908,7 @@ For .NET Framework apps, you can also set the <xref:System.Diagnostics.Debug.Aut
 The following example creates a <xref:System.Diagnostics.TextWriterTraceListener> named `myTextListener`. `myTextListener` uses a <xref:System.IO.StreamWriter> called `myOutputWriter` to write to a file named `TestFile.txt`. The example creates the file, stream, and text writer, writes one line of text to the file, and then flushes and closes the output.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Close/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1006,12 +1006,12 @@ The following example creates a <xref:System.Diagnostics.TextWriterTraceListener
 The following example uses the <xref:System.Diagnostics.Debug.Fail%2A> method to print a message during exception handling.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Fail/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Fail Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Fail/source.vb" id="Snippet1":::
 
  You can also use the <xref:System.Diagnostics.Debug.Fail%2A> method in a switch statement.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Fail/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Fail Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Fail/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1101,12 +1101,12 @@ The following example uses the <xref:System.Diagnostics.Debug.Fail%2A> method to
 The following example uses the <xref:System.Diagnostics.Debug.Fail%2A> method to print a message during exception handling.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Fail/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Fail1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Fail/source1.vb" id="Snippet1":::
 
 You can also use the <xref:System.Diagnostics.Debug.Fail%2A> method in a switch statement.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Fail/source1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Fail1 Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Fail/source1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1180,7 +1180,7 @@ You can also use the <xref:System.Diagnostics.Debug.Fail%2A> method in a switch
 The following example creates a <xref:System.Diagnostics.TextWriterTraceListener> named `myTextListener`. `myTextListener` uses a <xref:System.IO.FileStream> called `myFileStream` to write to a file named `TestFile.txt`. The example creates the stream, opens the file if it exists or creates a new one, writes one line of text to the file, and then flushes and closes the output.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Close/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1249,7 +1249,7 @@ The following example creates a <xref:System.Diagnostics.TextWriterTraceListener
 The following example sets the indent level and emits debugging messages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Indent/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.IndentLevel Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Indent/source.vb" id="Snippet1":::
 
  This example produces the following output:
 
@@ -1320,7 +1320,7 @@ The <xref:System.Diagnostics.Debug.IndentLevel%2A> property represents the numbe
 The following example sets the indent level and emits debugging messages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Indent/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.IndentLevel Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Indent/source.vb" id="Snippet1":::
 
  This example produces the following output:
 
@@ -1457,7 +1457,7 @@ For .NET Framework apps, you can also set the <xref:System.Diagnostics.Debug.Aut
 The following example creates a <xref:System.Diagnostics.TextWriterTraceListener> that outputs to the console screen. The code then adds the new listener to the <xref:System.Diagnostics.Debug.Listeners%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Listeners/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Listeners Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Listeners/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1691,7 +1691,7 @@ The following example creates a <xref:System.Diagnostics.TextWriterTraceListener
 The following example sets the indent level and emits debugging messages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Indent/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.IndentLevel Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Indent/source.vb" id="Snippet1":::
 
  This example produces the following output:
 
@@ -1788,7 +1788,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Write/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Write Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Write/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1871,7 +1871,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Write/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Write Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Write/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1958,7 +1958,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Write/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Write Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Write/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2045,7 +2045,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/Write/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.Write Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/Write/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2215,7 +2215,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs a message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteIf/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2316,7 +2316,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteIf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2497,7 +2497,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Error` or higher, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteIf/source3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2602,7 +2602,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Error` or higher, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteIf/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteIf2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteIf/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2713,7 +2713,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the name of the object on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteLine/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2797,7 +2797,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteLine/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2884,7 +2884,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteLine/source3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3058,7 +3058,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message and the `category` on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteLine/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLine2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteLine/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3225,7 +3225,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the name of the object on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteLineIf/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3327,7 +3327,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteLineIf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3507,7 +3507,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteLineIf/source3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3612,7 +3612,7 @@ The following example creates a <xref:System.Diagnostics.TraceSwitch> named `gen
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message and the `category` on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Debug/WriteLineIf/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Debug.WriteLineIf2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Debug/WriteLineIf/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/EventLog.xml b/xml/System.Diagnostics/EventLog.xml
index e7bf915f077..2aa3cc91779 100644
--- a/xml/System.Diagnostics/EventLog.xml
+++ b/xml/System.Diagnostics/EventLog.xml
@@ -129,7 +129,7 @@
 > You must run this application as an administrator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.CreateEventSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -204,7 +204,7 @@
  The following example creates the source `MySource` if it does not already exist, and writes an entry to the event log `MyNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.CreateEventSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -279,7 +279,7 @@
  The following example reads entries in the event log, "myNewLog", on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -356,7 +356,7 @@
  The following example reads entries in the event log, "myNewLog", on the computer "myServer".
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -430,7 +430,7 @@
  The following example writes an entry to an event log, "MyNewLog", on the local computer, using the source "MySource".
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/.ctor/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EventLog3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -544,7 +544,7 @@
 >  Because Application, System, Security, and other non-custom logs can contain crucial information; be sure to specify a custom log before executing this example code. This example deletes the custom log `myNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Clear/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -924,7 +924,7 @@ SVC_UPDATE.EXE
  The following example creates the source `MySource` if it does not already exist, and writes an entry to the event log `MyNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.CreateEventSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1058,7 +1058,7 @@ SVC_UPDATE.EXE
  The following example creates the source `MySource` on the computer `MyServer`, and writes an entry to the event log `MyNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/CreateEventSource/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.SourceExists1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/CreateEventSource/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1177,7 +1177,7 @@ SVC_UPDATE.EXE
 >  More than one source might write to an event log. Before deleting a custom log, make sure there are no other sources writing to that log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Delete/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.DeleteEventSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Delete/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1259,7 +1259,7 @@ SVC_UPDATE.EXE
 >  More than one source might write to an event log. Before deleting a custom log, make sure there are no other sources writing to that log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Delete/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Delete1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Delete/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1359,7 +1359,7 @@ SVC_UPDATE.EXE
 >  More than one source might write to an event log. Before deleting a custom log, make sure there are no other sources writing to that log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Delete/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.DeleteEventSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Delete/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1435,7 +1435,7 @@ SVC_UPDATE.EXE
 >  More than one source might write to an event log. Before deleting a custom log, make sure there are no other sources writing to that log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Delete/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Delete1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Delete/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1572,7 +1572,7 @@ SVC_UPDATE.EXE
  The following example handles an <xref:System.Diagnostics.EventLog.EntryWritten> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/EnableRaisingEvents/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EnableRaisingEvents Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/EnableRaisingEvents/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1695,7 +1695,7 @@ SVC_UPDATE.EXE
  The following example reads entries in the event log, "MyNewLog", on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Entries/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Entries Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Entries/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1759,7 +1759,7 @@ SVC_UPDATE.EXE
  The following example handles an entry written event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/EntryWritten/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.EntryWritten Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/EntryWritten/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2033,7 +2033,7 @@ SVC_UPDATE.EXE
  The following example gets a list of logs on the computer "myServer". It then outputs the name of each log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/GetEventLogs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.GetEventLogs1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/GetEventLogs/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2146,7 +2146,7 @@ SVC_UPDATE.EXE
  The following example reads entries in the event log, "NewEventLog", on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Log/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Log Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Log/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2274,7 +2274,7 @@ SVC_UPDATE.EXE
 >  More than one source might write to an event log. Before deleting a custom log, make sure there are no other sources writing to that log.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Delete/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.DeleteEventSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Delete/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2356,7 +2356,7 @@ SVC_UPDATE.EXE
  The following example reads entries in the event log, "NewEventLog", on a specified computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/MachineName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.MachineName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/MachineName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2950,7 +2950,7 @@ SVC_UPDATE.EXE
  The following example creates the source `MySource` if it does not already exist, and writes an entry to the event log `MyNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Source/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Source Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Source/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3039,7 +3039,7 @@ SVC_UPDATE.EXE
  The following example creates the source `MySource` if it does not already exist, and writes an entry to the event log `MyNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Source/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.Source Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Source/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3123,7 +3123,7 @@ SVC_UPDATE.EXE
  The following example creates the source `MySource` on the computer `MyServer`, and writes an entry to the event log `MyNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/CreateEventSource/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.SourceExists1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/CreateEventSource/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3287,7 +3287,7 @@ SVC_UPDATE.EXE
  The following example creates the source `MySource` if it does not already exist, and writes an entry to the event log `MyNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.CreateEventSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3396,7 +3396,7 @@ SVC_UPDATE.EXE
  The following example writes a warning entry to an event log, "MyNewLog", on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3493,7 +3493,7 @@ SVC_UPDATE.EXE
  The following example creates the source `MySource` if it does not already exist, and writes an entry to the event log `MyNewLog`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3707,7 +3707,7 @@ SVC_UPDATE.EXE
  The following example writes a warning entry to an event log, "MyNewLog", on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLog/WriteEntry/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLog.WriteEntry3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLog/WriteEntry/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/EventLogTraceListener.xml b/xml/System.Diagnostics/EventLogTraceListener.xml
index e49304c6990..7a65ba10845 100644
--- a/xml/System.Diagnostics/EventLogTraceListener.xml
+++ b/xml/System.Diagnostics/EventLogTraceListener.xml
@@ -71,7 +71,7 @@ To add an <xref:System.Diagnostics.EventLogTraceListener> using a .NET Framework
  The following example creates a trace listener that sends output to an event log. First, the code creates a new <xref:System.Diagnostics.EventLogTraceListener> that uses the source `myEventLogSource`. Next, `myTraceListener` is added to the <xref:System.Diagnostics.Trace.Listeners%2A?displayProperty=nameWithType> collection. Finally, the example sends a line of output to the <xref:System.Diagnostics.Trace.Listeners%2A> object.
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/EventLogTraceListener/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic EventLogTraceListener Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/EventLogTraceListener/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics/FileVersionInfo.xml b/xml/System.Diagnostics/FileVersionInfo.xml
index a6683ab47ff..78e7ff1361b 100644
--- a/xml/System.Diagnostics/FileVersionInfo.xml
+++ b/xml/System.Diagnostics/FileVersionInfo.xml
@@ -79,7 +79,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the file description and version number to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -145,7 +145,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the comments in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/Comments/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/Classic FileVersionInfo.Comments Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/Comments/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -204,7 +204,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.CompanyName%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/CompanyName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.CompanyName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/CompanyName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -277,7 +277,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.FileBuildPart%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/FileBuildPart/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileBuildPart Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileBuildPart/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -341,7 +341,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.FileDescription%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/FileDescription/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileDescription Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileDescription/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -414,7 +414,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.FileMajorPart%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/FileMajorPart/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileMajorPart Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileMajorPart/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -491,7 +491,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.FileMinorPart%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/FileMinorPart/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileMinorPart Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileMinorPart/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -553,7 +553,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.FileName%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/FileName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FileName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FileName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -626,7 +626,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.FilePrivatePart%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/FilePrivatePart/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.FilePrivatePart Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/FilePrivatePart/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -703,7 +703,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the file description and version number in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -764,7 +764,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for Notepad and  displays the file description and version number in the console window.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -850,7 +850,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.InternalName%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/InternalName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.InternalName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/InternalName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -910,7 +910,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it displays the state of the Boolean <xref:System.Diagnostics.FileVersionInfo.IsDebug%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/IsDebug/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsDebug Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsDebug/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -963,7 +963,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it displays the state of the Boolean <xref:System.Diagnostics.FileVersionInfo.IsPatched%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/IsPatched/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPatched Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPatched/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1016,7 +1016,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it displays whether this version is a prerelease version in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/IsPreRelease/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPreRelease Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPreRelease/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1074,7 +1074,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it displays the private build information in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/IsPrivateBuild/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsPrivateBuild Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsPrivateBuild/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1133,7 +1133,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it displays whether this version is a special build version in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/IsSpecialBuild/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.IsSpecialBuild Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/IsSpecialBuild/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1247,7 +1247,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.LegalCopyright%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/LegalCopyright/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.LegalCopyright Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/LegalCopyright/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1311,7 +1311,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.LegalTrademarks%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/LegalTrademarks/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.LegalTrademarks Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/LegalTrademarks/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1375,7 +1375,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.OriginalFilename%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/OriginalFilename/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.OriginalFilename Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/OriginalFilename/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1439,7 +1439,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the private build information in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/PrivateBuild/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.PrivateBuild Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/PrivateBuild/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1513,7 +1513,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.ProductBuildPart%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/ProductBuildPart/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductBuildPart Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductBuildPart/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1590,7 +1590,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.ProductMajorPart%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/ProductMajorPart/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductMajorPart Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductMajorPart/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1666,7 +1666,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.ProductMinorPart%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/ProductMinorPart/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductMinorPart Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductMinorPart/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1728,7 +1728,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.ProductName%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/ProductName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1801,7 +1801,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.ProductPrivatePart%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/ProductPrivatePart/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductPrivatePart Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductPrivatePart/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1877,7 +1877,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the <xref:System.Diagnostics.FileVersionInfo.ProductVersion%2A> in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/ProductVersion/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ProductVersion Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ProductVersion/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1945,7 +1945,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the special build information in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/SpecialBuild/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.SpecialBuild Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/SpecialBuild/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2005,7 +2005,7 @@
  The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it calls <xref:System.Diagnostics.FileVersionInfo.ToString%2A> to print a list of the file version information in a text box. This code assumes `textBox1` has been instantiated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/FileVersionInfo/ToString/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileVersionInfo.ToString Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/FileVersionInfo/ToString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/Switch.xml b/xml/System.Diagnostics/Switch.xml
index efddcaeb378..ddd646b1bd8 100644
--- a/xml/System.Diagnostics/Switch.xml
+++ b/xml/System.Diagnostics/Switch.xml
@@ -86,17 +86,17 @@
  The first example creates the enumeration used to set the level of the switch.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Switch/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Switch Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Switch/Overview/source.vb" id="Snippet1":::
 
  The following example creates the new switch. The code implements a `Level` property to set the value of the new switch. `Level` calls the protected property <xref:System.Diagnostics.Switch.SwitchSetting%2A> that assigns the value to the new switch. This example also implements two assessor properties to get the assigned value of the switch.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Switch/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Switch Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Switch/Overview/source.vb" id="Snippet2":::
 
  The following example creates a new switch in `Main`. It creates a new switch and assigns it a value. Then, depending on the switch settings, it outputs debugging messages for entering and leaving the method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Switch/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Switch Example/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Switch/Overview/source.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Diagnostics/TextWriterTraceListener.xml b/xml/System.Diagnostics/TextWriterTraceListener.xml
index 495dfd0b8e2..f93acc61775 100644
--- a/xml/System.Diagnostics/TextWriterTraceListener.xml
+++ b/xml/System.Diagnostics/TextWriterTraceListener.xml
@@ -93,7 +93,7 @@
  After running this sample, you can open the `TestFile.txt` file to see the output.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TextWriterTraceListener/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -170,7 +170,7 @@
  The following example creates a <xref:System.Diagnostics.TextWriterTraceListener> using the <xref:System.Diagnostics.TextWriterTraceListener.%23ctor> constructor. It sets the <xref:System.Diagnostics.TextWriterTraceListener.Writer%2A> property to console output, and then adds the <xref:System.Diagnostics.TextWriterTraceListener> to the <xref:System.Diagnostics.TraceListenerCollection>. It writes a message in two segments, and then closes the <xref:System.Diagnostics.TextWriterTraceListener>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TextWriterTraceListener/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.WriteLine Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -303,7 +303,7 @@
  The following code example creates a <xref:System.Diagnostics.TextWriterTraceListener> using the <xref:System.Diagnostics.TextWriterTraceListener.%23ctor%28System.IO.TextWriter%29> constructor. The example creates a <xref:System.IO.StreamWriter>, then references the <xref:System.IO.StreamWriter> when it creates the <xref:System.Diagnostics.TextWriterTraceListener>, which it then adds to the <xref:System.Diagnostics.TraceListenerCollection>. The example writes a message to all <xref:System.Diagnostics.TraceListener> objects in the <xref:System.Diagnostics.TraceListenerCollection>, then closes this <xref:System.Diagnostics.TextWriterTraceListener>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TextWriterTraceListener/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -666,7 +666,7 @@
  The following example implements a <xref:System.Diagnostics.TextWriterTraceListener> named `myTextListener`, which uses a <xref:System.IO.StreamWriter> called `myOutputWriter` to write to a file named `TestFile.txt`. The example creates the file, stream, and text writer, writes one line of text to the file, and then flushes and closes the stream.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TextWriterTraceListener/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -780,7 +780,7 @@
  The following example implements a <xref:System.Diagnostics.TextWriterTraceListener> named `myTextListener`, which uses a <xref:System.IO.StreamWriter> called `myOutputWriter` to write to a file named `TestFile.txt`. The example creates the file, stream, and text writer, writes one line of text to the file, and then flushes and closes the stream.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TextWriterTraceListener/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -845,7 +845,7 @@
  The following example implements a <xref:System.Diagnostics.TextWriterTraceListener> named `myWriter` to write to the console screen. The example writes two lines to the console screen. Note the second write appears on the same line as the first write. The example then flushes and closes the stream.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TextWriterTraceListener/Write/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Write Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Write/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -910,7 +910,7 @@
  The following example implements a <xref:System.Diagnostics.TextWriterTraceListener> named `myWriter` to write to the console screen. The example writes two lines to the console screen. Note the second write appears on the same line as the first write. The example then flushes and closes the stream.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TextWriterTraceListener/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.WriteLine Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -978,7 +978,7 @@
  The following example creates a <xref:System.Diagnostics.TextWriterTraceListener> that writes to the console screen. Then the code adds the new trace listener to the <xref:System.Diagnostics.Trace.Listeners%2A> in the trace class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TextWriterTraceListener/Writer/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TextWriterTraceListener.Writer Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TextWriterTraceListener/Writer/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/Trace.xml b/xml/System.Diagnostics/Trace.xml
index 6aea8fb4087..c8f7b39f7ed 100644
--- a/xml/System.Diagnostics/Trace.xml
+++ b/xml/System.Diagnostics/Trace.xml
@@ -98,7 +98,7 @@ In .NET Framework apps, you can set the <xref:System.Diagnostics.Trace.AutoFlush
  The following example uses <xref:System.Diagnostics.Trace> to indicate the beginning and the end of a program's execution. The example also uses the <xref:System.Diagnostics.Trace.Indent%2A?displayProperty=nameWithType> and <xref:System.Diagnostics.Trace.Unindent%2A?displayProperty=nameWithType> methods to distinguish the tracing output. For a more complete example of the use of <xref:System.Diagnostics.Trace>, see [How to: Add Trace Statements to Application Code](/dotnet/framework/debug-trace-profile/how-to-add-trace-statements-to-application-code).
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -214,7 +214,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
  The following example creates an index for an array. Then some action is performed that sets the value of the index. Next the code calls <xref:System.Diagnostics.Trace.Assert%2A> to verify the index value is valid. If it is not valid, the <xref:System.Diagnostics.Trace.Assert%2A> outputs the call stack.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Assert/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Assert/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -325,7 +325,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
  The following example checks to see that the `type` parameter is valid. If the `type` passed in is `null`, the <xref:System.Diagnostics.Trace.Assert%2A> outputs a message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Assert/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Assert/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -429,7 +429,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
  The following example checks to see that the `type` parameter is valid. If the `type` passed in is `null`, the <xref:System.Diagnostics.Trace.Assert%2A> outputs a message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Assert/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Assert2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Assert/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -570,7 +570,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
  The following example creates a <xref:System.Diagnostics.TextWriterTraceListener> named `myTextListener`. `myTextListener` uses a <xref:System.IO.StreamWriter> called `myOutputWriter` to write to a file named `TestFile.txt`. The example creates the file, stream and text writer, writes one line of text to the file, and then flushes and closes the output.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Close/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Flush Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -721,12 +721,12 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
  The following example uses the <xref:System.Diagnostics.Trace.Fail%2A> method to print a message during exception handling.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Fail/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Fail Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Fail/source.vb" id="Snippet1":::
 
  You can also use the <xref:System.Diagnostics.Trace.Fail%2A> method in a switch statement.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Fail/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Fail Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Fail/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -811,12 +811,12 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
  The following example uses the <xref:System.Diagnostics.Trace.Fail%2A> method to print a message during exception handling.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Fail/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Fail1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Fail/source1.vb" id="Snippet1":::
 
  You can also use the <xref:System.Diagnostics.Trace.Fail%2A> method in a switch statement.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Fail/source1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Fail1 Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Fail/source1.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -886,7 +886,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
  The following example creates a <xref:System.Diagnostics.TextWriterTraceListener> named `myTextListener`. `myTextListener` uses a <xref:System.IO.StreamWriter> called `myOutputWriter` to write to a file named `TestFile.txt`. The example creates the file, stream and text writer, writes one line of text to the file, and then flushes and closes the output.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Close/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Flush Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -951,7 +951,7 @@ For .NET Framework apps, you can change the behavior of the <xref:System.Diagnos
  The following example increments and decrements the indent level and emits tracing messages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Indent/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.IndentLevel Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Indent/source.vb" id="Snippet1":::
 
  This example produces the following output:
 
@@ -1020,7 +1020,7 @@ End of list of errors
  The following example increments and decrements the indent level and emits tracing messages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Indent/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.IndentLevel Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Indent/source.vb" id="Snippet1":::
 
  This example produces the following output:
 
@@ -1174,7 +1174,7 @@ End of list of errors
  The following example creates a <xref:System.Diagnostics.ConsoleTraceListener> that outputs to the console screen. The code then adds the new listener to the <xref:System.Diagnostics.Trace.Listeners%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Listeners/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Listeners Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Listeners/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1793,7 +1793,7 @@ End of list of errors
  The following example increments and decrements the indent level and emits tracing messages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Indent/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.IndentLevel Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Indent/source.vb" id="Snippet1":::
 
  This example produces the following output:
 
@@ -1954,7 +1954,7 @@ End of list of errors
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs a message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Write/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Write/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2039,7 +2039,7 @@ End of list of errors
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. A line terminator follows the second message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Write/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Write/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2128,7 +2128,7 @@ End of list of errors
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Error` or higher, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Write/source3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Write/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2217,7 +2217,7 @@ End of list of errors
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Error` or higher, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Write/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Write/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2310,7 +2310,7 @@ End of list of errors
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs a message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteIf/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2409,7 +2409,7 @@ Trace.WriteIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range");
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteIf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2512,7 +2512,7 @@ Trace.WriteIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range");
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Error` or higher, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteIf/source3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2615,7 +2615,7 @@ Trace.WriteIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range");
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Error` or higher, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteIf/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2721,7 +2721,7 @@ Trace.WriteIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range");
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the name of the object on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteLine/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2801,7 +2801,7 @@ Trace.WriteIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range");
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Write/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Write Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Write/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2885,7 +2885,7 @@ Trace.WriteIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range");
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteLine/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2969,7 +2969,7 @@ Trace.WriteIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range");
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message and the `category` on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteLine/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLine2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteLine/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3062,7 +3062,7 @@ Trace.WriteIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range");
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the name of the object on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteLineIf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3161,7 +3161,7 @@ Trace.WriteLineIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range")
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteIf/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteIf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteIf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3264,7 +3264,7 @@ Trace.WriteLineIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range")
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteLineIf/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3367,7 +3367,7 @@ Trace.WriteLineIf(mySwitch.TraceError, "aNumber = " + aNumber + " out of range")
  Then, if the <xref:System.Diagnostics.TraceLevel> is set to `Verbose`, the example outputs the second error message and the `category` on the same line as the first message. The second message is followed by a line terminator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/WriteLineIf/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.WriteLineIf2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/WriteLineIf/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/TraceListenerCollection.xml b/xml/System.Diagnostics/TraceListenerCollection.xml
index c1d4f100e24..4a699f657f3 100644
--- a/xml/System.Diagnostics/TraceListenerCollection.xml
+++ b/xml/System.Diagnostics/TraceListenerCollection.xml
@@ -79,7 +79,7 @@
  The following example creates a <xref:System.Diagnostics.ConsoleTraceListener> that writes to the console screen. The code then adds the new listener to the <xref:System.Diagnostics.Trace.Listeners%2A?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/Trace/Listeners/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Trace.Listeners Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/Trace/Listeners/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -141,7 +141,7 @@
  The following example creates a <xref:System.Diagnostics.TextWriterTraceListener> that outputs to the console screen. The code then adds the new listener to the <xref:System.Diagnostics.Trace.Listeners%2A?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceListenerCollection/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceListenerCollection.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceListenerCollection/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Diagnostics/TraceSwitch.xml b/xml/System.Diagnostics/TraceSwitch.xml
index f9422b920fd..dc314f23482 100644
--- a/xml/System.Diagnostics/TraceSwitch.xml
+++ b/xml/System.Diagnostics/TraceSwitch.xml
@@ -82,7 +82,7 @@ In .NET Framework apps only, you can also set the level of a <xref:System.Diagno
  In your application, you can use the configured switch level by creating a <xref:System.Diagnostics.TraceSwitch> with the same name, as shown in the following example:
   
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/Overview/remarks.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/remarks.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/remarks.vb" id="Snippet3":::
 
 In .NET Core and .NET 5+ apps, the <xref:System.Diagnostics.TraceSwitch.Level> of the new switch defaults to <xref:System.Diagnostics.TraceLevel.Off?displayProperty=nameWithType>.
 
@@ -106,7 +106,7 @@ In .NET Framework apps, the switch <xref:System.Diagnostics.TraceSwitch.Level%2A
  The following code example creates a new <xref:System.Diagnostics.TraceSwitch> and uses the switch to determine whether to print error messages. The switch is created at the class level. `MyMethod` writes the first error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> property is set to <xref:System.Diagnostics.TraceLevel.Error?displayProperty=nameWithType> or higher. However, `MyMethod` does not write the second error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> is less than <xref:System.Diagnostics.TraceLevel.Verbose?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -204,7 +204,7 @@ You can also use text to specify the value for a switch. For example, `true` for
  In your application, you can use the configured switch level by creating a <xref:System.Diagnostics.TraceSwitch> with the same name, as shown in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/Overview/remarks.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/remarks.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/remarks.vb" id="Snippet3":::
 
 This constructor sets the <xref:System.Diagnostics.TraceSwitch.Level> property of the new switch to <xref:System.Diagnostics.TraceLevel.Off?displayProperty=nameWithType>. Or, for .NET Framework apps, the switch settings are obtained from the configuration file, if available.
 
@@ -217,7 +217,7 @@ This constructor sets the <xref:System.Diagnostics.TraceSwitch.Level> property o
  The following code example creates a new <xref:System.Diagnostics.TraceSwitch> and uses the switch to determine whether to print error messages. The switch is created at the class level. `MyMethod` writes the first error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> property is set to <xref:System.Diagnostics.TraceLevel.Error?displayProperty=nameWithType> or higher. However, `MyMethod` does not write the second error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> is less than <xref:System.Diagnostics.TraceLevel.Verbose?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -363,7 +363,7 @@ The default value of the <xref:System.Diagnostics.TraceSwitch.Level> property is
  The following code example creates a new <xref:System.Diagnostics.TraceSwitch> and uses the switch to determine whether to print error messages. The switch is created at the class level. `MyMethod` writes the first error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> property is set to <xref:System.Diagnostics.TraceLevel.Error?displayProperty=nameWithType> or higher. However, `MyMethod` does not write the second error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> is less than <xref:System.Diagnostics.TraceLevel.Verbose?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/Level/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.Level Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/Level/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -534,7 +534,7 @@ The default value of the <xref:System.Diagnostics.TraceSwitch.Level> property is
  The following code example creates a new <xref:System.Diagnostics.TraceSwitch> and uses the switch to determine whether to emit error messages. The switch is created at the class level. `MyMethod` writes the first error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> property is set to <xref:System.Diagnostics.TraceLevel.Error?displayProperty=nameWithType> or higher. However, `MyMethod` does not write the second error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> is less than <xref:System.Diagnostics.TraceLevel.Verbose?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -597,7 +597,7 @@ The default value of the <xref:System.Diagnostics.TraceSwitch.Level> property is
  The following code example creates a new <xref:System.Diagnostics.TraceSwitch> and uses the switch to determine whether to emit error messages. The switch is created at the class level. `MyMethod` writes the first error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> property is set to <xref:System.Diagnostics.TraceLevel.Info?displayProperty=nameWithType> or higher. However, `MyMethod` does not write the second error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> is less than <xref:System.Diagnostics.TraceLevel.Verbose?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/TraceInfo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceInfo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/TraceInfo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -660,7 +660,7 @@ The default value of the <xref:System.Diagnostics.TraceSwitch.Level> property is
  The following code example creates a new <xref:System.Diagnostics.TraceSwitch> and uses the switch to determine whether to emit error messages. The switch is created at the class level. `MyMethod` writes both error messages when the <xref:System.Diagnostics.TraceSwitch.Level%2A> property is set to <xref:System.Diagnostics.TraceLevel.Verbose?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -723,7 +723,7 @@ The default value of the <xref:System.Diagnostics.TraceSwitch.Level> property is
  The following code example creates a new <xref:System.Diagnostics.TraceSwitch> and uses the switch to determine whether to emit error messages. The switch is created at the class level. `MyMethod` writes the first error message if the <xref:System.Diagnostics.TraceSwitch.Level%2A> property is set to <xref:System.Diagnostics.TraceLevel.Warning?displayProperty=nameWithType> or higher. However, `MyMethod` does not write the second error message when the <xref:System.Diagnostics.TraceSwitch.Level%2A> is less than <xref:System.Diagnostics.TraceLevel.Verbose?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Diagnostics/TraceSwitch/TraceWarning/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TraceSwitch.TraceWarning Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Diagnostics/TraceSwitch/TraceWarning/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/DateTimeFormatInfo.xml b/xml/System.Globalization/DateTimeFormatInfo.xml
index 234a0541d34..d72c1e818cd 100644
--- a/xml/System.Globalization/DateTimeFormatInfo.xml
+++ b/xml/System.Globalization/DateTimeFormatInfo.xml
@@ -1368,7 +1368,7 @@ This property is affected if the value of the <xref:System.Globalization.DateTim
  The following example displays the date and time patterns for the current calendar.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/DateTimeFormatInfo/GetAllDateTimePatterns/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DateTimeFormatInfo.GetAllDateTimePatterns Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/DateTimeFormatInfo/GetAllDateTimePatterns/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Globalization/NumberFormatInfo.xml b/xml/System.Globalization/NumberFormatInfo.xml
index 0d344c77046..23ab38a4ace 100644
--- a/xml/System.Globalization/NumberFormatInfo.xml
+++ b/xml/System.Globalization/NumberFormatInfo.xml
@@ -1677,7 +1677,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example prints a value using different <xref:System.Globalization.NumberFormatInfo.NumberGroupSizes%2A> arrays.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/NumberGroupSizes/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NumberFormatInfo.NumberGroupSizes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberGroupSizes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1760,7 +1760,7 @@ On Windows, the initial value of this property is derived from the settings in t
  The following example displays a value using different <xref:System.Globalization.NumberFormatInfo.NumberNegativePattern%2A> patterns.
 
  :::code language="csharp" source="~/snippets/csharp/System.Globalization/NumberFormatInfo/NumberNegativePattern/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NumberFormatInfo.NumberNegativePattern Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Globalization/NumberFormatInfo/NumberNegativePattern/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/DirectoryInfo.xml b/xml/System.IO/DirectoryInfo.xml
index 3416596fc4c..41f1271e43d 100644
--- a/xml/System.IO/DirectoryInfo.xml
+++ b/xml/System.IO/DirectoryInfo.xml
@@ -3598,7 +3598,7 @@ namespace ConsoleApp
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/DirectoryInfo/Name/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/DirectoryInfo/Name/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DirectoryInfo.Name Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/DirectoryInfo/Name/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/ErrorEventArgs.xml b/xml/System.IO/ErrorEventArgs.xml
index 4774d085a1c..2bec222670c 100644
--- a/xml/System.IO/ErrorEventArgs.xml
+++ b/xml/System.IO/ErrorEventArgs.xml
@@ -62,7 +62,7 @@
  The following example creates a new instance of <xref:System.IO.ErrorEventArgs> and initializes it with an <xref:System.Exception>. Then the example calls <xref:System.IO.ErrorEventArgs.GetException%2A> to retrieve the <xref:System.Exception> and display the error message. There is no form associated with this code.
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ErrorEventArgs Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/Overview/source.vb" id="Snippet1":::
 
  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.
 
@@ -128,7 +128,7 @@
  The following example creates a new instance of <xref:System.IO.ErrorEventArgs> and initializes it with an <xref:System.Exception>. Then the example calls <xref:System.IO.ErrorEventArgs.GetException%2A> to retrieve the <xref:System.Exception> and display the error message. There is no form associated with this code.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ErrorEventArgs.ErrorEventArgs Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -181,7 +181,7 @@
  The following example creates a new instance of <xref:System.IO.ErrorEventArgs> and initializes it with an <xref:System.Exception>. Then the example calls <xref:System.IO.ErrorEventArgs.GetException%2A> to retrieve the <xref:System.Exception> and display the error message. There is no form associated with this code.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/ErrorEventArgs/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ErrorEventArgs.ErrorEventArgs Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/ErrorEventArgs/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/FileAccess.xml b/xml/System.IO/FileAccess.xml
index 2dfbafc863b..55c1d7fa072 100644
--- a/xml/System.IO/FileAccess.xml
+++ b/xml/System.IO/FileAccess.xml
@@ -86,7 +86,7 @@
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileAccess/Overview/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileAccess/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileAccess Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileAccess/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/FileMode.xml b/xml/System.IO/FileMode.xml
index 21c806f6ea3..d044aa47e4d 100644
--- a/xml/System.IO/FileMode.xml
+++ b/xml/System.IO/FileMode.xml
@@ -83,7 +83,7 @@
  The following `FileStream` constructor opens an existing file (`FileMode.Open`).
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileAccess/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileAccess Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileAccess/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/FileShare.xml b/xml/System.IO/FileShare.xml
index de73ac87427..5adb513def8 100644
--- a/xml/System.IO/FileShare.xml
+++ b/xml/System.IO/FileShare.xml
@@ -87,7 +87,7 @@
  The following <xref:System.IO.FileStream> constructor opens an existing file and grants read-only access to other users (`Read`).
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileAccess/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileAccess Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileAccess/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/FileStream.xml b/xml/System.IO/FileStream.xml
index ddf9d0ce089..085bdff79ea 100644
--- a/xml/System.IO/FileStream.xml
+++ b/xml/System.IO/FileStream.xml
@@ -2007,7 +2007,7 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/CanRead/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/CanRead/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.CanRead Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/CanRead/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2149,7 +2149,7 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/CanWrite/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/CanWrite/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.CanWrite Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/CanWrite/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3146,7 +3146,7 @@ Calling `DisposeAsync` allows the resources used by the <xref:System.IO.FileStre
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Length/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/Length/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.Length Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Length/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3397,7 +3397,7 @@ If the absolute path is not known, this property returns a string similar to "[U
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/Length/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.IO/FileStream/Length/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.Length Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/Length/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/FileSystemWatcher.xml b/xml/System.IO/FileSystemWatcher.xml
index 8e9581dc7f5..b05d79b4ea2 100644
--- a/xml/System.IO/FileSystemWatcher.xml
+++ b/xml/System.IO/FileSystemWatcher.xml
@@ -78,7 +78,7 @@
         The following example creates a <xref:System.IO.FileSystemWatcher> to watch the directory specified at run time. The component is set to watch for changes in `LastWrite` and `LastAccess` time, the creation, deletion, or renaming of text files in the directory. If a file is changed, created, or deleted, the path to the file prints to the console. When a file is renamed, the old and new paths print to the console.
 
         :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
-        :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+        :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
       ]]></format>
     </example>
     <altmember cref="P:System.IO.FileSystemWatcher.NotifyFilter" />
@@ -168,7 +168,7 @@
  This example uses the <xref:System.Diagnostics> and <xref:System.IO> namespaces.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -461,7 +461,7 @@
  The following example uses the <xref:System.IO.FileSystemWatcher.Changed> event to display the file path to the console whenever the watched file is changed.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -537,7 +537,7 @@
  The following example uses the <xref:System.IO.FileSystemWatcher.Created> event to display the file path to the console whenever the watched file is created.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -612,7 +612,7 @@
  The following example uses the <xref:System.IO.FileSystemWatcher.Deleted> event to display the file path to the console whenever the watched file is deleted.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -792,7 +792,7 @@
  The following example creates a <xref:System.IO.FileSystemWatcher> to watch the directory specified at run time. The component is set to watch for changes in `LastWrite` and `LastAccess` time, the creation, deletion, or renaming of text files in the directory. If a file is changed, created, or deleted, the path to the file prints to the console. When a file is renamed, the old and new paths print to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1025,7 +1025,7 @@
  The following example creates a <xref:System.IO.FileSystemWatcher> to watch the directory specified at run time. The component is set to watch for changes in `LastWrite` and `LastAccess` time, the creation, deletion, or renaming of text files in the directory. If a file is changed, created, or deleted, the path to the file prints to the console. When a file is renamed, the old and new paths print to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1286,7 +1286,7 @@
  The following example creates a <xref:System.IO.FileSystemWatcher> to watch the directory specified at run time. The component is set to watch for changes in `LastWrite` and `LastAccess` time, the creation, deletion, or renaming of text files in the directory. If a file is changed, created, or deleted, the path to the file prints to the console. When a file is renamed, the old and new paths print to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1720,7 +1720,7 @@
  The following example creates a <xref:System.IO.FileSystemWatcher> to watch the directory specified at run time. The component is set to watch for changes in `LastWrite` and `LastAccess` time, the creation, deletion, or renaming of text files in the directory. If a file is changed, created, or deleted, the path to the file prints to the console. When a file is renamed, the old and new paths print to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1804,7 +1804,7 @@ Public Delegate Sub RenamedEventHandler(sender As Object, e As RenamedEventArgs)
  The following example uses the <xref:System.IO.FileSystemWatcher.Renamed> event to display the file path to the console whenever the watched file is renamed.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/NotifyFilters.xml b/xml/System.IO/NotifyFilters.xml
index f72a7da2e07..5c1ce7b3b23 100644
--- a/xml/System.IO/NotifyFilters.xml
+++ b/xml/System.IO/NotifyFilters.xml
@@ -61,7 +61,7 @@
  The following example creates a <xref:System.IO.FileSystemWatcher> to watch the directory that is specified at runtime. The component is set to watch for any changes in LastWrite and LastAccess time, the creation, deletion, or renaming of text files in the directory. If a file is changed, created, or deleted, the path to the file prints to the console. When a file is renamed, the old and new paths print to the console.
   
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileSystemWatcher/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic NotifyFilters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileSystemWatcher/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.IO/Stream.xml b/xml/System.IO/Stream.xml
index c1693e50306..7b7c4237b42 100644
--- a/xml/System.IO/Stream.xml
+++ b/xml/System.IO/Stream.xml
@@ -456,7 +456,7 @@
  The following is an example of using the `CanRead` property.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/FileStream/CanRead/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FileStream.CanRead Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/FileStream/CanRead/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -641,7 +641,7 @@
  The following is an example of using the `CanWrite` property.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Stream/CanWrite/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stream.CanWrite Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Stream/CanWrite/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2130,7 +2130,7 @@
  The following example shows how to use <xref:System.IO.Stream.Read%2A> to read a block of data.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/Stream/Read/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Stream.Read Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/Stream/Read/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO/StreamWriter.xml b/xml/System.IO/StreamWriter.xml
index 209f7bcc58a..ac93717b305 100644
--- a/xml/System.IO/StreamWriter.xml
+++ b/xml/System.IO/StreamWriter.xml
@@ -2248,7 +2248,7 @@ See <xref:System.IO.TextWriter.Write(System.String,System.Object[])> for a descr
  This example writes eight characters from a 13-element array to a file, beginning at the third element of the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO/StreamWriter/Write/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic StreamWriter.Write2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO/StreamWriter/Write/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/MethodRental.xml b/xml/System.Reflection.Emit/MethodRental.xml
index 2ebd010c3b4..f158c5b7791 100644
--- a/xml/System.Reflection.Emit/MethodRental.xml
+++ b/xml/System.Reflection.Emit/MethodRental.xml
@@ -136,7 +136,7 @@
  The following example illustrates how to swap a method body for a new body. It also illustrates how to obtain a method token for an existing method and how to construct a blob of bytes representing the Microsoft Intermediate Language (MSIL) code to be passed to `SwapMethodBody`.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/MethodRental/SwapMethodBody/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodRental.SwapMethodBody Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/MethodRental/SwapMethodBody/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection.Emit/ModuleBuilder.xml b/xml/System.Reflection.Emit/ModuleBuilder.xml
index d5a822832b3..6343c656497 100644
--- a/xml/System.Reflection.Emit/ModuleBuilder.xml
+++ b/xml/System.Reflection.Emit/ModuleBuilder.xml
@@ -1584,7 +1584,7 @@
  The following example creates a <xref:System.Reflection.Emit.TypeBuilder> in the current dynamic module using `CreateType`, builds and completes the type, and saves the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1657,7 +1657,7 @@
  The following example creates a <xref:System.Reflection.Emit.TypeBuilder> in the current dynamic module using `CreateType`, builds and completes the type, and saves the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1744,7 +1744,7 @@
  The following example creates a <xref:System.Reflection.Emit.TypeBuilder> in the current dynamic module using `CreateType`, builds and completes the type, and saves the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1833,7 +1833,7 @@
  The following example creates a <xref:System.Reflection.Emit.TypeBuilder> in the current dynamic module using `CreateType`, builds and completes the type, and saves the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1922,7 +1922,7 @@
  The following example creates a <xref:System.Reflection.Emit.TypeBuilder> in the current dynamic module using `CreateType`, builds and completes the type, and saves the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2022,7 +2022,7 @@
  The following example creates a <xref:System.Reflection.Emit.TypeBuilder> in the current dynamic module using `CreateType`, builds and completes the type, and saves the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2113,7 +2113,7 @@
  The following example creates a <xref:System.Reflection.Emit.TypeBuilder> in the current dynamic module using `CreateType`, builds and completes the type, and saves the assembly.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection.Emit/ModuleBuilder/DefineType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ModuleBuilder.DefineType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection.Emit/ModuleBuilder/DefineType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/AmbiguousMatchException.xml b/xml/System.Reflection/AmbiguousMatchException.xml
index ef2c101c125..3caba2dba2f 100644
--- a/xml/System.Reflection/AmbiguousMatchException.xml
+++ b/xml/System.Reflection/AmbiguousMatchException.xml
@@ -290,7 +290,7 @@
  The following example shows two methods, each named `Mymethod`. One method takes an integer and the other takes a string. If an integer is passed to `Mymethod`, the first method is used. If a string is passed, the second method is used. If it cannot be determined which `Mymethod` to use, `AmbiguousMatchException` is thrown.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/AmbiguousMatchException/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic AmbiguousMatchException.AmbiguousMatchException2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/AmbiguousMatchException/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/Assembly.xml b/xml/System.Reflection/Assembly.xml
index 3a3602ed73d..38e4cb5a218 100644
--- a/xml/System.Reflection/Assembly.xml
+++ b/xml/System.Reflection/Assembly.xml
@@ -2650,7 +2650,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following example displays the name of the module in the returned array that contains the assembly manifest.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Assembly/GetModules/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Assembly.GetModules Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Assembly/GetModules/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/ConstructorInfo.xml b/xml/System.Reflection/ConstructorInfo.xml
index adc5f111903..97c66c8c566 100644
--- a/xml/System.Reflection/ConstructorInfo.xml
+++ b/xml/System.Reflection/ConstructorInfo.xml
@@ -614,7 +614,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following example uses the <xref:System.Reflection.ConstructorInfo.MemberType%2A> property to identify a <xref:System.Reflection.MemberInfo> object as a constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ConstructorInfo/MemberType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.MemberType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ConstructorInfo/MemberType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/FieldAttributes.xml b/xml/System.Reflection/FieldAttributes.xml
index e3364f4f2a6..bbe117147b5 100644
--- a/xml/System.Reflection/FieldAttributes.xml
+++ b/xml/System.Reflection/FieldAttributes.xml
@@ -90,7 +90,7 @@
  In this example, three fields are built and the `FieldAttributes` values are displayed. A `FieldAttributes` value can contain more than one attribute, for example, both `Public` and `Literal`, as shown in the third field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldAttributes/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldAttributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldAttributes/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/FieldInfo.xml b/xml/System.Reflection/FieldInfo.xml
index 5f67174eb22..3769bd7d03c 100644
--- a/xml/System.Reflection/FieldInfo.xml
+++ b/xml/System.Reflection/FieldInfo.xml
@@ -217,7 +217,7 @@
  The following code example builds three fields and displays their field attributes. A `FieldAttributes` value can contain more than one attribute, such as both `Public` and `Literal`, as shown in the third field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldAttributes/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldAttributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldAttributes/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -402,7 +402,7 @@
  The following example creates a field, gets its type and <xref:System.Reflection.FieldInfo>, and displays its <xref:System.Reflection.FieldInfo.FieldType%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/FieldType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.FieldType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/FieldType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1100,7 +1100,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following code example defines fields with varying levels of visibility, and displays the values of their <xref:System.Reflection.FieldInfo.IsAssembly%2A>, <xref:System.Reflection.FieldInfo.IsFamily%2A>, <xref:System.Reflection.FieldInfo.IsFamilyOrAssembly%2A>, and <xref:System.Reflection.FieldInfo.IsFamilyAndAssembly%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsAssembly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsAssembly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1169,7 +1169,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
 
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsAssembly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsAssembly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1240,7 +1240,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following code example defines fields with varying levels of visibility, and displays the values of their <xref:System.Reflection.FieldInfo.IsAssembly%2A>, <xref:System.Reflection.FieldInfo.IsFamily%2A>, <xref:System.Reflection.FieldInfo.IsFamilyOrAssembly%2A>, and <xref:System.Reflection.FieldInfo.IsFamilyAndAssembly%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsAssembly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsAssembly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1312,7 +1312,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following code example defines fields with varying levels of visibility, and displays the values of their <xref:System.Reflection.FieldInfo.IsAssembly%2A>, <xref:System.Reflection.FieldInfo.IsFamily%2A>, <xref:System.Reflection.FieldInfo.IsFamilyOrAssembly%2A>, and <xref:System.Reflection.FieldInfo.IsFamilyAndAssembly%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsAssembly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsAssembly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1385,7 +1385,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  In the following example, two fields are created. The second field is read-only, having no set accessor, and `IsInitOnly` is set to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsInitOnly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsInitOnly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsInitOnly/source.vb" id="Snippet1":::
 
  This code produces the following output:
 
@@ -1728,7 +1728,7 @@ Myfieldb - B readonly field, IsInitOnly = True
  The following example returns a value indicating whether or not the field of the class is public or private.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsPublic/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsPublic Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsPublic/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2062,7 +2062,7 @@ Myfieldb - B readonly field, IsInitOnly = True
  The following example determines whether the specified field is static and displays the result.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/IsStatic/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.IsStatic Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/IsStatic/source.vb" id="Snippet1":::
 
  This code produces the following output:
 
@@ -2138,7 +2138,7 @@ Myfieldb - B static field; IsStatic - True
  The following example determines whether the specified member is a field and displays the result.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/FieldInfo/MemberType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldInfo.MemberType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/FieldInfo/MemberType/source.vb" id="Snippet1":::
 
  This code produces the following output:
 
diff --git a/xml/System.Reflection/IReflect.xml b/xml/System.Reflection/IReflect.xml
index 2ad6514e6a3..a0efb4c0941 100644
--- a/xml/System.Reflection/IReflect.xml
+++ b/xml/System.Reflection/IReflect.xml
@@ -841,7 +841,7 @@
  The following example obtains the value of the <xref:System.DateTime.Now%2A> property.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/IReflect/InvokeMember/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic IReflect.InvokeMember Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/IReflect/InvokeMember/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/MemberInfo.xml b/xml/System.Reflection/MemberInfo.xml
index 8ad4f29b065..b8ef925efd1 100644
--- a/xml/System.Reflection/MemberInfo.xml
+++ b/xml/System.Reflection/MemberInfo.xml
@@ -286,7 +286,7 @@
  The following example defines an interface, `IValue`, with a single member, `GetValue`. It also defines four classes: `A`, a base class that implements the `IValue` interface; `B`, which inherits from `A` and hides its implementation of `GetValue` from the base class implementation; `C`, which simply inherits from `A`; and `D`, which inherits from `A` and overrides its `GetValue` method.  The example then retrieves a <xref:System.Reflection.MemberInfo> object for each member of the type (including members inherited from <xref:System.Object>) and displays the value of its <xref:System.Reflection.MemberInfo.DeclaringType%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MemberInfo/DeclaringType/Example2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.DeclaringType Example/VB/Example2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MemberInfo/DeclaringType/Example2.vb" id="Snippet2":::
 
  Note that the declaring type of `A.GetValue` is `A`, that `B` includes two `GetValue` methods, one declared by `A` and one by `B`, and that the declaring type of `D.GetValue` is `D`.
 
@@ -867,7 +867,7 @@ For more information, see [How to use and debug assembly unloadability in .NET C
  The following example displays the member name and type of a specified class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ConstructorInfo/MemberType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.MemberType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ConstructorInfo/MemberType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1053,7 +1053,7 @@ For more information, see [How to use and debug assembly unloadability in .NET C
  This example lists the `Name` and `DeclaringType` property of each member of the specified class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MemberInfo/Name/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.Name Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MemberInfo/Name/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1230,7 +1230,7 @@ For more information, see [How to use and debug assembly unloadability in .NET C
  The following code example shows how the <xref:System.Reflection.MemberInfo.ReflectedType%2A> changes when the member <xref:System.Object.ToString%2A?displayProperty=nameWithType> is viewed from a <xref:System.Reflection.MemberInfo> obtained from type <xref:System.Object> and from a <xref:System.Reflection.MemberInfo> obtained from the <xref:System.Reflection.MemberInfo> class itself, which inherits <xref:System.Object> but does not override <xref:System.Object.ToString%2A?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MemberInfo/ReflectedType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MemberInfo.ReflectedType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MemberInfo/ReflectedType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/MethodAttributes.xml b/xml/System.Reflection/MethodAttributes.xml
index bb55cc1d468..f67b6741b34 100644
--- a/xml/System.Reflection/MethodAttributes.xml
+++ b/xml/System.Reflection/MethodAttributes.xml
@@ -78,7 +78,7 @@
  The following example displays the attributes of the specified method.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodAttributes/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodAttributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodAttributes/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/MethodBase.xml b/xml/System.Reflection/MethodBase.xml
index 1ffe39d960c..774005a6d45 100644
--- a/xml/System.Reflection/MethodBase.xml
+++ b/xml/System.Reflection/MethodBase.xml
@@ -206,7 +206,7 @@
  The following code example displays the attributes of the user-defined method Mymethod.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetFields/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.Attributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetFields/source.vb" id="Snippet1":::
 
  This code produces the following output:
 
@@ -1091,7 +1091,7 @@
  The following code example demonstrates dynamic method lookup using reflection. Note that you cannot use the <xref:System.Reflection.MethodInfo> object from the base class to invoke the overridden method in the derived class, because late binding cannot resolve overrides.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/Invoke/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.Invoke1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/Invoke/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1301,7 +1301,7 @@ This method dynamically invokes the method reflected by this instance on `obj`,
  The following example determines whether specified the method is abstract and displays the result.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsAbstract/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAbstract Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsAbstract/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1369,7 +1369,7 @@ This method dynamically invokes the method reflected by this instance on `obj`,
  The following code example defines methods with varying levels of visibility, and displays the values of their <xref:System.Reflection.MethodBase.IsAssembly%2A>, <xref:System.Reflection.MethodBase.IsFamily%2A>, <xref:System.Reflection.MethodBase.IsFamilyOrAssembly%2A>, and <xref:System.Reflection.MethodBase.IsFamilyAndAssembly%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsAssembly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAssembly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1542,7 +1542,7 @@ This method dynamically invokes the method reflected by this instance on `obj`,
  The following code example defines methods with varying levels of visibility, and displays the values of their <xref:System.Reflection.MethodBase.IsAssembly%2A>, <xref:System.Reflection.MethodBase.IsFamily%2A>, <xref:System.Reflection.MethodBase.IsFamilyOrAssembly%2A>, and <xref:System.Reflection.MethodBase.IsFamilyAndAssembly%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsAssembly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAssembly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1610,7 +1610,7 @@ This method dynamically invokes the method reflected by this instance on `obj`,
  The following code example defines methods with varying levels of visibility, and displays the values of their <xref:System.Reflection.MethodBase.IsAssembly%2A>, <xref:System.Reflection.MethodBase.IsFamily%2A>, <xref:System.Reflection.MethodBase.IsFamilyOrAssembly%2A>, and <xref:System.Reflection.MethodBase.IsFamilyAndAssembly%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsAssembly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAssembly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1682,7 +1682,7 @@ This method dynamically invokes the method reflected by this instance on `obj`,
  The following code example defines methods with varying levels of visibility, and displays the values of their <xref:System.Reflection.MethodBase.IsAssembly%2A>, <xref:System.Reflection.MethodBase.IsFamily%2A>, <xref:System.Reflection.MethodBase.IsFamilyOrAssembly%2A>, and <xref:System.Reflection.MethodBase.IsFamilyAndAssembly%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsAssembly/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAssembly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsAssembly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1763,7 +1763,7 @@ If `IsVirtual` is `false` or `IsFinal` is `true`, then the method cannot be over
  The following example displays `false` for `IsFinal`, which might lead you to think that MyMethod is overridable. The code prints `false` even though MyMethod is not marked `virtual` and thus cannot be overridden.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsFinal/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsVirtual Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsFinal/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2098,7 +2098,7 @@ The following table summarizes the invariant conditions for terms specific to ge
  The following example uses the <xref:System.Reflection.MethodBase.IsPublic%2A> property to display a message that indicates whether the specified method is public.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsPublic/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsPublic Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsPublic/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2361,7 +2361,7 @@ The following table summarizes the invariant conditions for terms specific to ge
  This example shows a use of <xref:System.Reflection.MethodBase.IsSpecialName%2A> to filter internal or private members out of a list.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsSpecialName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.IsSpecialName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsSpecialName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2508,7 +2508,7 @@ If MethodInfo.IsVirtual AndAlso Not MethodInfo.IsFinal Then
  The following example displays `false` for `IsFinal`, which might lead you to think that `MyMethod` is overridable. The code prints `false` even though `MyMethod` is not marked `virtual` and thus cannot be overridden.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodBase/IsFinal/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsVirtual Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodBase/IsFinal/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/MethodInfo.xml b/xml/System.Reflection/MethodInfo.xml
index 21dde845f00..57f56e2158d 100644
--- a/xml/System.Reflection/MethodInfo.xml
+++ b/xml/System.Reflection/MethodInfo.xml
@@ -1269,7 +1269,7 @@ End Class
  The following example displays the type of the specified member.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodInfo/MemberType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodInfo.MemberType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodInfo/MemberType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1499,7 +1499,7 @@ End Class
  The following example displays the return type of the specified method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/MethodInfo/ReturnType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodInfo.ReturnType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/MethodInfo/ReturnType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/Module.xml b/xml/System.Reflection/Module.xml
index 7e6f49f7ea2..99394399d17 100644
--- a/xml/System.Reflection/Module.xml
+++ b/xml/System.Reflection/Module.xml
@@ -2529,7 +2529,7 @@
  This example shows the effect of the `ScopeName`, `FullyQualifiedName`, and `Name` properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Module/Name/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Module.Name Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Module/Name/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3615,7 +3615,7 @@
  This example shows the effect of the `ScopeName`, `FullyQualifiedName`, and `Name` properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/Module/ScopeName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Module.ScopeName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/Module/ScopeName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/ParameterAttributes.xml b/xml/System.Reflection/ParameterAttributes.xml
index 96f54fc6f51..c6c53ebcba2 100644
--- a/xml/System.Reflection/ParameterAttributes.xml
+++ b/xml/System.Reflection/ParameterAttributes.xml
@@ -85,7 +85,7 @@
  The following example displays the attributes of the specified parameter.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ParameterAttributes/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterAttributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterAttributes/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/ParameterInfo.xml b/xml/System.Reflection/ParameterInfo.xml
index 704b303f4cd..d88958df369 100644
--- a/xml/System.Reflection/ParameterInfo.xml
+++ b/xml/System.Reflection/ParameterInfo.xml
@@ -1338,7 +1338,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/IsOut/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.IsOut Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterInfo/IsOut/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1625,7 +1625,7 @@
  The following example shows how to get <xref:System.Reflection.ParameterInfo> objects for the parameters of a method, and then use the <xref:System.Reflection.ParameterInfo.Name%2A> property to obtain the parameter names.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ParameterInfo/Name/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.Name Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterInfo/Name/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1748,7 +1748,7 @@
  The following example shows how to get <xref:System.Reflection.ParameterInfo> objects for the parameters of a method, and then use the <xref:System.Reflection.ParameterInfo.ParameterType%2A> property to display the type of each parameter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/ParameterInfo/ParameterType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ParameterInfo.ParameterType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/ParameterInfo/ParameterType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Reflection/PropertyAttributes.xml b/xml/System.Reflection/PropertyAttributes.xml
index 3138f529f5d..3b2c5b4f5f4 100644
--- a/xml/System.Reflection/PropertyAttributes.xml
+++ b/xml/System.Reflection/PropertyAttributes.xml
@@ -85,7 +85,7 @@
  The following example builds three properties and displays the <xref:System.Reflection.PropertyAttributes> enumerated value. Note that the read-only property has no setter and thus cannot be changed by.`Caption = statement`.
   
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyAttributes/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyAttributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyAttributes/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Reflection/PropertyInfo.xml b/xml/System.Reflection/PropertyInfo.xml
index 26918164658..94c23ce3e45 100644
--- a/xml/System.Reflection/PropertyInfo.xml
+++ b/xml/System.Reflection/PropertyInfo.xml
@@ -303,7 +303,7 @@
  The following example defines two properties. The first property is readable and the `CanRead` property is `true`. The second property is not readable (there is no get accessor), and the `CanRead` property is `false`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/CanRead/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.CanRead Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/CanRead/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -377,7 +377,7 @@
  The following example defines two properties. The first property is writable and the `CanWrite` property is `true`. The second property is not writable (there is no `set` accessor), and the `CanWrite` property is `false`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/CanWrite/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.CanWrite Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/CanWrite/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -586,7 +586,7 @@
  The following example retrieves the accessors of the `ClassWithProperty.Caption` property and displays information about them. It also calls the <xref:System.Reflection.MethodBase.Invoke%2A> method of the setter to set the property value and of the getter to retrieve the property value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/GetAccessors/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetAccessors1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/GetAccessors/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -792,7 +792,7 @@
  The following example displays the public or non-public `get` accessor for the specified property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/GetGetMethod/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetGetMethod1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/GetGetMethod/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -910,7 +910,7 @@
  The following example displays the index parameters of the specified property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/GetIndexParameters/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetIndexParameters Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/GetIndexParameters/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1321,7 +1321,7 @@
  The following example displays the `set` accessor for the specified property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/GetSetMethod/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.GetSetMethod1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/GetSetMethod/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1765,7 +1765,7 @@ Console.WriteLine("CurrCult: " +
  The following example displays the type of the specified member.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/MemberType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.MemberType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/MemberType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2199,7 +2199,7 @@ Note: In <see href="https://learn.microsoft.com/previous-versions/br230232(v=vs.
  The following example defines a class named `TestClass` that has a read-write property named `Caption`. It  displays the default value of the `Caption` property, calls the <xref:System.Reflection.PropertyInfo.SetValue%2A> method to change the property value, and displays the result.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/SetValue/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic PropertyInfo.SetValue1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/SetValue/source.vb" id="Snippet1":::
 
  Note that, because the `Caption` property is not a parameter array, the `index` argument is `null`.
 
diff --git a/xml/System.Resources/ResourceWriter.xml b/xml/System.Resources/ResourceWriter.xml
index 6e566dd1f06..5036817dff1 100644
--- a/xml/System.Resources/ResourceWriter.xml
+++ b/xml/System.Resources/ResourceWriter.xml
@@ -94,7 +94,7 @@
  The following example writes several strings into the myResources.resources file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Resources/ResourceWriter/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ResourceWriter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Resources/ResourceWriter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -222,7 +222,7 @@
  The following code example defines a new instance of the <xref:System.Resources.ResourceWriter> class that will write to a specified file. The code adds resources to the writer and writes the resources to the file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Resources/ResourceWriter/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ResourceWriter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Resources/ResourceWriter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.InteropServices/ClassInterfaceAttribute.xml b/xml/System.Runtime.InteropServices/ClassInterfaceAttribute.xml
index 43f3165c9d7..81b25f671ff 100644
--- a/xml/System.Runtime.InteropServices/ClassInterfaceAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ClassInterfaceAttribute.xml
@@ -81,7 +81,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ClassInterfaceAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ClassInterfaceAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ClassInterfaceAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ClassInterfaceAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ComAliasNameAttribute.xml b/xml/System.Runtime.InteropServices/ComAliasNameAttribute.xml
index 0c1f3e6065b..ef457ac71ee 100644
--- a/xml/System.Runtime.InteropServices/ComAliasNameAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ComAliasNameAttribute.xml
@@ -83,7 +83,7 @@ interface Baz {
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ComAliasNameAttribute Example/CPP/source.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComAliasNameAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComAliasNameAttribute Example/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComAliasNameAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ComRegisterFunctionAttribute.xml b/xml/System.Runtime.InteropServices/ComRegisterFunctionAttribute.xml
index ee0bd64c556..74a94b6a7ac 100644
--- a/xml/System.Runtime.InteropServices/ComRegisterFunctionAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ComRegisterFunctionAttribute.xml
@@ -82,7 +82,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ComRegisterFunctionAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComRegisterFunctionAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComRegisterFunctionAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComRegisterFunctionAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ComSourceInterfacesAttribute.xml b/xml/System.Runtime.InteropServices/ComSourceInterfacesAttribute.xml
index 270553bbfc2..2d8fc914d90 100644
--- a/xml/System.Runtime.InteropServices/ComSourceInterfacesAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ComSourceInterfacesAttribute.xml
@@ -91,7 +91,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ComSourceInterfacesAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComSourceInterfacesAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComSourceInterfacesAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComSourceInterfacesAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ComUnregisterFunctionAttribute.xml b/xml/System.Runtime.InteropServices/ComUnregisterFunctionAttribute.xml
index dda7f10d31a..ff8dde97ac1 100644
--- a/xml/System.Runtime.InteropServices/ComUnregisterFunctionAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ComUnregisterFunctionAttribute.xml
@@ -70,7 +70,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ComRegisterFunctionAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComRegisterFunctionAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComRegisterFunctionAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComRegisterFunctionAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ComVisibleAttribute.xml b/xml/System.Runtime.InteropServices/ComVisibleAttribute.xml
index 98c33284076..eb6ec429ee4 100644
--- a/xml/System.Runtime.InteropServices/ComVisibleAttribute.xml
+++ b/xml/System.Runtime.InteropServices/ComVisibleAttribute.xml
@@ -80,7 +80,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ComVisibleAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ComVisibleAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ComVisibleAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ComVisibleAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/DispIdAttribute.xml b/xml/System.Runtime.InteropServices/DispIdAttribute.xml
index 62b148a6753..0361ce5b344 100644
--- a/xml/System.Runtime.InteropServices/DispIdAttribute.xml
+++ b/xml/System.Runtime.InteropServices/DispIdAttribute.xml
@@ -77,7 +77,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic DispIdAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/DispIdAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DispIdAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/DispIdAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/ExtensibleClassFactory.xml b/xml/System.Runtime.InteropServices/ExtensibleClassFactory.xml
index 7d4b469b574..45e808af046 100644
--- a/xml/System.Runtime.InteropServices/ExtensibleClassFactory.xml
+++ b/xml/System.Runtime.InteropServices/ExtensibleClassFactory.xml
@@ -37,7 +37,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ExtensibleClassFactory Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/ExtensibleClassFactory/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ExtensibleClassFactory Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/ExtensibleClassFactory/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/FieldOffsetAttribute.xml b/xml/System.Runtime.InteropServices/FieldOffsetAttribute.xml
index f29e6fab592..f63073ede6d 100644
--- a/xml/System.Runtime.InteropServices/FieldOffsetAttribute.xml
+++ b/xml/System.Runtime.InteropServices/FieldOffsetAttribute.xml
@@ -74,7 +74,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic FieldOffsetAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/FieldOffsetAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic FieldOffsetAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/FieldOffsetAttribute/Overview/source.vb" id="Snippet1":::  
   
  For a larger example, see the <xref:System.Runtime.InteropServices.StructLayoutAttribute?displayProperty=nameWithType> class.  
   
diff --git a/xml/System.Runtime.InteropServices/GuidAttribute.xml b/xml/System.Runtime.InteropServices/GuidAttribute.xml
index 445b13bbc9f..41ce655be60 100644
--- a/xml/System.Runtime.InteropServices/GuidAttribute.xml
+++ b/xml/System.Runtime.InteropServices/GuidAttribute.xml
@@ -79,7 +79,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic GuidAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/GuidAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic GuidAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/GuidAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.InteropServices/InterfaceTypeAttribute.xml b/xml/System.Runtime.InteropServices/InterfaceTypeAttribute.xml
index 98ccb94e293..27eeb34b87f 100644
--- a/xml/System.Runtime.InteropServices/InterfaceTypeAttribute.xml
+++ b/xml/System.Runtime.InteropServices/InterfaceTypeAttribute.xml
@@ -77,7 +77,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic InterfaceTypeAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.InteropServices/InterfaceTypeAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic InterfaceTypeAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.InteropServices/InterfaceTypeAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/DESCryptoServiceProvider.xml b/xml/System.Security.Cryptography/DESCryptoServiceProvider.xml
index ad95d7ae3e6..ee01056e361 100644
--- a/xml/System.Security.Cryptography/DESCryptoServiceProvider.xml
+++ b/xml/System.Security.Cryptography/DESCryptoServiceProvider.xml
@@ -82,7 +82,7 @@
  The following code example uses <xref:System.Security.Cryptography.DESCryptoServiceProvider> (an implementation of <xref:System.Security.Cryptography.DES>) with the specified key (<xref:System.Security.Cryptography.SymmetricAlgorithm.Key%2A>) and initialization vector (<xref:System.Security.Cryptography.SymmetricAlgorithm.IV%2A>) to encrypt a file specified by `inName`. It then outputs the encrypted result to the file specified by `outName`.
   
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DESCryptoServiceProvider/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DES Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/Overview/source.vb" id="Snippet1":::
 
  Decryption can be handled in the same way; use <xref:System.Security.Cryptography.DESCryptoServiceProvider.CreateDecryptor%2A> instead of <xref:System.Security.Cryptography.DESCryptoServiceProvider.CreateEncryptor%2A>. The same key (<xref:System.Security.Cryptography.SymmetricAlgorithm.Key%2A>) and initialization vector (<xref:System.Security.Cryptography.SymmetricAlgorithm.IV%2A>) used to encrypt the file must be used to decrypt it.
 
@@ -141,7 +141,7 @@
  The following code example uses <xref:System.Security.Cryptography.DESCryptoServiceProvider> (an implementation of <xref:System.Security.Cryptography.DES>) with the specified key (<xref:System.Security.Cryptography.SymmetricAlgorithm.Key%2A>) and initialization vector (<xref:System.Security.Cryptography.SymmetricAlgorithm.IV%2A>) to encrypt a file specified by `inName`. It then outputs the encrypted result to the file specified by `outName`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/DESCryptoServiceProvider/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DES Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/DESCryptoServiceProvider/Overview/source.vb" id="Snippet1":::
 
  Decryption can be handled in the same way; use <xref:System.Security.Cryptography.DESCryptoServiceProvider.CreateDecryptor%2A> instead of <xref:System.Security.Cryptography.DESCryptoServiceProvider.CreateEncryptor%2A>. The same key (<xref:System.Security.Cryptography.SymmetricAlgorithm.Key%2A>) and initialization vector (<xref:System.Security.Cryptography.SymmetricAlgorithm.IV%2A>) used to encrypt the file must be used to decrypt it.
 
diff --git a/xml/System.Security.Cryptography/HashAlgorithm.xml b/xml/System.Security.Cryptography/HashAlgorithm.xml
index 79afaf96a57..0b9f8eb9754 100644
--- a/xml/System.Security.Cryptography/HashAlgorithm.xml
+++ b/xml/System.Security.Cryptography/HashAlgorithm.xml
@@ -91,7 +91,7 @@
  The following code example computes the <xref:System.Security.Cryptography.SHA256> hash for an array. This example assumes that there is a predefined byte array `dataArray[]`. <xref:System.Security.Cryptography.SHA256> is a derived class of <xref:System.Security.Cryptography.HashAlgorithm>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HashAlgorithm/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic HashAlgorithm Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -423,7 +423,7 @@
 The following example calculates the <xref:System.Security.Cryptography.SHA256> hash for all files in a directory.
 
 :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HashAlgorithm/ComputeHash/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA256 Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/ComputeHash/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RNGCryptoServiceProvider.xml b/xml/System.Security.Cryptography/RNGCryptoServiceProvider.xml
index 9493543bead..19e856cab29 100644
--- a/xml/System.Security.Cryptography/RNGCryptoServiceProvider.xml
+++ b/xml/System.Security.Cryptography/RNGCryptoServiceProvider.xml
@@ -630,7 +630,7 @@
  The following code example creates a random sequence of 100 nonzero bytes and stores it in `random`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/RandomNumberGenerator.xml b/xml/System.Security.Cryptography/RandomNumberGenerator.xml
index 665001cd565..03f8c80f453 100644
--- a/xml/System.Security.Cryptography/RandomNumberGenerator.xml
+++ b/xml/System.Security.Cryptography/RandomNumberGenerator.xml
@@ -526,7 +526,7 @@ To create a random number generator, call the @System.Security.Cryptography.Rand
  The following example creates a random sequence 100 bytes long and stores it in `random`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetBytes/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RandomNumberGenerator/GetBytes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1013,7 +1013,7 @@ To create a random number generator, call the @System.Security.Cryptography.Rand
  The following example creates a random sequence of 100 nonzero bytes and stores it in `random`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/RandomNumberGenerator/GetNonZeroBytes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Cryptography/SHA256.xml b/xml/System.Security.Cryptography/SHA256.xml
index b9b36ecd3be..f289d1411a9 100644
--- a/xml/System.Security.Cryptography/SHA256.xml
+++ b/xml/System.Security.Cryptography/SHA256.xml
@@ -73,7 +73,7 @@
  The following example calculates the SHA-256 hash for all files in a directory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HashAlgorithm/ComputeHash/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA256 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/ComputeHash/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/SHA256Managed.xml b/xml/System.Security.Cryptography/SHA256Managed.xml
index 9dd8376d90f..e94e3296d47 100644
--- a/xml/System.Security.Cryptography/SHA256Managed.xml
+++ b/xml/System.Security.Cryptography/SHA256Managed.xml
@@ -82,7 +82,7 @@
  The following example calculates the SHA-256 hash for all files in a directory.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/HashAlgorithm/ComputeHash/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA256 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/HashAlgorithm/ComputeHash/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/SHA384.xml b/xml/System.Security.Cryptography/SHA384.xml
index e3fada16642..d904d28f847 100644
--- a/xml/System.Security.Cryptography/SHA384.xml
+++ b/xml/System.Security.Cryptography/SHA384.xml
@@ -73,7 +73,7 @@
  The following example computes the <xref:System.Security.Cryptography.SHA384> hash for `data` and stores it in `result`. This example assumes that there is a predefined constant `DATA_SIZE`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/SHA384/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/SHA384/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/SHA384Managed.xml b/xml/System.Security.Cryptography/SHA384Managed.xml
index 435fa142600..286636c7fbd 100644
--- a/xml/System.Security.Cryptography/SHA384Managed.xml
+++ b/xml/System.Security.Cryptography/SHA384Managed.xml
@@ -82,7 +82,7 @@
  The following example computes the <xref:System.Security.Cryptography.SHA384Managed> hash for `data` and stores it in `result`. This example assumes that there is a predefined constant `DATA_SIZE`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/SHA384Managed/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA384Managed Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/SHA384Managed/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/SHA512.xml b/xml/System.Security.Cryptography/SHA512.xml
index e726e6b95c7..c369462ee50 100644
--- a/xml/System.Security.Cryptography/SHA512.xml
+++ b/xml/System.Security.Cryptography/SHA512.xml
@@ -75,7 +75,7 @@
  The following example computes the <xref:System.Security.Cryptography.SHA512> hash for `data` and stores it in `result`. This example assumes that there is a predefined constant `DATA_SIZE`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/SHA512/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/SHA512/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/SHA512Managed.xml b/xml/System.Security.Cryptography/SHA512Managed.xml
index c49f848628c..3acf2edd9da 100644
--- a/xml/System.Security.Cryptography/SHA512Managed.xml
+++ b/xml/System.Security.Cryptography/SHA512Managed.xml
@@ -82,7 +82,7 @@
  The following example computes the <xref:System.Security.Cryptography.SHA512Managed> hash for `data` and stores it in `result`. This example assumes that there is a predefined constant `DATA_SIZE`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/SHA512Managed/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic SHA512Managed Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/SHA512Managed/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Cryptography/SymmetricAlgorithm.xml b/xml/System.Security.Cryptography/SymmetricAlgorithm.xml
index 8e68834d66d..2eb78c64ab3 100644
--- a/xml/System.Security.Cryptography/SymmetricAlgorithm.xml
+++ b/xml/System.Security.Cryptography/SymmetricAlgorithm.xml
@@ -79,7 +79,7 @@
  The following code example uses the <xref:System.Security.Cryptography.Aes> class with the specified <xref:System.Security.Cryptography.SymmetricAlgorithm.Key%2A> property and initialization vector (<xref:System.Security.Cryptography.SymmetricAlgorithm.IV%2A>) to encrypt a file specified by `inName`, and outputs the encrypted result to the file specified by `outName`. The `desKey` and `desIV` parameters to the method are 8-byte arrays. You must have the high encryption pack installed to run this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.Cryptography/SymmetricAlgorithm/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic CryptoStream Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Cryptography/SymmetricAlgorithm/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.Policy/CodeGroup.xml b/xml/System.Security.Policy/CodeGroup.xml
index 14ebbf71979..3dbff75e278 100644
--- a/xml/System.Security.Policy/CodeGroup.xml
+++ b/xml/System.Security.Policy/CodeGroup.xml
@@ -934,7 +934,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic CodeGroup.PolicyStatement Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Policy/CodeGroup/PolicyStatement/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic CodeGroup.PolicyStatement Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Policy/CodeGroup/PolicyStatement/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Policy/Hash.xml b/xml/System.Security.Policy/Hash.xml
index bd779ed7755..bc3817835ea 100644
--- a/xml/System.Security.Policy/Hash.xml
+++ b/xml/System.Security.Policy/Hash.xml
@@ -480,7 +480,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic Hash.SHA1 Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Policy/Hash/SHA1/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Hash.SHA1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Policy/Hash/SHA1/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Principal/WindowsImpersonationContext.xml b/xml/System.Security.Principal/WindowsImpersonationContext.xml
index 9b2d91f225b..da3ae107fea 100644
--- a/xml/System.Security.Principal/WindowsImpersonationContext.xml
+++ b/xml/System.Security.Principal/WindowsImpersonationContext.xml
@@ -229,7 +229,7 @@ Application code does not call this method; it is automatically invoked during g
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic WindowsImpersonationContext.Undo Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Principal/WindowsImpersonationContext/Undo/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsImpersonationContext.Undo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Principal/WindowsImpersonationContext/Undo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.Principal/WindowsPrincipal.xml b/xml/System.Security.Principal/WindowsPrincipal.xml
index cef2fbbec79..8205103b3e1 100644
--- a/xml/System.Security.Principal/WindowsPrincipal.xml
+++ b/xml/System.Security.Principal/WindowsPrincipal.xml
@@ -113,7 +113,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic WindowsPrincipal.WindowsPrincipal Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Principal/WindowsPrincipal/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsPrincipal.WindowsPrincipal Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Principal/WindowsPrincipal/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -207,7 +207,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic WindowsPrincipal.Identity Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Security.Principal/WindowsPrincipal/Identity/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic WindowsPrincipal.Identity Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.Principal/WindowsPrincipal/Identity/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceProcess/ServiceAccount.xml b/xml/System.ServiceProcess/ServiceAccount.xml
index f3f7543f2c0..394847b554c 100644
--- a/xml/System.ServiceProcess/ServiceAccount.xml
+++ b/xml/System.ServiceProcess/ServiceAccount.xml
@@ -34,7 +34,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ServiceInstaller Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceAccount/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ServiceInstaller Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceAccount/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceProcess/ServiceInstaller.xml b/xml/System.ServiceProcess/ServiceInstaller.xml
index 77530c3397b..463b5c414ae 100644
--- a/xml/System.ServiceProcess/ServiceInstaller.xml
+++ b/xml/System.ServiceProcess/ServiceInstaller.xml
@@ -58,7 +58,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ServiceInstaller Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceAccount/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ServiceInstaller Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceAccount/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceProcess/ServiceProcessInstaller.xml b/xml/System.ServiceProcess/ServiceProcessInstaller.xml
index c51513d227e..bad63f298bd 100644
--- a/xml/System.ServiceProcess/ServiceProcessInstaller.xml
+++ b/xml/System.ServiceProcess/ServiceProcessInstaller.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic ServiceInstaller Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.ServiceProcess/ServiceAccount/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ServiceInstaller Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.ServiceProcess/ServiceAccount/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Text/Decoder.xml b/xml/System.Text/Decoder.xml
index 720bd3c84ca..fbd03d44835 100644
--- a/xml/System.Text/Decoder.xml
+++ b/xml/System.Text/Decoder.xml
@@ -84,7 +84,7 @@ The <xref:System.Text.Decoder.GetCharCount%2A> method determines how many charac
 The following example demonstrates the use of a <xref:System.Text.Decoder> to convert two different byte arrays into a character array. One of the character's bytes spans the arrays. This is similar to what a <xref:System.IO.StreamReader> object does internally when reading a stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Text/Decoder/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Decoder Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Text/Decoder/Overview/source.vb" id="Snippet1":::
       ]]></format>
     </example>
     <block subset="none" type="overrides">
diff --git a/xml/System.Threading/ThreadExceptionEventArgs.xml b/xml/System.Threading/ThreadExceptionEventArgs.xml
index 23ae2a4354a..8e8c11f5f05 100644
--- a/xml/System.Threading/ThreadExceptionEventArgs.xml
+++ b/xml/System.Threading/ThreadExceptionEventArgs.xml
@@ -65,7 +65,7 @@
  In the `OnThreadException` method in the `CustomExceptionHandler` class, the example uses a `try...catch...finally` statement to process the exception. The `ShowThreadExceptionDialog` method creates the message to display, and displays it in a message box.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Threading/ThreadExceptionEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ThreadExceptionEventArgs Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/ThreadExceptionEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -129,7 +129,7 @@
  In the `OnThreadException` method in the `CustomExceptionHandler` class, the example uses a `try...catch...finally` statement to process the exception. The `ShowThreadExceptionDialog` method creates the message to display, and displays it in a message box.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Threading/ThreadExceptionEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ThreadExceptionEventArgs Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/ThreadExceptionEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@
  In the `OnThreadException` method in the `CustomExceptionHandler` class, the example uses a `try...catch...finally` statement to process the exception. The `ShowThreadExceptionDialog` method creates the message to display, and displays it in a message box.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Threading/ThreadExceptionEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic ThreadExceptionEventArgs Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Threading/ThreadExceptionEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Timers/ElapsedEventHandler.xml b/xml/System.Timers/ElapsedEventHandler.xml
index 8421bfbf81e..96b2fb53524 100644
--- a/xml/System.Timers/ElapsedEventHandler.xml
+++ b/xml/System.Timers/ElapsedEventHandler.xml
@@ -72,7 +72,7 @@
   
  :::code language="csharp" source="~/snippets/csharp/System.Timers/ElapsedEventHandler/Overview/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Timers/ElapsedEventHandler/Overview/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Timer Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Timers/ElapsedEventHandler/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Timers/Timer.xml b/xml/System.Timers/Timer.xml
index 81af146fa48..70656b6adad 100644
--- a/xml/System.Timers/Timer.xml
+++ b/xml/System.Timers/Timer.xml
@@ -359,7 +359,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System.Timers/Timer/AutoReset/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System.Timers/Timer/AutoReset/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Timer.Timer1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Timers/Timer/AutoReset/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Forms/NodeLabelEditEventArgs.xml b/xml/System.Windows.Forms/NodeLabelEditEventArgs.xml
index d1d897b4167..11315cb026b 100644
--- a/xml/System.Windows.Forms/NodeLabelEditEventArgs.xml
+++ b/xml/System.Windows.Forms/NodeLabelEditEventArgs.xml
@@ -44,7 +44,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -192,7 +192,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -244,7 +244,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -292,7 +292,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Forms/TreeNode.xml b/xml/System.Windows.Forms/TreeNode.xml
index 63c9183e174..79c5e154ed0 100644
--- a/xml/System.Windows.Forms/TreeNode.xml
+++ b/xml/System.Windows.Forms/TreeNode.xml
@@ -473,7 +473,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -918,7 +918,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1639,7 +1639,7 @@ If you set the <xref:System.Windows.Forms.TreeNode.ImageKey%2A> property, the <x
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Forms/TreeView.xml b/xml/System.Windows.Forms/TreeView.xml
index 4e8687154b0..107ab03b037 100644
--- a/xml/System.Windows.Forms/TreeView.xml
+++ b/xml/System.Windows.Forms/TreeView.xml
@@ -340,7 +340,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1740,7 +1740,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2495,7 +2495,7 @@ If you set the <xref:System.Windows.Forms.TreeView.ImageKey%2A> property, the <x
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic TreeNode.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms/NodeLabelEditEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Array.xml b/xml/System/Array.xml
index 1ce29b83c23..4f554f223ac 100644
--- a/xml/System/Array.xml
+++ b/xml/System/Array.xml
@@ -131,13 +131,13 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/Overview/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/Overview/source.vb" id="Snippet1":::
 
  The following code example creates and initializes an <xref:System.Array> and displays its properties and its elements.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array Example/FS/source3.fs" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/Overview/source3.cs" interactive="try-dotnet-method" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array Example/VB/source3.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/Overview/source3.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -336,7 +336,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.BinarySearch Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/BinarySearch/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.BinarySearch Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/BinarySearch/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1647,7 +1647,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.Copy1 Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/Copy/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Copy1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/Copy/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2176,13 +2176,13 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.CopyTo Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/CopyTo/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CopyTo Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/CopyTo/source.vb" id="Snippet1":::
 
  The following code example shows how to copy an <xref:System.Array> to another <xref:System.Array> with a nonzero lower bound. Note that the entire source <xref:System.Array> is copied, including empty elements that overwrite existing elements in the target <xref:System.Array>.
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.CopyTo Example/FS/source2.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/CopyTo/source2.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CopyTo Example/VB/source2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/CopyTo/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2440,7 +2440,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.CreateInstance Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/CreateInstance/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/CreateInstance/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2542,7 +2542,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.CreateInstance3 Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/CreateInstance/source3.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/CreateInstance/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2643,7 +2643,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.CreateInstance3 Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/CreateInstance/source3.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/CreateInstance/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2737,7 +2737,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.CreateInstance1 Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/CreateInstance/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/CreateInstance/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2951,7 +2951,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.CreateInstance2 Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/CreateInstance/source2.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.CreateInstance2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/CreateInstance/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5535,7 +5535,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.IndexOf Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/IndexOf/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.IndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/IndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5635,7 +5635,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.IndexOf Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/IndexOf/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.IndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/IndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5744,7 +5744,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.IndexOf Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/IndexOf/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.IndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/IndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6394,7 +6394,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.LastIndexOf Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/LastIndexOf/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.LastIndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/LastIndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6489,7 +6489,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.LastIndexOf Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/LastIndexOf/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.LastIndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/LastIndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6592,7 +6592,7 @@
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.LastIndexOf Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/LastIndexOf/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.LastIndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/LastIndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7352,7 +7352,7 @@ int[,,] TDArray = new int[1,1,1];
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.Reverse Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/Reverse/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Reverse Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/Reverse/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7438,7 +7438,7 @@ int[,,] TDArray = new int[1,1,1];
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic Array.Reverse1 Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/Array/Reverse/source1.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Array.Reverse1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Array/Reverse/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/AttributeUsageAttribute.xml b/xml/System/AttributeUsageAttribute.xml
index 07b2150048f..34c19f49036 100644
--- a/xml/System/AttributeUsageAttribute.xml
+++ b/xml/System/AttributeUsageAttribute.xml
@@ -150,7 +150,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/AttributeUsageAttribute/.ctor/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic AttributeUsageAttribute.AttributeUsageAttribute Example/FS/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic AttributeUsageAttribute.AttributeUsageAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/AttributeUsageAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/DateTime.xml b/xml/System/DateTime.xml
index c12af809ab0..7ceccc2799d 100644
--- a/xml/System/DateTime.xml
+++ b/xml/System/DateTime.xml
@@ -9200,7 +9200,7 @@ The following example illustrates how the string representation of a <xref:Syste
 
  :::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR_Classic/classic DateTime.ToString2 Example/FS/source.fs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/DateTime/ToString/source.cs" interactive="try-dotnet" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic DateTime.ToString2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/DateTime/ToString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Enum.xml b/xml/System/Enum.xml
index bc303cd7263..154ce55e80a 100644
--- a/xml/System/Enum.xml
+++ b/xml/System/Enum.xml
@@ -3715,7 +3715,7 @@
 
  :::code language="csharp" source="~/snippets/csharp/System/Enum/ToString/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Enum/ToString/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Enum.ToString2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Enum/ToString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/MarshalByRefObject.xml b/xml/System/MarshalByRefObject.xml
index 994a3dca7f8..a6753f7438b 100644
--- a/xml/System/MarshalByRefObject.xml
+++ b/xml/System/MarshalByRefObject.xml
@@ -318,7 +318,7 @@ For more information about lifetime services, see the <xref:System.Runtime.Remot
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_CLR_Classic/classic MarshalByRefObject.InitializeLifetimeService Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System/MarshalByRefObject/InitializeLifetimeService/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/MarshalByRefObject/InitializeLifetimeService/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MarshalByRefObject.InitializeLifetimeService Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/MarshalByRefObject/InitializeLifetimeService/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/Math.xml b/xml/System/Math.xml
index 33faeae01b8..f6edd1a72e2 100644
--- a/xml/System/Math.xml
+++ b/xml/System/Math.xml
@@ -6748,7 +6748,7 @@ The following example demonstrates rounding to the nearest integer value.
 
 :::code language="csharp" source="~/snippets/csharp/System/Math/Round/source.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Math/Round/source.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Math.Round Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/Math/Round/source.vb" id="Snippet1":::
 
        ]]></format>
         </remarks>
@@ -6999,7 +6999,7 @@ The following example rounds double values with two fractional digits to doubles
 
 :::code language="csharp" source="~/snippets/csharp/System/Math/Round/source1.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Math/Round/source1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Math.Round2 Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/Math/Round/source1.vb" id="Snippet1":::
 
        ]]></format>
         </remarks>
diff --git a/xml/System/Random.xml b/xml/System/Random.xml
index 7056e477d1f..2e5b7e57737 100644
--- a/xml/System/Random.xml
+++ b/xml/System/Random.xml
@@ -839,7 +839,7 @@ The following example uses the parameterless constructor to instantiate three <x
  The following example demonstrates how to use the <xref:System.Random.NextBytes%2A> method to fill an array of bytes with random byte values.
 
  :::code language="csharp" source="~/snippets/csharp/System/Random/NextBytes/source.cs" interactive="try-dotnet-method" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Random.NextBytes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Random/NextBytes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/String.xml b/xml/System/String.xml
index 9226df9fb58..217cb3e3c2c 100644
--- a/xml/System/String.xml
+++ b/xml/System/String.xml
@@ -11205,7 +11205,7 @@ The following example demonstrates the <xref:System.String.PadLeft%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/PadLeft/source.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/PadLeft/source.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadLeft Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/PadLeft/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11278,7 +11278,7 @@ The following example demonstrates the <xref:System.String.PadLeft%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/PadLeft/source1.cs" interactive="try-dotnet" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/PadLeft/source1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadLeft1 Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/PadLeft/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11365,7 +11365,7 @@ The following example demonstrates the <xref:System.String.PadRight%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/PadRight/source.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/PadRight/source.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadRight Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/PadRight/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11438,7 +11438,7 @@ The following example demonstrates the <xref:System.String.PadRight%2A> method.
 
 :::code language="csharp" source="~/snippets/csharp/System/String/PadRight/source1.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/PadRight/source1.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.PadRight1 Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/PadRight/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -13662,7 +13662,7 @@ The following example uses the <xref:System.String.Substring(System.Int32%2CSyst
 
 :::code language="csharp" source="~/snippets/csharp/System/String/Substring/source.cs" interactive="try-dotnet-method" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/String/Substring/source.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic String.Substring1 Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/String/Substring/source.vb" id="Snippet1":::
 
 The following example uses the <xref:System.String.Substring%2A> method to separate key/value pairs that are delimited by an equals (`=`) character.
 
diff --git a/xml/System/Type.xml b/xml/System/Type.xml
index 3dffbdf216a..03ffd03c53a 100644
--- a/xml/System/Type.xml
+++ b/xml/System/Type.xml
@@ -771,7 +771,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/DeclaringType/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/DeclaringType/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.DeclaringType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/DeclaringType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -953,7 +953,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/EmptyTypes/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/EmptyTypes/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.EmptyTypes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/EmptyTypes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1122,7 +1122,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/Equals/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/Equals/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.Equals1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/Equals/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1241,7 +1241,7 @@ TopNamespace.Sub\+Namespace.ContainingClass+NestedClass, MyAssembly, Version=1.3
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/FilterName/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/FilterName/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.FilterName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/FilterName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2596,7 +2596,7 @@ This example shows the output of the <xref:System.Type.GetConstructors> overload
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetConstructors/source1.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetConstructors/source1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.GetConstructors Example/VB/source1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetConstructors/source1.vb" id="Snippet1":::
 
  The output of this code is:
 
@@ -2612,7 +2612,7 @@ False
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetConstructors/source2.cs" interactive="try-dotnet" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetConstructors/source2.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.GetConstructors Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetConstructors/source2.vb" id="Snippet2":::
 
  Now the output is:
 
@@ -4101,7 +4101,7 @@ In .NET 6 and earlier versions, the <xref:System.Type.GetFields%2A> method does
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/GetFields/source.cs" interactive="try-dotnet" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/GetFields/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.Attributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/GetFields/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14670,13 +14670,13 @@ Byref-like structures are declared using `ref struct` keyword in C#. An instance
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsNotPublic/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsNotPublic/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.IsNotPublic Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsNotPublic/source.vb" id="Snippet1":::
 
  The following code example demonstrates why you cannot use `IsPublic` and `IsNotPublic` for nested classes.
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/IsNotPublic/source.cs" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/IsNotPublic/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.IsNotPublic Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/IsNotPublic/source.vb" id="Snippet2":::
 
  For nested classes, ignore the results of `IsPublic` and `IsNotPublic` and pay attention only to the results of `IsNestedPublic` and `IsNestedPrivate`. The reflection output for this code fragment would be as follows:
 
@@ -16531,7 +16531,7 @@ The following example uses the <xref:System.Type.MakeGenericType%2A> method to c
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/MemberType/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/MemberType/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.MemberType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/MemberType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -16592,7 +16592,7 @@ The following example uses the <xref:System.Type.MakeGenericType%2A> method to c
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/Missing/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/Missing/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.Missing Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/Missing/source.vb" id="Snippet1":::
 
  This code produces the following output:
 
@@ -16946,7 +16946,7 @@ The following example uses the <xref:System.Type.MakeGenericType%2A> method to c
 
  :::code language="csharp" source="~/snippets/csharp/System/Type/ReflectedType/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Type/ReflectedType/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_Classic/classic Type.ReflectedType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Type/ReflectedType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>