diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/My Project/assemblyinfo.vb b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/My Project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/My Project/assemblyinfo.vb
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/My Project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/my project/resources.resx b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/My Project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/my project/resources.resx
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/My Project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/My Project/settings.designer.vb b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/My Project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/My Project/settings.designer.vb
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/My Project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/my project/settings.settings b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/My Project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/my project/settings.settings
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/My Project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/application.xaml b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/application.xaml
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/application.xaml.vb b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/application.xaml.vb
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/dialogboxesoverviewsnippets.vbproj b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/dialogboxesoverviewsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/dialogboxesoverviewsnippets.vbproj
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/dialogboxesoverviewsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/snippets.5000.json b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/snippets.5000.json
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/window1.xaml b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/window1.xaml
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/window1.xaml.vb b/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/window1.xaml.vb
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/application.xaml b/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/filedialogfiltersnippets.vbproj b/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/filedialogfiltersnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/filedialogfiltersnippets.vbproj
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/filedialogfiltersnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml b/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/datasource.vb b/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/datasource.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/datasource.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/datasource.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/observablecollection.vbproj b/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/observablecollection.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/observablecollection.vbproj
rename to snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/observablecollection.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/window1.xaml b/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/changeitem.xaml b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/changeitem.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/changeitem.xaml
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/changeitem.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/changeitem.xaml.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/changeitem.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/changeitem.xaml.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/changeitem.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/editingcollectionssnippets.vbproj b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/editingcollectionssnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/editingcollectionssnippets.vbproj
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/editingcollectionssnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/additemwindow.xaml b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/additemwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/additemwindow.xaml
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/additemwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/additemwindow.xaml.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/additemwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/additemwindow.xaml.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/additemwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/application.xaml b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/data.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/data.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/data.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/data.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/ieditablecollectionviewadditemexample.vbproj b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/ieditablecollectionviewadditemexample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/ieditablecollectionviewadditemexample.vbproj
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/ieditablecollectionviewadditemexample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/window1.xaml b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/_readme_microsoft-sdk-rights-management-samples.doc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/_readme_microsoft-sdk-rights-management-samples.doc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/application.xaml b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/application.xaml
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/application.xaml.vb b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/content/document-rights.xrml b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/content/document-rights.xrml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/content/document-rights.xrml
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/content/document-rights.xrml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/content/document-rmencrypted.xps b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/content/document-rmencrypted.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/content/document-rmencrypted.xps
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/content/document-rmencrypted.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/content/document.xps b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/content/document.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/content/document.xps
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/content/document.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/rmpackagepublish.vbproj b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/rmpackagepublish.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/rmpackagepublish.vbproj
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/rmpackagepublish.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc b/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/_readme_microsoft-sdk-rights-management-samples.doc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc
rename to snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/_readme_microsoft-sdk-rights-management-samples.doc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/application.xaml b/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/application.xaml
rename to snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/application.xaml.vb b/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/content/document-rmencrypted.xps b/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/content/document-rmencrypted.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/content/document-rmencrypted.xps
rename to snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/content/document-rmencrypted.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/content/document.xps b/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/content/document.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/content/document.xps
rename to snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/content/document.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/rmpackageviewer.vbproj b/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/rmpackageviewer.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/rmpackageviewer.vbproj
rename to snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/rmpackageviewer.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml b/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml
rename to snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/application.xaml b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/application.xaml
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/autumn.jpg b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/autumn.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/autumn.jpg
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/autumn.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/cars.jpg b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/cars.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/cars.jpg
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/cars.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/tiger.jpg b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/tiger.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/tiger.jpg
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/tiger.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewfixeddocument.xps b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewfixeddocument.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewfixeddocument.xps
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewfixeddocument.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewfixeddocumentsequence.xps b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewfixeddocumentsequence.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewfixeddocumentsequence.xps
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewfixeddocumentsequence.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewflowdocument.xps b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewflowdocument.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewflowdocument.xps
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewflowdocument.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewmultiplevisuals.xps b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewmultiplevisuals.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewmultiplevisuals.xps
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewmultiplevisuals.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewonevisual.xps b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewonevisual.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/content/viewonevisual.xps
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/content/viewonevisual.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/window1.xaml b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/wpfcontent.vb b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/wpfcontent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/wpfcontent.vb
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/wpfcontent.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprint.vbproj b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprint.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprint.vbproj
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprint.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb b/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb
rename to snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/_readme_microsoft-sdk-rights-management-samples.doc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/_readme_microsoft-sdk-rights-management-samples.doc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/application.xaml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/application.xaml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/chocolate.png b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/chocolate.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/chocolate.png
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/chocolate.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/chocolate.png.protected b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/chocolate.png.protected
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/chocolate.png.protected
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/chocolate.png.protected
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/chocolate.png.publishlicense.xml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/chocolate.png.publishlicense.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/chocolate.png.publishlicense.xml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/chocolate.png.publishlicense.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/chocolate.png.uselicense.xml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/chocolate.png.uselicense.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/chocolate.png.uselicense.xml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/chocolate.png.uselicense.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/content-rights.xrml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/content-rights.xrml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/content-rights.xrml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/content-rights.xrml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/truffle.png b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/truffle.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/truffle.png
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/truffle.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/truffle.png.protected b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/truffle.png.protected
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/truffle.png.protected
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/truffle.png.protected
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/truffle.png.publishlicense.xml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/truffle.png.publishlicense.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/truffle.png.publishlicense.xml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/truffle.png.publishlicense.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/truffle.png.uselicense.xml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/truffle.png.uselicense.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/content/truffle.png.uselicense.xml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/content/truffle.png.uselicense.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/rmcontentpublish.vbproj b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/rmcontentpublish.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/rmcontentpublish.vbproj
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/rmcontentpublish.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/window1.xaml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/_readme_microsoft-sdk-rights-management-samples.doc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/_readme_microsoft-sdk-rights-management-samples.doc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/application.xaml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/application.xaml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/chocolate.png b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/chocolate.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/chocolate.png
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/chocolate.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/chocolate.png.protected b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/chocolate.png.protected
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/chocolate.png.protected
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/chocolate.png.protected
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/chocolate.png.publishlicense.xml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/chocolate.png.publishlicense.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/chocolate.png.publishlicense.xml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/chocolate.png.publishlicense.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/chocolate.png.uselicense.xml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/chocolate.png.uselicense.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/chocolate.png.uselicense.xml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/chocolate.png.uselicense.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/truffle.png b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/truffle.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/truffle.png
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/truffle.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/truffle.png.protected b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/truffle.png.protected
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/truffle.png.protected
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/truffle.png.protected
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/truffle.png.publishlicense.xml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/truffle.png.publishlicense.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/truffle.png.publishlicense.xml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/truffle.png.publishlicense.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/truffle.png.uselicense.xml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/truffle.png.uselicense.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/content/truffle.png.uselicense.xml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/content/truffle.png.uselicense.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/rmcontentviewer.vbproj b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/rmcontentviewer.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/rmcontentviewer.vbproj
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/rmcontentviewer.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/window1.xaml b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/_readme_microsoft-sdk-rights-management-samples.doc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/_readme_microsoft-sdk-rights-management-samples.doc
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/_readme_microsoft-sdk-rights-management-samples.doc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/application.xaml b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/application.xaml
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/content/document-rights.xrml b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/content/document-rights.xrml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/content/document-rights.xrml
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/content/document-rights.xrml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/content/document-rmencrypted.xps b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/content/document-rmencrypted.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/content/document-rmencrypted.xps
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/content/document-rmencrypted.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/content/document.xps b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/content/document.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/content/document.xps
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/content/document.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/unsignedpublicense.vbproj b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/unsignedpublicense.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/unsignedpublicense.vbproj
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/unsignedpublicense.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/window1.xaml b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/annotationshelperxps.vb b/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/annotationshelperxps.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/annotationshelperxps.vb
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/annotationshelperxps.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/content/fixeddocumentsequence.xps b/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/content/fixeddocumentsequence.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/content/fixeddocumentsequence.xps
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/content/fixeddocumentsequence.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/docviewerannotationsxps.vbproj b/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/docviewerannotationsxps.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/docviewerannotationsxps.vbproj
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/docviewerannotationsxps.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/annotationdataconverter.vb b/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/annotationdataconverter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/annotationdataconverter.vb
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/annotationdataconverter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/flowdocumentannotatedviewer.vbproj b/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/flowdocumentannotatedviewer.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/flowdocumentannotatedviewer.vbproj
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/flowdocumentannotatedviewer.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/content/annotations.xml b/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/content/annotations.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/content/annotations.xml
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/content/annotations.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/content/fixeddocumentsequence.xps b/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/content/fixeddocumentsequence.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/content/fixeddocumentsequence.xps
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/content/fixeddocumentsequence.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/docviewerannotationsxml.vbproj b/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/docviewerannotationsxml.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/docviewerannotationsxml.vbproj
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/docviewerannotationsxml.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/data/cat.png b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/images/cat.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/data/cat.png
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/images/cat.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/data/dog.png b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/images/dog.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/data/dog.png
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/images/dog.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/data/fish.png b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/images/fish.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/data/fish.png
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/images/fish.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/images/flower.jpg b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/images/flower.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/images/flower.jpg
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/images/flower.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/listviewcustomview.vbproj b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/listviewcustomview.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/listviewcustomview.vbproj
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/listviewcustomview.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/myview.vb b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/myview.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/myview.vb
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/myview.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/onebuttonheaderview.vb b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/onebuttonheaderview.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/onebuttonheaderview.vb
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/onebuttonheaderview.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/plainview.vb b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/plainview.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/plainview.vb
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/plainview.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/themes/generic.xaml b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/themes/generic.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/themes/generic.xaml
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/themes/generic.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/FlowDocumentSample1.xaml b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/FlowDocumentSample1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/FlowDocumentSample1.xaml
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/FlowDocumentSample1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/FlowDocumentSample2.xaml b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/FlowDocumentSample2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/FlowDocumentSample2.xaml
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/FlowDocumentSample2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/FlowDocumentSample3.xaml b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/FlowDocumentSample3.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/FlowDocumentSample3.xaml
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/FlowDocumentSample3.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/SolarSystem.bmp b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/SolarSystem.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/SolarSystem.bmp
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/SolarSystem.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/Text.rtf b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/Text.rtf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/Text.rtf
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/Text.rtf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/Text.txt b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/Text.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Content/Text.txt
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Content/Text.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/FindText.vb b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/FindText.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/FindText.vb
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/FindText.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/FindTextClient.vbproj b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/FindTextClient.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/FindTextClient.vbproj
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/FindTextClient.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Application.Designer.vb b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Application.myapp b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Application.myapp
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/SearchWindow.vb b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/SearchWindow.vb
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/TextProvider.vbproj b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/TextProvider.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/TextProvider.vbproj
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/TextProvider.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/App.ico b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/ExpanderRichContent.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/ExpanderRichContent.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/ExpanderRichContent.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/ExpanderRichContent.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/images/icon.jpg b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/images/icon.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/images/icon.jpg
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/images/icon.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/BulletDecorator.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/BulletDecorator.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/BulletDecorator.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/BulletDecorator.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/IMAGES/apple.jpg b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/IMAGES/apple.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/IMAGES/apple.jpg
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/IMAGES/apple.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/generatorpositionsnippets.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/generatorpositionsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/generatorpositionsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/generatorpositionsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/ScrollViewer_Methods.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/ScrollViewer_Methods.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/ScrollViewer_Methods.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/ScrollViewer_Methods.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/LayoutInformation.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/LayoutInformation.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/LayoutInformation.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/LayoutInformation.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/popupsnips.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/popupsnips.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/popupsnips.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/popupsnips.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/popupcustomplacement.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/popupcustomplacement.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/popupcustomplacement.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/popupcustomplacement.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/PopupSample.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/PopupSample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/PopupSample.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/PopupSample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/RepeatButton_vb.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/RepeatButton_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/RepeatButton_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/RepeatButton_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/scrollbarsnips.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/scrollbarsnips.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/scrollbarsnips.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/scrollbarsnips.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/listbox_index.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/listbox_index.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/listbox_index.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/listbox_index.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/Thumb_wcp_vb.vbproj b/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/Thumb_wcp_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/Thumb_wcp_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/Thumb_wcp_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/ButtonProps.vbproj b/snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/ButtonProps.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/ButtonProps.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/ButtonProps.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/Button/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/Button/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Button/Overview/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Button/Overview/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/ClickMode_Snips.vbproj b/snippets/visualbasic/System.Windows.Controls/Button/Overview/ClickMode_Snips.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/ClickMode_Snips.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Button/Overview/ClickMode_Snips.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/Button/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Button/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Button/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Button/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Button/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Button/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/Calendar/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Calendar/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/calendarsnippets_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/calendarsnippets_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/calendarsnippets_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Calendar/Overview/calendarsnippets_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Calendar/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/beginchangeendchangeexample.vb b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/beginchangeendchangeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/beginchangeendchangeexample.vb
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/beginchangeendchangeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/charactercasingexample.vb b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/charactercasingexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/charactercasingexample.vb
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/charactercasingexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/spellcheckexample.vb b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/spellcheckexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/spellcheckexample.vb
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/spellcheckexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/textboxexample.vb b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/textboxexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/textboxexample.vb
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/textboxexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/textmiscsnippets_procedural.vbproj b/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/textmiscsnippets_procedural.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/textmiscsnippets_procedural.vbproj
rename to snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/textmiscsnippets_procedural.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/CheckBox_Snippets.vbproj b/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/CheckBox_Snippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/CheckBox_Snippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/CheckBox_Snippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/ColumnDefinitionsGrid.vbproj b/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/ColumnDefinitionsGrid.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/ColumnDefinitionsGrid.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/ColumnDefinitionsGrid.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/App.ico b/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/ComboBoxSimple.vbproj b/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/ComboBoxSimple.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/ComboBoxSimple.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/ComboBoxSimple.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/data/cat.png b/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/data/cat.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/data/cat.png
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/data/cat.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/data/dog.png b/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/data/dog.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/data/dog.png
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/data/dog.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/data/fish.png b/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/data/fish.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/data/fish.png
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/data/fish.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/ComboBox_Index.vbproj b/snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/ComboBox_Index.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/ComboBox_Index.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/ComboBox_Index.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/ContentControlTemplateSelector.vbproj b/snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/ContentControlTemplateSelector.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/ContentControlTemplateSelector.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/ContentControlTemplateSelector.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/App.ico b/snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/ContentControlSimple.vbproj b/snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/ContentControlSimple.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/ContentControlSimple.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/ContentControlSimple.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/Page1.xaml b/snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/Page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/Page1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/Page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/Page1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/Page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/Page1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/Page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/ControlContentOverviewSnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/ControlContentOverviewSnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/ControlContentOverviewSnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/ControlContentOverviewSnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/ContextMenusVB.vbproj b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/ContextMenusVB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/ContextMenusVB.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/ContextMenusVB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/data/cat.png b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/data/cat.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/data/cat.png
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/data/cat.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/data/dog.png b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/data/dog.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/data/dog.png
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/data/dog.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/data/fish.png b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/data/fish.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/data/fish.png
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/data/fish.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/MenuItemCommandsAndEvents.vbproj b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/MenuItemCommandsAndEvents.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/MenuItemCommandsAndEvents.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/MenuItemCommandsAndEvents.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/app1.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/app1.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane11.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane11.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane11.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane11.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/snippets.50001.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/snippets.50001.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/tabcontrolex.vbproj b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/tabcontrolex.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/tabcontrolex.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/tabcontrolex.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/tabcontrolex.vbproj b/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/tabcontrolex1.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/tabcontrolex.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/tabcontrolex1.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/App.ico b/snippets/visualbasic/System.Windows.Controls/Control/Background/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows.Controls/Control/Background/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/ControlProps.vbproj b/snippets/visualbasic/System.Windows.Controls/Control/Background/ControlProps.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/ControlProps.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Control/Background/ControlProps.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/Control/Background/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/Control/Background/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Control/Background/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Control/Background/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/ControlProps.vbproj b/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/ControlProps.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/ControlProps.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/ControlProps.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/adventureworkslt2008dataset.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/adventureworkslt2008dataset.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/adventureworkslt2008dataset.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/adventureworkslt2008dataset.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/adventureworkslt2008dataset.xsc b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/adventureworkslt2008dataset.xsc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/adventureworkslt2008dataset.xsc
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/adventureworkslt2008dataset.xsc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/adventureworkslt2008dataset.xsd b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/adventureworkslt2008dataset.xsd
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/adventureworkslt2008dataset.xsd
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/adventureworkslt2008dataset.xsd
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/adventureworkslt2008dataset.xss b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/adventureworkslt2008dataset.xss
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/adventureworkslt2008dataset.xss
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/adventureworkslt2008dataset.xss
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/app.config b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/app.config
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/datagrid_autogencolumns_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/datagrid_autogencolumns_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/datagrid_autogencolumns_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/datagrid_autogencolumns_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/adventureworkslt2008dataset.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/adventureworkslt2008dataset.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/adventureworkslt2008dataset.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/adventureworkslt2008dataset.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/adventureworkslt2008dataset.xsc b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/adventureworkslt2008dataset.xsc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/adventureworkslt2008dataset.xsc
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/adventureworkslt2008dataset.xsc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/adventureworkslt2008dataset.xsd b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/adventureworkslt2008dataset.xsd
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/adventureworkslt2008dataset.xsd
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/adventureworkslt2008dataset.xsd
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/adventureworkslt2008dataset.xss b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/adventureworkslt2008dataset.xss
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/adventureworkslt2008dataset.xss
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/adventureworkslt2008dataset.xss
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/app.config b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/app.config
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/datagrid_columnsmanipulation_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/datagrid_columnsmanipulation_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/datagrid_columnsmanipulation_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/datagrid_columnsmanipulation_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/adventureworkslt2008dataset.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/adventureworkslt2008dataset.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/adventureworkslt2008dataset.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/adventureworkslt2008dataset.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/adventureworkslt2008dataset.xsc b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/adventureworkslt2008dataset.xsc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/adventureworkslt2008dataset.xsc
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/adventureworkslt2008dataset.xsc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/adventureworkslt2008dataset.xsd b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/adventureworkslt2008dataset.xsd
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/adventureworkslt2008dataset.xsd
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/adventureworkslt2008dataset.xsd
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/adventureworkslt2008dataset.xss b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/adventureworkslt2008dataset.xss
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/adventureworkslt2008dataset.xss
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/adventureworkslt2008dataset.xss
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/app.config b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/app.config
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/application.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/datagrid_frozencolumn_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/datagrid_frozencolumn_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/datagrid_frozencolumn_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/datagrid_frozencolumn_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/adventureworkslt2008dataset.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/adventureworkslt2008dataset.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/adventureworkslt2008dataset.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.designer1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/adventureworkslt2008dataset.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.designer1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/adventureworkslt2008dataset.xsc b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.xsc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/adventureworkslt2008dataset.xsc
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.xsc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/adventureworkslt2008dataset.xsd b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.xsd
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/adventureworkslt2008dataset.xsd
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.xsd
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/adventureworkslt2008dataset.xss b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.xss
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/adventureworkslt2008dataset.xss
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset.xss
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/adventureworkslt2008dataset.xsc b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset1.xsc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/adventureworkslt2008dataset.xsc
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset1.xsc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/adventureworkslt2008dataset.xsd b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset1.xsd
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/adventureworkslt2008dataset.xsd
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset1.xsd
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/adventureworkslt2008dataset.xss b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset1.xss
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/adventureworkslt2008dataset.xss
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/adventureworkslt2008dataset1.xss
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/app.config b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/app.config
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/app.config b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/app1.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/app.config
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/app1.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/application.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/application.xaml1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/application.xaml1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Application.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/application1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/application1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/datagrid1_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/datagrid1_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/datagrid1_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/datagrid1_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/datagrid_customcolumns_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/datagrid_customcolumns_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/datagrid_customcolumns_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/datagrid_customcolumns_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/resources.resx b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/snippets.50001.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/snippets.50001.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/adventureworkslt2008dataset.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/adventureworkslt2008dataset.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/adventureworkslt2008dataset.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/adventureworkslt2008dataset.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/adventureworkslt2008dataset.xsc b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/adventureworkslt2008dataset.xsc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/adventureworkslt2008dataset.xsc
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/adventureworkslt2008dataset.xsc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/adventureworkslt2008dataset.xsd b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/adventureworkslt2008dataset.xsd
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/adventureworkslt2008dataset.xsd
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/adventureworkslt2008dataset.xsd
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/adventureworkslt2008dataset.xss b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/adventureworkslt2008dataset.xss
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/adventureworkslt2008dataset.xss
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/adventureworkslt2008dataset.xss
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/app.config b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/app.config
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/application.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/datagrid_rowheader_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/datagrid_rowheader_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/datagrid_rowheader_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/datagrid_rowheader_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/datagridvalidation.vbproj b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/datagridvalidation.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/datagridvalidation.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/datagridvalidation.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/mainwindow.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/adventureworkslt2008dataset.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/adventureworkslt2008dataset.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/adventureworkslt2008dataset.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/adventureworkslt2008dataset.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/adventureworkslt2008dataset.xsc b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/adventureworkslt2008dataset.xsc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/adventureworkslt2008dataset.xsc
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/adventureworkslt2008dataset.xsc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/adventureworkslt2008dataset.xsd b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/adventureworkslt2008dataset.xsd
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/adventureworkslt2008dataset.xsd
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/adventureworkslt2008dataset.xsd
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/adventureworkslt2008dataset.xss b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/adventureworkslt2008dataset.xss
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/adventureworkslt2008dataset.xss
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/adventureworkslt2008dataset.xss
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/app.config b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/app.config
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/application.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/datagrid_cellselection_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/datagrid_cellselection_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/datagrid_cellselection_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/datagrid_cellselection_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/data.vb b/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/data.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/data.vb
rename to snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/data.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/datatemplatingsample.vbproj b/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/datatemplatingsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/datatemplatingsample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/datatemplatingsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/tasklistdatatemplateselector.vb b/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/tasklistdatatemplateselector.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/tasklistdatatemplateselector.vb
rename to snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/tasklistdatatemplateselector.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/application.xaml b/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/datepickersnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/datepickersnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/datepickersnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/datepickersnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/basicborderexample.vb b/snippets/visualbasic/System.Windows.Controls/Decorator/Overview/basicborderexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/basicborderexample.vb
rename to snippets/visualbasic/System.Windows.Controls/Decorator/Overview/basicborderexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/Decorator/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/Decorator/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Decorator/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Decorator/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Controls/Decorator/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Controls/Decorator/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Decorator/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Decorator/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/textmiscsnippets_procedural.vbproj b/snippets/visualbasic/System.Windows.Controls/Decorator/Overview/textmiscsnippets_procedural.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/textmiscsnippets_procedural.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Decorator/Overview/textmiscsnippets_procedural.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/ExpanderExample.vbproj b/snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/ExpanderExample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/ExpanderExample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/ExpanderExample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/expandersnips.vbproj b/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/expandersnips.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/expandersnips.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/expandersnips.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/flowdocumentsnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/flowdocumentsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/flowdocumentsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/flowdocumentsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Application.xaml b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Application.xaml
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/FlowDocSelection.vbproj b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/FlowDocSelection.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/FlowDocSelection.vbproj
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/FlowDocSelection.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window2.xaml b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window2.xaml
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window2.xaml.vb b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window2.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window3.xaml b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window3.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window3.xaml
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window3.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window3.xaml.vb b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window3.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window3.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window3.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/homepage.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/homepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/homepage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/homepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/homepage.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/homepage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/homepage.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/homepage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/howtonavigationsnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/howtonavigationsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/howtonavigationsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/howtonavigationsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/setwindowheightpage.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/setwindowheightpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/setwindowheightpage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/setwindowheightpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/setwindowtitlepage.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/setwindowtitlepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/setwindowtitlepage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/setwindowtitlepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/setwindowwidthpage.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/setwindowwidthpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/setwindowwidthpage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/setwindowwidthpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Frame/Navigate/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/nsgnsvsfnssnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/nsgnsvsfnssnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/nsgnsvsfnssnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/nsgnsvsfnssnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/page1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/page1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/framenavigationuivisibilitysnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/framenavigationuivisibilitysnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/framenavigationuivisibilitysnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/framenavigationuivisibilitysnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/grid_issharedsizescope_prop.vbproj b/snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/grid_issharedsizescope_prop.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/grid_issharedsizescope_prop.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/grid_issharedsizescope_prop.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/gridsplittersnips.vbproj b/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/gridsplittersnips.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/gridsplittersnips.vbproj
rename to snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/gridsplittersnips.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/GridView/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/GridView/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/GridView/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/GridView/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/listviewcode.vbproj b/snippets/visualbasic/System.Windows.Controls/GridView/Overview/listviewcode.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/listviewcode.vbproj
rename to snippets/visualbasic/System.Windows.Controls/GridView/Overview/listviewcode.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/GridView/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/GridView/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/contentstringsnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/contentstringsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/contentstringsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/contentstringsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/groupingsample.vbproj b/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/groupingsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/groupingsample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/groupingsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/App.ico b/snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/HeaderedContentControlSimple.vbproj b/snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/HeaderedContentControlSimple.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/HeaderedContentControlSimple.vbproj
rename to snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/HeaderedContentControlSimple.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/Page1.xaml b/snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/Page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/Page1.xaml
rename to snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/Page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/Page1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/Page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/Page1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/Page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/headereditemscontrolsimple.vbproj b/snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/headereditemscontrolsimple.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/headereditemscontrolsimple.vbproj
rename to snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/headereditemscontrolsimple.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/page1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/page1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/CroppedImageExample.xaml b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/CroppedImageExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/CroppedImageExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/CroppedImageExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/CroppedImageExample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/CroppedImageExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/CroppedImageExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/CroppedImageExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/FormatConvertedExample.xaml b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/FormatConvertedExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/FormatConvertedExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/FormatConvertedExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/FormatConvertedExample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/FormatConvertedExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/FormatConvertedExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/FormatConvertedExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageElementExample.vbproj b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageElementExample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageElementExample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageElementExample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageSimpleExample.xaml b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageSimpleExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageSimpleExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageSimpleExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageSimpleExample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageSimpleExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageSimpleExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageSimpleExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageStretchExample.xaml b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageStretchExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageStretchExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageStretchExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/MyApp.xaml b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/SampleViewer.xaml b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/SampleViewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/SampleViewer.xaml
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/SampleViewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/SampleViewer.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/SampleViewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/SampleViewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/SampleViewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/SimpleImageExample.xaml b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/SimpleImageExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/SimpleImageExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/SimpleImageExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/SimpleImageExample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/SimpleImageExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/SimpleImageExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/SimpleImageExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/TransformedImageExample.xaml b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/TransformedImageExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/TransformedImageExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/TransformedImageExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/TransformedImageExample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/TransformedImageExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/TransformedImageExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/TransformedImageExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/apple.jpg b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/apple.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/apple.jpg
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/apple.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/bananas.jpg b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/bananas.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/bananas.jpg
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/bananas.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/cherries_larger.jpg b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/cherries_larger.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/cherries_larger.jpg
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/cherries_larger.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/gecko.jpg b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/gecko.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/gecko.jpg
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/gecko.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/rocks.jpg b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/rocks.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/rocks.jpg
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/rocks.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/watermelon.jpg b/snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/watermelon.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/watermelon.jpg
rename to snippets/visualbasic/System.Windows.Controls/Image/Stretch/sampleImages/watermelon.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/InkCanvasSamples.vbproj b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/InkCanvasSamples.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/InkCanvasSamples.vbproj
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/InkCanvasSamples.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/InkCanvasEditingModeSample.vbproj b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/InkCanvasEditingModeSample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/InkCanvasEditingModeSample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/InkCanvasEditingModeSample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/InkDragDrop.vbproj b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/InkDragDrop.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/InkDragDrop.vbproj
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/InkDragDrop.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/DrawingAttributesSample.vbproj b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/DrawingAttributesSample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/DrawingAttributesSample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/DrawingAttributesSample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/InkSelector.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/InkSelector.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MyResources.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MyResources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MyResources.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MyResources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MyResources.resx b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MyResources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MyResources.resx
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MyResources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MyResources.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MyResources.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MyResources.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MyResources.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MySettings.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MySettings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MySettings.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MySettings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MySettings.settings b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MySettings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MySettings.settings
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MySettings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MySettings.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MySettings.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MySettings.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/My Project/MySettings.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionMethods.vbproj b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionMethods.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionMethods.vbproj
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionMethods.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window3.xaml b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window3.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window3.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window3.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window3.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window3.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window3.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window3.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/InkPresenterSample.vbproj b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/InkPresenterSample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/InkPresenterSample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/InkPresenterSample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/listboxsort_snip.vbproj b/snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/listboxsort_snip.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/listboxsort_snip.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/listboxsort_snip.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/auctionitem.vb b/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/auctionitem.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/auctionitem.vb
rename to snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/auctionitem.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/auctionitemdatatemplateselector.vb b/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/auctionitemdatatemplateselector.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/auctionitemdatatemplateselector.vb
rename to snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/auctionitemdatatemplateselector.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/datetemplateselectorsample.vbproj b/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/datetemplateselectorsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/datetemplateselectorsample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/datetemplateselectorsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/ListBox_VB.vbproj b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/ListBox_VB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/ListBox_VB.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/ListBox_VB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/app.ico b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/images/cat.png b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/data/cat.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/images/cat.png
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/data/cat.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/images/dog.png b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/data/dog.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/images/dog.png
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/data/dog.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/images/fish.png b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/data/fish.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/images/fish.png
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/data/fish.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ListBox/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/listbox_index.vbproj b/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/listbox_index.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/listbox_index.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/listbox_index.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaElementExample.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaElementExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaElementExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaElementExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaElementExample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaElementExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaElementExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaElementExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaGallery.vbproj b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaGallery.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaGallery.vbproj
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaGallery.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaTimelineExample.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaTimelineExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaTimelineExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaTimelineExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaTimelineExample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaTimelineExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaTimelineExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaTimelineExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaTimelinePlusAnimationExample.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaTimelinePlusAnimationExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MediaTimelinePlusAnimationExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MediaTimelinePlusAnimationExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MyApp.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SampleViewer.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SampleViewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SampleViewer.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SampleViewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SampleViewer.xaml.vb b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SampleViewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SampleViewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SampleViewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SoundFromUserEventExample.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SoundFromUserEventExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SoundFromUserEventExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SoundFromUserEventExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SoundPlayerActionTriggers.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SoundPlayerActionTriggers.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SoundPlayerActionTriggers.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SoundPlayerActionTriggers.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SoundRepeatExample.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SoundRepeatExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SoundRepeatExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SoundRepeatExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/StretchMediaElementExample.xaml b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/StretchMediaElementExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/StretchMediaElementExample.xaml
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/StretchMediaElementExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/StretchMediaElementExample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/StretchMediaElementExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/StretchMediaElementExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/StretchMediaElementExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_next_d.gif b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_next_d.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_next_d.gif
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_next_d.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/UI_pause.gif b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_pause.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/UI_pause.gif
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_pause.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/UI_play.gif b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_play.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/UI_play.gif
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_play.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_previous_d.gif b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_previous_d.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_previous_d.gif
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_previous_d.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_resume.gif b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_resume.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_resume.gif
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_resume.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/UI_stop.gif b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_stop.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/UI_stop.gif
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/images/UI_stop.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/media/lowbat.wav b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/media/lowbat.wav
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/media/lowbat.wav
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/media/lowbat.wav
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/media/tada.wav b/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/media/tada.wav
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/media/tada.wav
rename to snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/media/tada.wav
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/data/cat.png b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/data/cat.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/data/cat.png
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/data/cat.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/data/dog.png b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/data/dog.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/data/dog.png
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/data/dog.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/data/fish.png b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/data/fish.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/data/fish.png
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/data/fish.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/menus.vbproj b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/menus.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/menus.vbproj
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/menus.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/homepage.xaml b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/homepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/homepage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/homepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/homepage.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/homepage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/homepage.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/homepage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/pagekeepalivesnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/pagekeepalivesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/pagekeepalivesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/pagekeepalivesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/homepage.xaml b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/homepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/homepage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/homepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/homepage.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/homepage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/homepage.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/homepage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/pagenavigationservicesnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/pagenavigationservicesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/pagenavigationservicesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/pagenavigationservicesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Page/NavigationService/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/Page/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/codepage.vb b/snippets/visualbasic/System.Windows.Controls/Page/Overview/codepage.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/codepage.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/codepage.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/homepage.xaml b/snippets/visualbasic/System.Windows.Controls/Page/Overview/homepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/homepage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/homepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/homepage.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Page/Overview/homepage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/homepage.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/homepage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/markupandcodebehindpage.xaml b/snippets/visualbasic/System.Windows.Controls/Page/Overview/markupandcodebehindpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/markupandcodebehindpage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/markupandcodebehindpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/markupandcodebehindpage.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Page/Overview/markupandcodebehindpage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/markupandcodebehindpage.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/markupandcodebehindpage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/markuppage.xaml b/snippets/visualbasic/System.Windows.Controls/Page/Overview/markuppage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/markuppage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/markuppage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/pagesnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/Page/Overview/pagesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/pagesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/pagesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Page/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Page/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/homepage.xaml b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/homepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/homepage.xaml
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/homepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/homepage.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/homepage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/homepage.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/homepage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/pageshowsnavigationuisnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/pageshowsnavigationuisnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/pageshowsnavigationuisnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/pageshowsnavigationuisnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/content/fixeddocumentsequence.xps b/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/content/fixeddocumentsequence.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/content/fixeddocumentsequence.xps
rename to snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/content/fixeddocumentsequence.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/printdialog_sample.vbproj b/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/printdialog_sample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/printdialog_sample.vbproj
rename to snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/printdialog_sample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/framesnips.vbproj b/snippets/visualbasic/System.Windows.Controls/Panel/Children/framesnips.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/framesnips.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Panel/Children/framesnips.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/Panel/Children/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/Panel/Children/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Panel/Children/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Panel/Children/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/Panel/Children/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Panel/Children/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Panel/Children/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Panel/Children/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/Panel/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/Panel/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Panel/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Panel/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Controls/Panel/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Controls/Panel/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Panel/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Panel/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/stackpanel_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/Panel/Overview/stackpanel_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/stackpanel_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Panel/Overview/stackpanel_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/stackpanelexample.vb b/snippets/visualbasic/System.Windows.Controls/Panel/Overview/stackpanelexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/stackpanelexample.vb
rename to snippets/visualbasic/System.Windows.Controls/Panel/Overview/stackpanelexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/passwordboxsnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/passwordboxsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/passwordboxsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/passwordboxsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/data/sunset.png b/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/data/sunset.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/data/sunset.png
rename to snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/data/sunset.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/progressbar.vbproj b/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/progressbar.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/progressbar.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/progressbar.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/App.ico b/snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/RadioButton.vbproj b/snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/RadioButton.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/RadioButton.vbproj
rename to snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/RadioButton.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/richtextboxsnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/richtextboxsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/richtextboxsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/richtextboxsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/application.xaml b/snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/rtbisdocumentenabled2.vbproj b/snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/rtbisdocumentenabled2.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/rtbisdocumentenabled2.vbproj
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/rtbisdocumentenabled2.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/basicrichtextboxwithcontentexample.vb b/snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/basicrichtextboxwithcontentexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/basicrichtextboxwithcontentexample.vb
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/basicrichtextboxwithcontentexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/richtextboxexample.vb b/snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/richtextboxexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/richtextboxexample.vb
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/richtextboxexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/textmiscsnippets_procedural.vbproj b/snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/textmiscsnippets_procedural.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/textmiscsnippets_procedural.vbproj
rename to snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/textmiscsnippets_procedural.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/ScrollChangedEventArgs_layout.vbproj b/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/ScrollChangedEventArgs_layout.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/ScrollChangedEventArgs_layout.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/ScrollChangedEventArgs_layout.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/App.ico b/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Slider_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Slider_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Slider_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Slider_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/application.xaml b/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/customwords.lex b/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/customwords.lex
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/customwords.lex
rename to snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/customwords.lex
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/customwords2.lex b/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/customwords2.lex
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/customwords2.lex
rename to snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/customwords2.lex
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/mainwindow.xaml b/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/wpfcustomdictionaries_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/wpfcustomdictionaries_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/wpfcustomdictionaries_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/wpfcustomdictionaries_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/listviewsnips.vbproj b/snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/listviewsnips.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/listviewsnips.vbproj
rename to snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/listviewsnips.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/App.xaml b/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/People.vb b/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/People.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/People.vb
rename to snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/People.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Person.vb b/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Person.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Person.vb
rename to snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Person.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/TabControlContentTemplateSelector.vbproj b/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/TabControlContentTemplateSelector.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/TabControlContentTemplateSelector.vbproj
rename to snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/TabControlContentTemplateSelector.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/app.ico b/snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/pane1.xaml b/snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/tabcontrolsimple.vbproj b/snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/tabcontrolsimple.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/tabcontrolsimple.vbproj
rename to snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/tabcontrolsimple.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/Text/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/Text/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/Text/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/spansnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/spansnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/spansnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/Text/spansnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/inlinesnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/inlinesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/inlinesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/inlinesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/textelementsnippets.vbproj b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/textelementsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/textelementsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/textelementsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/basictextboxexample.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/basictextboxexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/basictextboxexample.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/basictextboxexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/charactercasingexample.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/charactercasingexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/charactercasingexample.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/charactercasingexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/detectchangedtextexample.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/detectchangedtextexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/detectchangedtextexample.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/detectchangedtextexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/detectchangedtextexample.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/detectchangedtextexample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/detectchangedtextexample.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/detectchangedtextexample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/spellcheckexample.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/spellcheckexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/spellcheckexample.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/spellcheckexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/speller_custom_context_menu.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/speller_custom_context_menu.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/speller_custom_context_menu.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/speller_custom_context_menu.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/speller_custom_context_menu.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/speller_custom_context_menu.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/speller_custom_context_menu.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/speller_custom_context_menu.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textbox_with_background_image.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textbox_with_background_image.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textbox_with_background_image.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textbox_with_background_image.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textbox_with_background_image.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textbox_with_background_image.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textbox_with_background_image.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textbox_with_background_image.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textboxbackground.gif b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textboxbackground.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textboxbackground.gif
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textboxbackground.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textboxexample.xaml b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textboxexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textboxexample.xaml
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textboxexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textmiscsnippets_snip.vbproj b/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textmiscsnippets_snip.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/textmiscsnippets_snip.vbproj
rename to snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/textmiscsnippets_snip.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbar.vbproj b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbar.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbar.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbar.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/copy.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/copy.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/copy.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/copy.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/cut.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/cut.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/cut.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/cut.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/images/help.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/help.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/images/help.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/help.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/new.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/new.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/new.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/new.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/open.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/open.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/open.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/open.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/paint.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/paint.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/paint.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/paint.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/paste.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/paste.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/paste.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/paste.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/preview.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/preview.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/preview.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/preview.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/images/print.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/print.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/images/print.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/print.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/redo.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/redo.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/redo.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/redo.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/save.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/save.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/save.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/save.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/spell.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/spell.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/spell.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/spell.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/undo.bmp b/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/undo.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/undo.bmp
rename to snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/toolbargraphics/undo.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/tooltipservice.vbproj b/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/tooltipservice.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/tooltipservice.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/tooltipservice.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/tooltipcustom.vbproj b/snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/tooltipcustom.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/tooltipcustom.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/tooltipcustom.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/App.ico b/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/App.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/ToolTipSimple.vbproj b/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/ToolTipSimple.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/ToolTipSimple.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/ToolTipSimple.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/data/flower.jpg b/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/data/flower.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/data/flower.jpg
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/data/flower.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/pane1.xaml b/snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/tooltipassign.vbproj b/snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/tooltipassign.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/tooltipassign.vbproj
rename to snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/tooltipassign.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/treeviewsnips.vbproj b/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/treeviewsnips.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/treeviewsnips.vbproj
rename to snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/treeviewsnips.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/application.xaml b/snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/treeviewexpand.vbproj b/snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/treeviewexpand.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/treeviewexpand.vbproj
rename to snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/treeviewexpand.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/ElemCollMethodsVB.vbproj b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/ElemCollMethodsVB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/ElemCollMethodsVB.vbproj
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/ElemCollMethodsVB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/UIElementCollection_IndexOf_vb.vbproj b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/UIElementCollection_IndexOf_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/UIElementCollection_IndexOf_vb.vbproj
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/UIElementCollection_IndexOf_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/default.xaml b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/default.xaml
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/default.xaml.vb b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/default.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Controls/UserControl/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Controls/UserControl/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Controls/UserControl/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/UserControl/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/numericupdown.xaml b/snippets/visualbasic/System.Windows.Controls/UserControl/Overview/numericupdown.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/numericupdown.xaml
rename to snippets/visualbasic/System.Windows.Controls/UserControl/Overview/numericupdown.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/numericupdown.xaml.vb b/snippets/visualbasic/System.Windows.Controls/UserControl/Overview/numericupdown.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/numericupdown.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/UserControl/Overview/numericupdown.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/usercontrol.vbproj b/snippets/visualbasic/System.Windows.Controls/UserControl/Overview/usercontrol.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/usercontrol.vbproj
rename to snippets/visualbasic/System.Windows.Controls/UserControl/Overview/usercontrol.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Controls/UserControl/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Controls/UserControl/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Controls/UserControl/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/UserControl/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/3dsnippetgallery.vbproj b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/3dsnippetgallery.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/3dsnippetgallery.vbproj
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/3dsnippetgallery.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/basic3dshapeexample.vb b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/basic3dshapeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/basic3dshapeexample.vb
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/basic3dshapeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/emissivematerialexample.vb b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/emissivematerialexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/emissivematerialexample.vb
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/emissivematerialexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/misc3doperationsexample.vb b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/misc3doperationsexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/misc3doperationsexample.vb
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/misc3doperationsexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/multipletransformationsexample.vb b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/multipletransformationsexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/multipletransformationsexample.vb
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/multipletransformationsexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/apple.jpg b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/apple.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/apple.jpg
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/apple.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/berries.jpg b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/berries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/berries.jpg
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/berries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/cherries.jpg b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/cherries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/cherries.jpg
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/cherries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/rippled_metal_smaller.png b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/rippled_metal_smaller.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/rippled_metal_smaller.png
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/rippled_metal_smaller.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/sailboat.jpg b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/sailboat.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/sailboat.jpg
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/sailboat.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/waterlilies.jpg b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/waterlilies.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleimages/waterlilies.jpg
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleimages/waterlilies.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/smiley.png b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/smiley.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/smiley.png
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/smiley.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/viewport3dvisualexample.vb b/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/viewport3dvisualexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/viewport3dvisualexample.vb
rename to snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/viewport3dvisualexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/application.xaml b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/application.xaml
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/bindingvalidationattributessnippets.vbproj b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/bindingvalidationattributessnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/bindingvalidationattributessnippets.vbproj
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/bindingvalidationattributessnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/DirectionalBinding.vb b/snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/DirectionalBinding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/DirectionalBinding.vb
rename to snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/DirectionalBinding.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/DirectionalBinding_VB.vbproj b/snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/DirectionalBinding_VB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/DirectionalBinding_VB.vbproj
rename to snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/DirectionalBinding_VB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/NetIncome.vb b/snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/NetIncome.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/NetIncome.vb
rename to snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/NetIncome.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/Page1.xaml b/snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/Page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/Page1.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/Page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/bebvalidatewithoutupdating.vbproj b/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/bebvalidatewithoutupdating.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/bebvalidatewithoutupdating.vbproj
rename to snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/bebvalidatewithoutupdating.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/data.vb b/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/data.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/data.vb
rename to snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/data.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/AddProductWindow.xaml b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/AddProductWindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/AddProductWindow.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/AddProductWindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/AddProductWindow.xaml.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/AddProductWindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/AddProductWindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/AddProductWindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/AuctionItem.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/AuctionItem.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/AuctionItem.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/AuctionItem.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/Bid.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/Bid.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/Bid.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/Bid.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/DataBindingLab.vbproj b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/DataBindingLab.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/DataBindingLab.vbproj
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/DataBindingLab.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/DataBindingLabApp.xaml b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/DataBindingLabApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/DataBindingLabApp.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/DataBindingLabApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/DataBindingLabApp.xaml.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/DataBindingLabApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/DataBindingLabApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/DataBindingLabApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/DateConverter.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/DateConverter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/DateConverter.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/DateConverter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/FutureDateRule.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/FutureDateRule.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/FutureDateRule.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/FutureDateRule.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/SpecialFeaturesConverter.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/SpecialFeaturesConverter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/SpecialFeaturesConverter.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/SpecialFeaturesConverter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/User.vb b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/User.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/User.vb
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/User.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/todo.txt b/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/todo.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/todo.txt
rename to snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/todo.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/bindconversion.vbproj b/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/bindconversion.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/bindconversion.vbproj
rename to snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/bindconversion.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/myconverter.vb b/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/myconverter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/myconverter.vb
rename to snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/myconverter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/mydata.vb b/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/mydata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/mydata.vb
rename to snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/mydata.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/bytetodoubleconverter.vb b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/bytetodoubleconverter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/bytetodoubleconverter.vb
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/bytetodoubleconverter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/coloritem.vb b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/coloritem.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/coloritem.vb
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/coloritem.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/colors.vbproj b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/colors.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/colors.vbproj
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/colors.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/colors.xaml b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/colors.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/colors.xaml
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/colors.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/colors.xaml.vb b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/colors.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/colors.xaml.vb
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/colors.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/doubletostringconverter.vb b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/doubletostringconverter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/doubletostringconverter.vb
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/doubletostringconverter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/luminancetobrushconverter.vb b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/luminancetobrushconverter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/luminancetobrushconverter.vb
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/luminancetobrushconverter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/sourcetoboolconverter.vb b/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/sourcetoboolconverter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/sourcetoboolconverter.vb
rename to snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/sourcetoboolconverter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/Page1.xaml b/snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/Page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/Page1.xaml
rename to snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/Page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/Person.vb b/snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/Person.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/Person.vb
rename to snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/Person.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/SimpleBinding_VB.vbproj b/snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/SimpleBinding_VB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/SimpleBinding_VB.vbproj
rename to snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/SimpleBinding_VB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/access-by-line.txt b/snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/access-by-line.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/access-by-line.txt
rename to snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/access-by-line.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/5pages.xps b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/5pages.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/5pages.xps
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/5pages.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/autumn.jpg b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/autumn.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/autumn.jpg
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/autumn.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/cars.jpg b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/cars.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/cars.jpg
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/cars.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/tiger.jpg b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/tiger.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/tiger.jpg
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/tiger.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewfixeddocument.xps b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewfixeddocument.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewfixeddocument.xps
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewfixeddocument.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewfixeddocumentsequence.xps b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewfixeddocumentsequence.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewfixeddocumentsequence.xps
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewfixeddocumentsequence.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewflowdocument.xps b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewflowdocument.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewflowdocument.xps
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewflowdocument.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewmultiplevisuals.xps b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewmultiplevisuals.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewmultiplevisuals.xps
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewmultiplevisuals.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewonevisual.xps b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewonevisual.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/content/viewonevisual.xps
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/content/viewonevisual.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssave.vbproj b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssave.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssave.vbproj
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssave.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb b/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb
rename to snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/hyperlinksnippets.vbproj b/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/hyperlinksnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/hyperlinksnippets.vbproj
rename to snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/hyperlinksnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/listsnippets.vbproj b/snippets/visualbasic/System.Windows.Documents/List/Overview/listsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/listsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Documents/List/Overview/listsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Documents/List/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Documents/List/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Documents/List/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/List/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Documents/List/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Documents/List/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Documents/Run/.ctor/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Documents/Run/.ctor/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Documents/Run/.ctor/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/Run/.ctor/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/runsnippets.vbproj b/snippets/visualbasic/System.Windows.Documents/Run/.ctor/runsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/runsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Documents/Run/.ctor/runsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Documents/Run/.ctor/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Documents/Run/.ctor/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Documents/Run/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Documents/Run/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Documents/Run/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/Run/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Documents/Typography/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Documents/Typography/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows.Documents/Typography/Overview/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows.Documents/Typography/Overview/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/page1.xaml.vb b/snippets/visualbasic/System.Windows.Documents/Typography/Overview/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/page1.xaml.vb
rename to snippets/visualbasic/System.Windows.Documents/Typography/Overview/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Documents/Typography/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Documents/Typography/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/typographycodesnippets.vbproj b/snippets/visualbasic/System.Windows.Documents/Typography/Overview/typographycodesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/typographycodesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Documents/Typography/Overview/typographycodesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/App.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/App.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/App.xaml.vb b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/App.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/App.xaml.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/App.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/PropertyMappingWithWfh.vbproj b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/PropertyMappingWithWfh.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/PropertyMappingWithWfh.vbproj
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/PropertyMappingWithWfh.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/myevents.vb b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/myevents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/myevents.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/myevents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/resources.designer.vb b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/settings.designer.vb b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/settings.settings b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/My Project/settings.settings
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/My Project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/app.xaml b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/app.xaml
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/app.xaml.vb b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/hostingaxinwpf.vbproj b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/hostingaxinwpf.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/hostingaxinwpf.vbproj
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/hostingaxinwpf.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/window1.xaml b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/window1.xaml
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/window1.xaml.vb b/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/CustomRenderedStroke.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/CustomRenderedStroke.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/CustomRenderedStroke.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/CustomRenderedStroke.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/Ink3d.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/Ink3d.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/Ink3d.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/Ink3d.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MyResources.Designer.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MyResources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MyResources.Designer.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MyResources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MyResources.resx b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MyResources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MyResources.resx
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MyResources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MyResources.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MyResources.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MyResources.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MyResources.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MySettings.Designer.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MySettings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MySettings.Designer.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MySettings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MySettings.settings b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MySettings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MySettings.settings
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MySettings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MySettings.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MySettings.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MySettings.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/My Project/MySettings.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/StrokeCollectionShadow.vbproj b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/StrokeCollectionShadow.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/StrokeCollectionShadow.vbproj
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/StrokeCollectionShadow.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/CustomRenderedStroke.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/CustomRenderedStroke.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/CustomRenderedStroke.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/CustomRenderedStroke.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MyResources.Designer.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MyResources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MyResources.Designer.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MyResources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MyResources.resx b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MyResources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MyResources.resx
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MyResources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MyResources.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MyResources.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MyResources.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MyResources.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MySettings.Designer.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MySettings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MySettings.Designer.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MySettings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MySettings.settings b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MySettings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MySettings.settings
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MySettings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MySettings.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MySettings.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MySettings.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/My Project/MySettings.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyStroke.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyStroke.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyStroke.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyStroke.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/StrokeSnippets_VB.vbproj b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/StrokeSnippets_VB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/StrokeSnippets_VB.vbproj
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/StrokeSnippets_VB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/commandingoverviewsnippets.vbproj b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/commandingoverviewsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/commandingoverviewsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/commandingoverviewsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/commandWithHandler.vbproj b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/commandWithHandler.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/commandWithHandler.vbproj
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/commandWithHandler.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/invalidaterequerywithdispatchertimer.vbproj b/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/invalidaterequerywithdispatchertimer.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/invalidaterequerywithdispatchertimer.vbproj
rename to snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/invalidaterequerywithdispatchertimer.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/custom_routedcommand.vbproj b/snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/custom_routedcommand.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/custom_routedcommand.vbproj
rename to snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/custom_routedcommand.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/focussnippets.vbproj b/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/focussnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/focussnippets.vbproj
rename to snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/focussnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/inputmanager.vbproj b/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/inputmanager.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/inputmanager.vbproj
rename to snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/inputmanager.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/commandlibarysnippets.vbproj b/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/commandlibarysnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/commandlibarysnippets.vbproj
rename to snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/commandlibarysnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/app.config b/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/app.config
rename to snippets/visualbasic/System.Windows.Input/InputBinding/Overview/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Input/InputBinding/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/InputBinding/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/inputcommandbinding.vbproj b/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/inputcommandbinding.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/inputcommandbinding.vbproj
rename to snippets/visualbasic/System.Windows.Input/InputBinding/Overview/inputcommandbinding.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Input/InputBinding/Overview/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/InputBinding/Overview/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/InputBinding/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/keyboardsample.vbproj b/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/keyboardsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/keyboardsample.vbproj
rename to snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/keyboardsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/KeyDown.vbproj b/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/KeyDown.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/KeyDown.vbproj
rename to snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/KeyDown.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/sampleid.txt b/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/sampleid.txt
rename to snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/keyargssnippetsample.vbproj b/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/keyargssnippetsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/keyargssnippetsample.vbproj
rename to snippets/visualbasic/System.Windows.Input/Keyboard/Overview/keyargssnippetsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Input/Keyboard/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Keyboard/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/markupsnippets.vbproj b/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/markupsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/markupsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/markupsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Input/Mouse/Capture/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Input/Mouse/Capture/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Input/Mouse/Capture/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Mouse/Capture/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/mousecapturesample.vbproj b/snippets/visualbasic/System.Windows.Input/Mouse/Capture/mousecapturesample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/mousecapturesample.vbproj
rename to snippets/visualbasic/System.Windows.Input/Mouse/Capture/mousecapturesample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/Mouse/Capture/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/Mouse/Capture/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/Mouse/Capture/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/Mouse/Capture/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/Mouse/Capture/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Mouse/Capture/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/mouserelatedsnippets.vbproj b/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/mouserelatedsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/mouserelatedsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/mouserelatedsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browseback.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browseback.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browseback.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browseback.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browseforward.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browseforward.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browseforward.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browseforward.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browsehome.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browsehome.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browsehome.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browsehome.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browsehome.xaml.vb b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browsehome.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browsehome.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browsehome.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browsestop.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browsestop.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browsestop.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browsestop.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/datetime.vb b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/datetime.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/datetime.vb
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/datetime.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/decreasezoom.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/decreasezoom.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/decreasezoom.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/decreasezoom.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/favorites.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/favorites.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/favorites.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/favorites.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/favorites.xaml.vb b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/favorites.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/favorites.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/favorites.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/firstpage.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/firstpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/firstpage.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/firstpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/gotopage.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/gotopage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/gotopage.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/gotopage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/increasezoom.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/increasezoom.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/increasezoom.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/increasezoom.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/lastpage.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/lastpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/lastpage.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/lastpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/navigatejournal.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/navigatejournal.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/navigatejournal.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/navigatejournal.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/navigationcommandssnippets.vbproj b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/navigationcommandssnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/navigationcommandssnippets.vbproj
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/navigationcommandssnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/nextpage.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/nextpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/nextpage.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/nextpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/page2.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/page2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/page2.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/page2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/page3.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/page3.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/page3.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/page3.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/previouspage.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/previouspage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/previouspage.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/previouspage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/refresh.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/refresh.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/refresh.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/refresh.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/search.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/search.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/search.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/search.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/search.xaml.vb b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/search.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/search.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/search.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/zoom.xaml b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/zoom.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/zoom.xaml
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/zoom.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/zoom.xaml.vb b/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/zoom.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/zoom.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/zoom.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/commandslider.vb b/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/commandslider.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/commandslider.vb
rename to snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/commandslider.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/implementicommandsource.vbproj b/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/implementicommandsource.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/implementicommandsource.vbproj
rename to snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/implementicommandsource.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/StylusSamples.vbproj b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/StylusSamples.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/StylusSamples.vbproj
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/StylusSamples.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml.vb b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/Stylus/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/Stylus/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/StylusSnippets_VB.vbproj b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/StylusSnippets_VB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/StylusSnippets_VB.vbproj
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/StylusSnippets_VB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/StylusButton/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/PacketSpy.vbproj b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/PacketSpy.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/PacketSpy.vbproj
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/PacketSpy.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/HwCaps_VB.vbproj b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/HwCaps_VB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/HwCaps_VB.vbproj
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/HwCaps_VB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/app.config b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/application.xaml b/snippets/visualbasic/System.Windows.Input/Touch/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Input/Touch/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml b/snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/Touch/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/wpftouchframesample.vbproj b/snippets/visualbasic/System.Windows.Input/Touch/Overview/wpftouchframesample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/wpftouchframesample.vbproj
rename to snippets/visualbasic/System.Windows.Input/Touch/Overview/wpftouchframesample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/application.xaml b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/wpftoucheventssample.vbproj b/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/wpftoucheventssample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/wpftoucheventssample.vbproj
rename to snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/wpftoucheventssample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/application.xaml b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/htmlpage1.htm b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/htmlpage1.htm
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/htmlpage1.htm
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/htmlpage1.htm
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/introduction.htm b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/introduction.htm
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/introduction.htm
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/introduction.htm
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/app.manifest b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/app.manifest
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/app.manifest
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/app.manifest
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/page1.xaml b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/page1.xaml
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/page1.xaml.vb b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/page1.xaml.vb
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/wpfbrowserapplication1vb.vbproj b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/wpfbrowserapplication1vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/wpfbrowserapplication1vb.vbproj
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/wpfbrowserapplication1vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/browserinterophelpersnippet.vbproj b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/browserinterophelpersnippet.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/browserinterophelpersnippet.vbproj
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/browserinterophelpersnippet.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/my project/app.manifest b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/my project/app.manifest
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/my project/app.manifest
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/my project/app.manifest
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/page1.xaml.vb b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/page1.xaml.vb
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/readme.txt b/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/readme.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/readme.txt
rename to snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/readme.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/xamlreaderwritersnippets.vbproj b/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/xamlreaderwritersnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/xamlreaderwritersnippets.vbproj
rename to snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/xamlreaderwritersnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/clockcontroller_procedural_snip.vbproj b/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/clockcontroller_procedural_snip.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/clockcontroller_procedural_snip.vbproj
rename to snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/clockcontroller_procedural_snip.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/seekalignedtolasttickexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/seekalignedtolasttickexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/seekalignedtolasttickexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/seekalignedtolasttickexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/altdoubleanimationusingkeyframesexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/altdoubleanimationusingkeyframesexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/altdoubleanimationusingkeyframesexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/altdoubleanimationusingkeyframesexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/booleananimationusingkeyframesexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/booleananimationusingkeyframesexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/booleananimationusingkeyframesexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/booleananimationusingkeyframesexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/coloranimationusingkeyframesexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/coloranimationusingkeyframesexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/coloranimationusingkeyframesexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/coloranimationusingkeyframesexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/keyframes.vbproj b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/keyframes.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/keyframes.vbproj
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/keyframes.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/keytimesexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/keytimesexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/keytimesexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/keytimesexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/pointanimationusingkeyframesexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/pointanimationusingkeyframesexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/pointanimationusingkeyframesexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/pointanimationusingkeyframesexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/rectanimationusingkeyframesexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/rectanimationusingkeyframesexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/rectanimationusingkeyframesexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/rectanimationusingkeyframesexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/customeasingfunction.vbproj b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/customeasingfunction.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/customeasingfunction.vbproj
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/customeasingfunction.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/customlog10easingfunction.vb b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/customlog10easingfunction.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/customlog10easingfunction.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/customlog10easingfunction.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/animation_ovws_procedural.vbproj b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/animation_ovws_procedural.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/animation_ovws_procedural.vbproj
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/animation_ovws_procedural.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/controllablestoryboardexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/controllablestoryboardexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/controllablestoryboardexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/controllablestoryboardexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/fillbehaviorexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/fillbehaviorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/fillbehaviorexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/fillbehaviorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/rectangleopacityfadeexample.vb b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/rectangleopacityfadeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/rectangleopacityfadeexample.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/rectangleopacityfadeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/rectfadeinout.vb b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/rectfadeinout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/rectfadeinout.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/rectfadeinout.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/CroppedImageExample.xaml b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/CroppedImageExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/CroppedImageExample.xaml
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/CroppedImageExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/CroppedImageExample.xaml.vb b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/CroppedImageExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/CroppedImageExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/CroppedImageExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/FormatConvertedExample.xaml b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/FormatConvertedExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/FormatConvertedExample.xaml
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/FormatConvertedExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/FormatConvertedExample.xaml.vb b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/FormatConvertedExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/FormatConvertedExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/FormatConvertedExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/ImageElementExample.vbproj b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/ImageElementExample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/ImageElementExample.vbproj
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/ImageElementExample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SampleViewer.xaml b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SampleViewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SampleViewer.xaml
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SampleViewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SampleViewer.xaml.vb b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SampleViewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SampleViewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SampleViewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml.vb b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/TransformedImageExample.xaml b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/TransformedImageExample.xaml
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/TransformedImageExample.xaml.vb b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/TransformedImageExample.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/app.xaml b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/apple.jpg b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/apple.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/apple.jpg
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/apple.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/bananas.jpg b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/bananas.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/bananas.jpg
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/bananas.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/cherries_larger.jpg b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/cherries_larger.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/cherries_larger.jpg
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/cherries_larger.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/gecko.jpg b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/gecko.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/gecko.jpg
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/gecko.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/rocks.jpg b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/rocks.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/rocks.jpg
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/rocks.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/watermelon.jpg b/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/watermelon.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/sampleImages/watermelon.jpg
rename to snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/sampleImages/watermelon.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/show3dlights.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/show3dlights.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/show3dlights.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/show3dlights.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/viewporteventhandlers.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/viewporteventhandlers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/viewporteventhandlers.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/viewporteventhandlers.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/blanksample.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/blanksample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/blanksample.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/blanksample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/create_cube.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/create_cube.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/create_cube.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/create_cube.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/containermodelsample.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/containermodelsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/containermodelsample.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/containermodelsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/hittest3d.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/hittest3d.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/hittest3d.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/hittest3d.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/berries.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/berries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/berries.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/berries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/branches.png b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/branches.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/branches.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/branches.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/leafpicturecube2r000003.png b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/leafpicturecube2r000003.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/leafpicturecube2r000003.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/leafpicturecube2r000003.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/leafpicturecube2r000005.png b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/leafpicturecube2r000005.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/leafpicturecube2r000005.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/leafpicturecube2r000005.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/leaves_closeup.png b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/leaves_closeup.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/leaves_closeup.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/leaves_closeup.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/rippled_metal_smaller.png b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/rippled_metal_smaller.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/rippled_metal_smaller.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/rippled_metal_smaller.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/rocks.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/rocks.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/rocks.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/rocks.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/rocks.png b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/rocks.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/rocks.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/rocks.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/sunset.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/sunset.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/sunset.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/sunset.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile1.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile1.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile1.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile1.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile2.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile2.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile2.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile2.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile3.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile3.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile3.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile3.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile4.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile4.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile4.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile4.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile5.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile5.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile5.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile5.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile6.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile6.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/tile6.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/tile6.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/waterlilies.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/waterlilies.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/waterlilies.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/waterlilies.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/waterlilies.png b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/waterlilies.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/waterlilies.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sample_images/waterlilies.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sampleid.txt b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sampleid.txt
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/app.ico b/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/app.ico
rename to snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/mil3dvectorsample.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/mil3dvectorsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/mil3dvectorsample.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/mil3dvectorsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/matrixtransform3dview.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/matrixtransform3dview.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/matrixtransform3dview.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/matrixtransform3dview.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/mil3dpoints.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/mil3dpoints.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/mil3dpoints.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/mil3dpoints.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/mil4dpoints.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/mil4dpoints.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/mil4dpoints.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/mil4dpoints.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/quaternionview.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/quaternionview.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/quaternionview.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/quaternionview.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/berries.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/berries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/sample_images/berries.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/berries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/branches.png b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/branches.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/branches.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/branches.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/leafpicturecube2r000003.png b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/leafpicturecube2r000003.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/leafpicturecube2r000003.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/leafpicturecube2r000003.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/leafpicturecube2r000005.png b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/leafpicturecube2r000005.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/leafpicturecube2r000005.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/leafpicturecube2r000005.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/leaves_closeup.png b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/leaves_closeup.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/leaves_closeup.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/leaves_closeup.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/rippled_metal_smaller.png b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/rippled_metal_smaller.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/rippled_metal_smaller.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/rippled_metal_smaller.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/rocks.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/rocks.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/rocks.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/rocks.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/rocks.png b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/rocks.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/rocks.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/rocks.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/sunset.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/sunset.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/sunset.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/sunset.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/waterlilies.jpg b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/waterlilies.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/waterlilies.jpg
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/waterlilies.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/waterlilies.png b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/waterlilies.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/waterlilies.png
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/sample_images/waterlilies.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/mil3dsize.vbproj b/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/mil3dsize.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/mil3dsize.vbproj
rename to snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/mil3dsize.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/customtextclasses.vb b/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/customtextclasses.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/customtextclasses.vb
rename to snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/customtextclasses.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/textformattingsnippets.vbproj b/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/textformattingsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/textformattingsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/textformattingsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/butterfly.jpg b/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/butterfly.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/butterfly.jpg
rename to snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/butterfly.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/renderoptionssnippets.vbproj b/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/renderoptionssnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/renderoptionssnippets.vbproj
rename to snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/renderoptionssnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/brushesmiscsnippets_procedural.vbproj b/snippets/visualbasic/System.Windows.Media/Color/FromArgb/brushesmiscsnippets_procedural.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/brushesmiscsnippets_procedural.vbproj
rename to snippets/visualbasic/System.Windows.Media/Color/FromArgb/brushesmiscsnippets_procedural.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/createcolorsfromexample.vb b/snippets/visualbasic/System.Windows.Media/Color/FromArgb/createcolorsfromexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/createcolorsfromexample.vb
rename to snippets/visualbasic/System.Windows.Media/Color/FromArgb/createcolorsfromexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/Color/FromArgb/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/Color/FromArgb/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media/Color/FromArgb/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/Color/FromArgb/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media/Color/FromArgb/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media/Color/FromArgb/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media/Color/FromArgb/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/Color/FromArgb/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/setbackgroundcolorofshapeexample.vb b/snippets/visualbasic/System.Windows.Media/Color/FromArgb/setbackgroundcolorofshapeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/setbackgroundcolorofshapeexample.vb
rename to snippets/visualbasic/System.Windows.Media/Color/FromArgb/setbackgroundcolorofshapeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/compositiontargetsample.vbproj b/snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/compositiontargetsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/compositiontargetsample.vbproj
rename to snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/compositiontargetsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/containervisualsnippets.vbproj b/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/containervisualsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/containervisualsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/containervisualsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/containervisualhost.vbproj b/snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/containervisualhost.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/containervisualhost.vbproj
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/containervisualhost.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/disabledpiawareness.vbproj b/snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/disabledpiawareness.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/disabledpiawareness.vbproj
rename to snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/disabledpiawareness.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/app1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/app1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/drawingcontextexample.vbproj b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/drawingcontextexample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/drawingcontextexample.vbproj
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/drawingcontextexample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/drawingvisual.vbproj b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/drawingvisual.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/drawingvisual.vbproj
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/drawingvisual.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/popexample.vb b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/popexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/popexample.vb
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/popexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/pusheffectexample.vb b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/pusheffectexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/pusheffectexample.vb
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/pusheffectexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/snippets.50001.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/snippets.50001.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/drawingvisual.xaml b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/drawingvisual.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/drawingvisual.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/drawingvisual.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/drawingvisual.xaml.vb b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/drawingvisual.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/drawingvisual.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/drawingvisual.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/snippets.vb b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/snippets.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/snippets.vb
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/snippets.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/visualsnippets.vbproj b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/visualsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/visualsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/visualsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window2.xaml b/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window2.xaml
rename to snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/outlinetextcontrol.vb b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/outlinetextcontrol.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/outlinetextcontrol.vb
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/outlinetextcontrol.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/outlinetextcontrol.vbproj b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/outlinetextcontrol.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/outlinetextcontrol.vbproj
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/outlinetextcontrol.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/outlinetextcontrolviewer.vbproj b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/outlinetextcontrolviewer.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/outlinetextcontrolviewer.vbproj
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/outlinetextcontrolviewer.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/sampleimages/butterfly.jpg b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/sampleimages/butterfly.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/sampleimages/butterfly.jpg
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/sampleimages/butterfly.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/cherries.jpg b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/sampleimages/cherries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/cherries.jpg
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/sampleimages/cherries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/sampleimages/flames.jpg b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/sampleimages/flames.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/sampleimages/flames.jpg
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/sampleimages/flames.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/formattedtextsnippets.vbproj b/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/formattedtextsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/formattedtextsnippets.vbproj
rename to snippets/visualbasic/System.Windows.Media/FormattedText/Overview/formattedtextsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/FormattedText/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb b/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb
rename to snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/hittestingoverview.vbproj b/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/hittestingoverview.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/hittestingoverview.vbproj
rename to snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/hittestingoverview.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/sampleid.txt b/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/sampleid.txt
rename to snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/glyphtypefacesnippets.vbproj b/snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/glyphtypefacesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/glyphtypefacesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/glyphtypefacesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/BitmapDecoderExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/BitmapDecoderExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/BitmapDecoderExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/BitmapDecoderExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/BitmapSourceExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/BitmapSourceExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/BitmapSourceExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/BitmapSourceExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/ChainedBitmapSourcesExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/ChainedBitmapSourcesExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/ChainedBitmapSourcesExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/ChainedBitmapSourcesExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/ColorConvertedBitmapExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/ColorConvertedBitmapExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/ColorConvertedBitmapExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/ColorConvertedBitmapExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/CroppedBitmapExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/CroppedBitmapExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/CroppedBitmapExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/CroppedBitmapExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/FormatConvertedBitmapExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/FormatConvertedBitmapExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/FormatConvertedBitmapExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/FormatConvertedBitmapExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/FormatConvertedBitmapExample2.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/FormatConvertedBitmapExample2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/FormatConvertedBitmapExample2.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/FormatConvertedBitmapExample2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/ImagingSnippetGallery.vbproj b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/ImagingSnippetGallery.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/ImagingSnippetGallery.vbproj
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/ImagingSnippetGallery.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/MyApp.xaml b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/MyApp.xaml
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/MyApp.xaml.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/PixelFormatsExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/PixelFormatsExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/PixelFormatsExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/PixelFormatsExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/RenderTargetBitmapExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/RenderTargetBitmapExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/RenderTargetBitmapExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/RenderTargetBitmapExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/RenderTargetBitmapExample_Encode.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/RenderTargetBitmapExample_Encode.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/RenderTargetBitmapExample_Encode.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/RenderTargetBitmapExample_Encode.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/SampleViewer.xaml b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/SampleViewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/SampleViewer.xaml
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/SampleViewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/SampleViewer.xaml.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/SampleViewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/SampleViewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/SampleViewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/TransformedBitmapExample.vb b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/TransformedBitmapExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/TransformedBitmapExample.vb
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/TransformedBitmapExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/sampleImages/WaterLilies.JPG b/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/sampleImages/WaterLilies.JPG
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/sampleImages/WaterLilies.JPG
rename to snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/sampleImages/WaterLilies.JPG
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/PointCollection/ToString/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/PointCollection/ToString/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media/PointCollection/ToString/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/PointCollection/ToString/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/pointcollectionsample.vbproj b/snippets/visualbasic/System.Windows.Media/PointCollection/ToString/pointcollectionsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/pointcollectionsample.vbproj
rename to snippets/visualbasic/System.Windows.Media/PointCollection/ToString/pointcollectionsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Media/PointCollection/ToString/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Media/PointCollection/ToString/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/PointCollection/ToString/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/PointCollection/ToString/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/PointCollection/ToString/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/PointCollection/ToString/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/compositeshapeexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/compositeshapeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/compositeshapeexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/compositeshapeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/geometriesmiscsnippets_procedural.vbproj b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/geometriesmiscsnippets_procedural.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/geometriesmiscsnippets_procedural.vbproj
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/geometriesmiscsnippets_procedural.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/polybeziersegmentexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/polybeziersegmentexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/polybeziersegmentexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/polybeziersegmentexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/polyquadraticbeziersegmentexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/polyquadraticbeziersegmentexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/polyquadraticbeziersegmentexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/polyquadraticbeziersegmentexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamedgeometryexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamedgeometryexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamedgeometryexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamedgeometryexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometryarctoexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometryarctoexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometryarctoexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometryarctoexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrybeziertoexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrybeziertoexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrybeziertoexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrybeziertoexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometryexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometryexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometryexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometryexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolybeziertoexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolybeziertoexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolybeziertoexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolybeziertoexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolylinetoexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolylinetoexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolylinetoexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolylinetoexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolyquadraticbeziertoexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolyquadraticbeziertoexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolyquadraticbeziertoexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolyquadraticbeziertoexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometryquadraticbeziertoexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometryquadraticbeziertoexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometryquadraticbeziertoexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometryquadraticbeziertoexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrytriangleexample.vb b/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrytriangleexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrytriangleexample.vb
rename to snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrytriangleexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/geometryexamples.vb b/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/geometryexamples.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/geometryexamples.vb
rename to snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/geometryexamples.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/geoovwsamples.vbproj b/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/geoovwsamples.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/geoovwsamples.vbproj
rename to snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/geoovwsamples.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/waterlilies.jpg b/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/sampleimages/waterlilies.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/waterlilies.jpg
rename to snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/sampleimages/waterlilies.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/texteffect.xaml b/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/texteffect.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/texteffect.xaml
rename to snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/texteffect.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/texteffect.xaml.vb b/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/texteffect.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/texteffect.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/texteffect.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/textoverview.vbproj b/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/textoverview.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/textoverview.vbproj
rename to snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/textoverview.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/alignmentexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/alignmentexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/alignmentexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/alignmentexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/app.ico b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/brushoverviewexample.vbproj b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/brushoverviewexample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/brushoverviewexample.vbproj
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/brushoverviewexample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/drawingbrushexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/drawingbrushexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/drawingbrushexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/drawingbrushexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/imagebrushexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/imagebrushexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/imagebrushexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/imagebrushexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/opacityexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/opacityexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/opacityexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/opacityexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/apple.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/apple.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/apple.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/apple.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/bananas.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/bananas.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/bananas.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/bananas.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/bananas_small.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/bananas_small.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/bananas_small.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/bananas_small.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/berries.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/berries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/sample_images/berries.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/berries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/blueberries.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/blueberries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/blueberries.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/blueberries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/butterfly.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/butterfly.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/butterfly.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/butterfly.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/butterfly2.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/butterfly2.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/butterfly2.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/butterfly2.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/butterfly2_small.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/butterfly2_small.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/butterfly2_small.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/butterfly2_small.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/cherries.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/cherries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/cherries.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/cherries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/cherries_larger.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/cherries_larger.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/cherries_larger.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/cherries_larger.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/clouds.png b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/clouds.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/clouds.png
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/clouds.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/gecko.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/gecko.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/gecko.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/gecko.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/greenglass.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/greenglass.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/greenglass.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/greenglass.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/hummingbird.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/hummingbird.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/hummingbird.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/hummingbird.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/music.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/music.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/music.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/music.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/pinkcherries.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/pinkcherries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/pinkcherries.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/pinkcherries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/purpleblock.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/purpleblock.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/purpleblock.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/purpleblock.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/rocks.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/rocks.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/rocks.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/rocks.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/square.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/square.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/square.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/square.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/steel.png b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/steel.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/steel.png
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/steel.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/sunset.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/sunset.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/sunset.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/sunset.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/testimage.gif b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/testimage.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/testimage.gif
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/testimage.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/triangle.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/triangle.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/triangle.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/triangle.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/tulips.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/tulips.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleimages/tulips.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/tulips.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/sampleimages/waterlilies.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/waterlilies.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/sampleimages/waterlilies.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/waterlilies.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/watermelon.jpg b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/watermelon.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/sampleImages/watermelon.jpg
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleimages/watermelon.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/solidcolorbrushexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/solidcolorbrushexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/solidcolorbrushexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/solidcolorbrushexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/stretchexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/stretchexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/stretchexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/stretchexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/tilesizeexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/tilesizeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/tilesizeexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/tilesizeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/tilingexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/tilingexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/tilingexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/tilingexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/viewboxexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/viewboxexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/viewboxexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/viewboxexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/visualbrushexample.vb b/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/visualbrushexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/visualbrushexample.vb
rename to snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/visualbrushexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/addvisualchild.vbproj b/snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/addvisualchild.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/addvisualchild.vbproj
rename to snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/addvisualchild.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/autolayoutcontentexample.vb b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/autolayoutcontentexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/autolayoutcontentexample.vb
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/autolayoutcontentexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/paintwithvideoexample.vb b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/paintwithvideoexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/paintwithvideoexample.vb
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/paintwithvideoexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/reflectionexample.vb b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/reflectionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/reflectionexample.vb
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/reflectionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/samplemedia/thumbs.db b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/samplemedia/thumbs.db
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/samplemedia/thumbs.db
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/samplemedia/thumbs.db
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/visualbrush_markup_snip.vbproj b/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/visualbrush_markup_snip.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/visualbrush_markup_snip.vbproj
rename to snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/visualbrush_markup_snip.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/images/greenlight.jpg b/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/images/greenlight.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/images/greenlight.jpg
rename to snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/images/greenlight.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/sampleid.txt b/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/sampleid.txt
rename to snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/transparentobject.xaml b/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/transparentobject.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/transparentobject.xaml
rename to snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/transparentobject.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/transparentobject.xaml.vb b/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/transparentobject.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/transparentobject.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/transparentobject.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/visualsoverview.vbproj b/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/visualsoverview.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/visualsoverview.vbproj
rename to snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/visualsoverview.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/customcontentpage.xaml b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/customcontentpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/customcontentpage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/customcontentpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/customcontentpage.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/customcontentpage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/customcontentpage.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/customcontentpage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/customcontentstatesnippets.vbproj b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/customcontentstatesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/customcontentstatesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/customcontentstatesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/mycustomcontentstate.vb b/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/mycustomcontentstate.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/mycustomcontentstate.vb
rename to snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/mycustomcontentstate.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/datepage.xaml b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/datepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/datepage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/datepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/datepage.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/datepage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/datepage.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/datepage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/jekeepalivepage.xaml b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/jekeepalivepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/jekeepalivepage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/jekeepalivepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/jenamepage.xaml b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/jenamepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/jenamepage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/jenamepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/journalentrysnippets.vbproj b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/journalentrysnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/journalentrysnippets.vbproj
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/journalentrysnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/mycustomcontentstate.vb b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/mycustomcontentstate.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/mycustomcontentstate.vb
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/mycustomcontentstate.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/contentpage.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/contentpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/contentpage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/contentpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/contentpage.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/contentpage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/contentpage.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/contentpage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/fragmentedpage.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/fragmentedpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/fragmentedpage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/fragmentedpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/fragmentnotfoundpage.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/fragmentnotfoundpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/fragmentnotfoundpage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/fragmentnotfoundpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/fragmentnotfoundpage.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/fragmentnotfoundpage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/fragmentnotfoundpage.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/fragmentnotfoundpage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/navigationservicesnippets.vbproj b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/navigationservicesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/navigationservicesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/navigationservicesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/contentusercontrol.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/contentusercontrol.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/contentusercontrol.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/contentusercontrol.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/contentusercontrol.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/contentusercontrol.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/contentusercontrol.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/contentusercontrol.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/homepage.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/homepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/homepage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/homepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/nsgetnavigationservicesnippets.vbproj b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/nsgetnavigationservicesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/nsgetnavigationservicesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/nsgetnavigationservicesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/application.xaml1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/application.xaml1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/application1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/application1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/contentpage.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/contentpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/contentpage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/contentpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/contentpage.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/contentpage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/contentpage.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/contentpage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/fragmentedpage.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/fragmentedpage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/fragmentedpage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/fragmentedpage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/fragmentedpage.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/fragmentedpage1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/fragmentedpage.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/fragmentedpage1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/My Project/resources.resx b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/My Project/resources.resx
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/My Project/settings.settings b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/My Project/settings.settings
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/navigationservicenavigateobjectstatesnippets.vbproj b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/navigationservicenavigateobjectstatesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/navigationservicenavigateobjectstatesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/navigationservicenavigateobjectstatesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/navigationservicenavigateuristatesnippets.vbproj b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/navigationservicenavigateuristatesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/navigationservicenavigateuristatesnippets.vbproj
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/navigationservicenavigateuristatesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/snippets.50001.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/snippets.50001.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunction.xaml b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunction.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunction.xaml
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunction.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunction.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunction.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunction.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunction.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunctioncaller.xaml b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunctioncaller.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunctioncaller.xaml
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunctioncaller.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunctioncaller.xaml.vb b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunctioncaller.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunctioncaller.xaml.vb
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunctioncaller.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/pagefunctionmemberssnippets.vbproj b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/pagefunctionmemberssnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/pagefunctionmemberssnippets.vbproj
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/pagefunctionmemberssnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/application.xaml b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/application.xaml
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/mainwindow.xaml b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/resources.resx b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/settings.settings b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/shell_taskbaritemsample.vbproj b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/shell_taskbaritemsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/shell_taskbaritemsample.vbproj
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/shell_taskbaritemsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/threadingweatherforecastsample.vbproj b/snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/threadingweatherforecastsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/threadingweatherforecastsample.vbproj
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/threadingweatherforecastsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/dispatcheraccesssample.vbproj b/snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/dispatcheraccesssample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/dispatcheraccesssample.vbproj
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/dispatcheraccesssample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/dispatchersnippets.vbproj b/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/dispatchersnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/dispatchersnippets.vbproj
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/dispatchersnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/invalidaterequerywithsystemtimer.vbproj b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/invalidaterequerywithsystemtimer.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/invalidaterequerywithsystemtimer.vbproj
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/invalidaterequerywithsystemtimer.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/application.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/threadingprimenumbersample.vbproj b/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/threadingprimenumbersample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/threadingprimenumbersample.vbproj
rename to snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/threadingprimenumbersample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/dispatcherobjectaccesssample.vbproj b/snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/dispatcherobjectaccesssample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/dispatcherobjectaccesssample.vbproj
rename to snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/dispatcherobjectaccesssample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/app.xaml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/application.xaml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/content/fixedpage1_structure.xaml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/content/fixedpage1_structure.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/content/fixedpage1_structure.xaml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/content/fixedpage1_structure.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/content/fixedpage2_structure.xaml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/content/fixedpage2_structure.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/content/fixedpage2_structure.xaml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/content/fixedpage2_structure.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/content/spec_wiithstructure.xps b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/content/spec_wiithstructure.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/content/spec_wiithstructure.xps
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/content/spec_wiithstructure.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/content/spec_withoutstructure.xps b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/content/spec_withoutstructure.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/content/spec_withoutstructure.xps
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/content/spec_withoutstructure.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/documentproperties.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/documentproperties.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/documentproperties.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/documentproperties.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/documentstructure.vbproj b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/documentstructure.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/documentstructure.vbproj
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/documentstructure.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/parisnotredame.jpg b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/parisnotredame.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/parisnotredame.jpg
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/parisnotredame.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/properties.designer.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/properties.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/properties.designer.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/properties.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/properties.resx b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/properties.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/properties.resx
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/properties.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/properties.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/properties.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/properties.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/properties.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/readingandwritingxps.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/readingandwritingxps.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/readingandwritingxps.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/readingandwritingxps.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinition.designer.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinition.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinition.designer.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinition.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinition.resx b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinition.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinition.resx
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinition.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinition.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinition.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinition.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinition.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinitionsandsigning.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinitionsandsigning.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinitionsandsigning.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinitionsandsigning.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.designer.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.designer.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.resx b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.resx
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/[content_types].xml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/[content_types].xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/[content_types].xml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/[content_types].xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/_rels/.rels b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/_rels/.rels
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/_rels/.rels
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/_rels/.rels
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/documents/fixeddocument_1.fdoc b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/documents/fixeddocument_1.fdoc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/documents/fixeddocument_1.fdoc
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/documents/fixeddocument_1.fdoc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/fixeddocumentsequence.fdseq b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/fixeddocumentsequence.fdseq
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/fixeddocumentsequence.fdseq
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/fixeddocumentsequence.fdseq
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/pages/_rels/fixedpage_1.fpage.rels b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/pages/_rels/fixedpage_1.fpage.rels
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/pages/_rels/fixedpage_1.fpage.rels
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/pages/_rels/fixedpage_1.fpage.rels
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/pages/_rels/fixedpage_2.fpage.rels b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/pages/_rels/fixedpage_2.fpage.rels
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/pages/_rels/fixedpage_2.fpage.rels
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/pages/_rels/fixedpage_2.fpage.rels
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/pages/fixedpage_1.fpage b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/pages/fixedpage_1.fpage
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/pages/fixedpage_1.fpage
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/pages/fixedpage_1.fpage
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/pages/fixedpage_2.fpage b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/pages/fixedpage_2.fpage
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/pages/fixedpage_2.fpage
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/pages/fixedpage_2.fpage
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/33c063c8-1259-4322-acc8-8fc1964cc064.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/33c063c8-1259-4322-acc8-8fc1964cc064.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/33c063c8-1259-4322-acc8-8fc1964cc064.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/33c063c8-1259-4322-acc8-8fc1964cc064.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/3b85141b-0969-4d9e-b9c8-e705bb7e6543.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/3b85141b-0969-4d9e-b9c8-e705bb7e6543.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/3b85141b-0969-4d9e-b9c8-e705bb7e6543.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/3b85141b-0969-4d9e-b9c8-e705bb7e6543.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/3f87ce81-fb61-4ea7-8d62-aed569d1b895.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/3f87ce81-fb61-4ea7-8d62-aed569d1b895.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/3f87ce81-fb61-4ea7-8d62-aed569d1b895.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/3f87ce81-fb61-4ea7-8d62-aed569d1b895.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/64326a24-1829-4393-8602-67e5b520db43.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/64326a24-1829-4393-8602-67e5b520db43.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/64326a24-1829-4393-8602-67e5b520db43.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/64326a24-1829-4393-8602-67e5b520db43.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/9aa4ea89-755c-4331-be84-0cd43ff87195.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/9aa4ea89-755c-4331-be84-0cd43ff87195.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/fonts/9aa4ea89-755c-4331-be84-0cd43ff87195.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/fonts/9aa4ea89-755c-4331-be84-0cd43ff87195.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_1.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_1.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_1.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_1.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_2.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_2.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_2.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_2.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_3.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_3.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_3.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_3.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_4.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_4.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_4.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_4.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_5.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_5.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withoutstructure-xps/resources/images/image_5.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withoutstructure-xps/resources/images/image_5.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/[content_types].xml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/[content_types].xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/[content_types].xml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/[content_types].xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/_rels/.rels b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/_rels/.rels
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/_rels/.rels
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/_rels/.rels
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/documents/0/structure/fragments/1.frag b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/documents/0/structure/fragments/1.frag
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/documents/0/structure/fragments/1.frag
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/documents/0/structure/fragments/1.frag
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/documents/0/structure/fragments/2.frag b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/documents/0/structure/fragments/2.frag
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/documents/0/structure/fragments/2.frag
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/documents/0/structure/fragments/2.frag
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/documents/fixeddocument_1.fdoc b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/documents/fixeddocument_1.fdoc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/documents/fixeddocument_1.fdoc
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/documents/fixeddocument_1.fdoc
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/fixeddocumentsequence.fdseq b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/fixeddocumentsequence.fdseq
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/fixeddocumentsequence.fdseq
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/fixeddocumentsequence.fdseq
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/pages/_rels/fixedpage_1.fpage.rels b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/pages/_rels/fixedpage_1.fpage.rels
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/pages/_rels/fixedpage_1.fpage.rels
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/pages/_rels/fixedpage_1.fpage.rels
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/pages/_rels/fixedpage_2.fpage.rels b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/pages/_rels/fixedpage_2.fpage.rels
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/pages/_rels/fixedpage_2.fpage.rels
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/pages/_rels/fixedpage_2.fpage.rels
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/pages/fixedpage_1.fpage b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/pages/fixedpage_1.fpage
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/pages/fixedpage_1.fpage
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/pages/fixedpage_1.fpage
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/pages/fixedpage_2.fpage b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/pages/fixedpage_2.fpage
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/pages/fixedpage_2.fpage
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/pages/fixedpage_2.fpage
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/33c063c8-1259-4322-acc8-8fc1964cc064.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/33c063c8-1259-4322-acc8-8fc1964cc064.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/33c063c8-1259-4322-acc8-8fc1964cc064.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/33c063c8-1259-4322-acc8-8fc1964cc064.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/3b85141b-0969-4d9e-b9c8-e705bb7e6543.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/3b85141b-0969-4d9e-b9c8-e705bb7e6543.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/3b85141b-0969-4d9e-b9c8-e705bb7e6543.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/3b85141b-0969-4d9e-b9c8-e705bb7e6543.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/3f87ce81-fb61-4ea7-8d62-aed569d1b895.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/3f87ce81-fb61-4ea7-8d62-aed569d1b895.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/3f87ce81-fb61-4ea7-8d62-aed569d1b895.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/3f87ce81-fb61-4ea7-8d62-aed569d1b895.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/64326a24-1829-4393-8602-67e5b520db43.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/64326a24-1829-4393-8602-67e5b520db43.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/64326a24-1829-4393-8602-67e5b520db43.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/64326a24-1829-4393-8602-67e5b520db43.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/9aa4ea89-755c-4331-be84-0cd43ff87195.odttf b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/9aa4ea89-755c-4331-be84-0cd43ff87195.odttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/fonts/9aa4ea89-755c-4331-be84-0cd43ff87195.odttf
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/fonts/9aa4ea89-755c-4331-be84-0cd43ff87195.odttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_1.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_1.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_1.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_1.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_2.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_2.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_2.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_2.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_3.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_3.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_3.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_3.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_4.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_4.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_4.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_4.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_5.png b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_5.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/spec_withstructure-xps/resources/images/image_5.png
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/spec_withstructure-xps/resources/images/image_5.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/thumnaildialog.xaml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/thumnaildialog.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/thumnaildialog.xaml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/thumnaildialog.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/thumnaildialog.xaml.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/thumnaildialog.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/thumnaildialog.xaml.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/thumnaildialog.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/viewfixeddocumentsequence.xps b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/viewfixeddocumentsequence.xps
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/viewfixeddocumentsequence.xps
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/viewfixeddocumentsequence.xps
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window11.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window11.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/xpsreadwritesign.vbproj b/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/xpsreadwritesign.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/xpsreadwritesign.vbproj
rename to snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/xpsreadwritesign.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/Activated/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/Activated/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/Activated/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Activated/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/applicationactivationsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/Activated/applicationactivationsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/applicationactivationsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/Activated/applicationactivationsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/Activated/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/Activated/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/Activated/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Activated/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/Activated/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/Activated/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Application/Activated/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Activated/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Application/Activated/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Application/Activated/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Application/Activated/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Activated/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Application/Activated/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Application/Activated/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/applicationdispatcherunhandledexceptionsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/applicationdispatcherunhandledexceptionsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/applicationdispatcherunhandledexceptionsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/applicationdispatcherunhandledexceptionsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/Exit/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/Exit/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/Exit/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Exit/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/applicationexitsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/Exit/applicationexitsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/applicationexitsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/Exit/applicationexitsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/Exit/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/Exit/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/Exit/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Exit/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/Exit/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/Exit/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Application/Exit/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Exit/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Application/Exit/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Application/Exit/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Application/Exit/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Exit/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Application/Exit/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Application/Exit/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Application/Exit/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Application/Exit/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/FindResource/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/FindResource/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/applicationfindresourcesnippets.vbproj b/snippets/visualbasic/System.Windows/Application/FindResource/applicationfindresourcesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/applicationfindresourcesnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/FindResource/applicationfindresourcesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/FindResource/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/FindResource/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/FindResource/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/FindResource/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Application/FindResource/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Application/FindResource/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/application1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/application1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/application1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/application1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/applicationmainwindowsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/MainWindow/applicationmainwindowsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/applicationmainwindowsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/MainWindow/applicationmainwindowsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/customdialogbox.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/customdialogbox.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/customdialogbox.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/customdialogbox.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/customdialogbox.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/customdialogbox.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/customdialogbox.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/customdialogbox.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/customwindow.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/customwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/customwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/customwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/customwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/customwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/customwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/customwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/dialogboxwithresult.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/dialogboxwithresult.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/dialogboxwithresult.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/dialogboxwithresult.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/dialogboxwithresult.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/dialogboxwithresult.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/dialogboxwithresult.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/dialogboxwithresult.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/howtowindowmanagementsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/MainWindow/howtowindowmanagementsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/howtowindowmanagementsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/MainWindow/howtowindowmanagementsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Application/MainWindow/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Application/MainWindow/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Application/MainWindow/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Application/MainWindow/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/notthefirstwindow.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/notthefirstwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/notthefirstwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/notthefirstwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/notthefirstwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/notthefirstwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/notthefirstwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/notthefirstwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Application/MainWindow/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Application/MainWindow/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Application/MainWindow/snippets.50001.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Application/MainWindow/snippets.50001.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/startupwindow.xaml b/snippets/visualbasic/System.Windows/Application/MainWindow/startupwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/startupwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/MainWindow/startupwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/startupwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/MainWindow/startupwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/startupwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/MainWindow/startupwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/appcode.vb b/snippets/visualbasic/System.Windows/Application/Overview/appcode.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/appcode.vb
rename to snippets/visualbasic/System.Windows/Application/Overview/appcode.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/applicationsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/Overview/applicationsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/applicationsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/Overview/applicationsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/appmarkup.xaml b/snippets/visualbasic/System.Windows/Application/Overview/appmarkup.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/appmarkup.xaml
rename to snippets/visualbasic/System.Windows/Application/Overview/appmarkup.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/Properties/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/Properties/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/Properties/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Properties/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/applicationpropertiessnippets.vbproj b/snippets/visualbasic/System.Windows/Application/Properties/applicationpropertiessnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/applicationpropertiessnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/Properties/applicationpropertiessnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/Properties/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/Properties/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/Properties/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Properties/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/Properties/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/Properties/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Application/Properties/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Properties/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Application/Properties/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Application/Properties/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Application/Properties/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Properties/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Application/Properties/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Application/Properties/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/access-by-line.txt b/snippets/visualbasic/System.Windows/Application/Resources/access-by-line.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/access-by-line.txt
rename to snippets/visualbasic/System.Windows/Application/Resources/access-by-line.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/Resources/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/Resources/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/Resources/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Resources/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/applicationpropertiessnippet.xaml b/snippets/visualbasic/System.Windows/Application/Resources/applicationpropertiessnippet.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/applicationpropertiessnippet.xaml
rename to snippets/visualbasic/System.Windows/Application/Resources/applicationpropertiessnippet.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/applicationpropertiessnippet.xaml.vb b/snippets/visualbasic/System.Windows/Application/Resources/applicationpropertiessnippet.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/applicationpropertiessnippet.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Resources/applicationpropertiessnippet.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/exitcodeappclass.vb b/snippets/visualbasic/System.Windows/Application/Resources/exitcodeappclass.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/exitcodeappclass.vb
rename to snippets/visualbasic/System.Windows/Application/Resources/exitcodeappclass.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/howtoapplicationmodelsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/Resources/howtoapplicationmodelsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/howtoapplicationmodelsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/Resources/howtoapplicationmodelsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/Resources/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/Resources/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/Resources/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Resources/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/Resources/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/Resources/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/myresourcedictionary.xaml b/snippets/visualbasic/System.Windows/Application/Resources/myresourcedictionary.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/myresourcedictionary.xaml
rename to snippets/visualbasic/System.Windows/Application/Resources/myresourcedictionary.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Application/Resources/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Application/Resources/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/SessionEnding/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/SessionEnding/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/applicationsessionendingsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/SessionEnding/applicationsessionendingsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/applicationsessionendingsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/applicationsessionendingsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/SessionEnding/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/SessionEnding/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/SessionEnding/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Application/SessionEnding/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Application/SessionEnding/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Application/SessionEnding/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Application/SessionEnding/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Application/SessionEnding/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Application/SessionEnding/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/access-by-line.txt b/snippets/visualbasic/System.Windows/Application/Startup/access-by-line.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/access-by-line.txt
rename to snippets/visualbasic/System.Windows/Application/Startup/access-by-line.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/Startup/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/Startup/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/Startup/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Startup/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/applicationstartupsnippets.vbproj b/snippets/visualbasic/System.Windows/Application/Startup/applicationstartupsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/applicationstartupsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/Startup/applicationstartupsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/Startup/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/Startup/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/Startup/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Startup/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/Startup/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/Startup/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Application/Startup/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Startup/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Application/Startup/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Application/Startup/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Application/Startup/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Startup/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Application/Startup/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Application/Startup/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Application/Startup/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Application/Startup/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/TryFindResource/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/TryFindResource/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/applicationresource.jpg b/snippets/visualbasic/System.Windows/Application/TryFindResource/applicationresource.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/applicationresource.jpg
rename to snippets/visualbasic/System.Windows/Application/TryFindResource/applicationresource.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/applicationtryfindresourcesnippets.vbproj b/snippets/visualbasic/System.Windows/Application/TryFindResource/applicationtryfindresourcesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/applicationtryfindresourcesnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/TryFindResource/applicationtryfindresourcesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/TryFindResource/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/TryFindResource/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/TryFindResource/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/TryFindResource/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Application/TryFindResource/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Application/TryFindResource/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Application/Windows/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Application/Windows/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Application/Windows/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Windows/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/applicationwindowssnippets.vbproj b/snippets/visualbasic/System.Windows/Application/Windows/applicationwindowssnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/applicationwindowssnippets.vbproj
rename to snippets/visualbasic/System.Windows/Application/Windows/applicationwindowssnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Application/Windows/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Application/Windows/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Application/Windows/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Application/Windows/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Application/Windows/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Application/Windows/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Application/Windows/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Windows/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Application/Windows/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Application/Windows/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Application/Windows/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Application/Windows/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Application/Windows/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Application/Windows/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/windowmenuitem.vb b/snippets/visualbasic/System.Windows/Application/Windows/windowmenuitem.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/windowmenuitem.vb
rename to snippets/visualbasic/System.Windows/Application/Windows/windowmenuitem.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/dragdropmisccode.vbproj b/snippets/visualbasic/System.Windows/Clipboard/Overview/dragdropmisccode.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/dragdropmisccode.vbproj
rename to snippets/visualbasic/System.Windows/Clipboard/Overview/dragdropmisccode.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/Clipboard/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/Clipboard/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/Clipboard/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/Clipboard/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/sampleid.txt b/snippets/visualbasic/System.Windows/Clipboard/Overview/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/sampleid.txt
rename to snippets/visualbasic/System.Windows/Clipboard/Overview/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Clipboard/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Clipboard/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/default.xaml b/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/default.xaml
rename to snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/default.xaml.vb b/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/default.xaml.vb
rename to snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/dpcustom.vbproj b/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/dpcustom.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/dpcustom.vbproj
rename to snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/dpcustom.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/sampleid.txt b/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/sampleid.txt
rename to snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb b/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb
rename to snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vbproj b/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vbproj
rename to snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/pseudocode.xaml b/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/pseudocode.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/pseudocode.xaml
rename to snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/pseudocode.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/ContentElement/AddHandler/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/ContentElement/AddHandler/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/default.xaml b/snippets/visualbasic/System.Windows/ContentElement/AddHandler/default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/default.xaml
rename to snippets/visualbasic/System.Windows/ContentElement/AddHandler/default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/default.xaml.vb b/snippets/visualbasic/System.Windows/ContentElement/AddHandler/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/default.xaml.vb
rename to snippets/visualbasic/System.Windows/ContentElement/AddHandler/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/eventovwsupport.vbproj b/snippets/visualbasic/System.Windows/ContentElement/AddHandler/eventovwsupport.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/eventovwsupport.vbproj
rename to snippets/visualbasic/System.Windows/ContentElement/AddHandler/eventovwsupport.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/page2.xaml b/snippets/visualbasic/System.Windows/ContentElement/AddHandler/page2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/page2.xaml
rename to snippets/visualbasic/System.Windows/ContentElement/AddHandler/page2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/page2.xaml.vb b/snippets/visualbasic/System.Windows/ContentElement/AddHandler/page2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/page2.xaml.vb
rename to snippets/visualbasic/System.Windows/ContentElement/AddHandler/page2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/ContentElement/AddHandler/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/ContentElement/AddHandler/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/contentelementssmorgasbord.vbproj b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/contentelementssmorgasbord.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/contentelementssmorgasbord.vbproj
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/contentelementssmorgasbord.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/default.xaml b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/default.xaml
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/default.xaml.vb b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/default.xaml.vb
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page2.xaml b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page2.xaml
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page2.xaml.vb b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page2.xaml.vb
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page4.xaml b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page4.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page4.xaml
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page4.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/trackball.vb b/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/trackball.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/trackball.vb
rename to snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/trackball.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/DPClearValue.vbproj b/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/DPClearValue.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/DPClearValue.vbproj
rename to snippets/visualbasic/System.Windows/DependencyObject/ClearValue/DPClearValue.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/Default.xaml b/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/Default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/Default.xaml
rename to snippets/visualbasic/System.Windows/DependencyObject/ClearValue/Default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/DependencyObject/ClearValue/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/default.xaml.vb b/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/default.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyObject/ClearValue/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/sampleid.txt b/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/sampleid.txt
rename to snippets/visualbasic/System.Windows/DependencyObject/ClearValue/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/DependencyObject/ClearValue/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/default.xaml b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/default.xaml
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/default.xaml.vb b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/default.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page1.xaml.vb b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page1.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page2.xaml b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page2.xaml
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page3.xaml b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page3.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page3.xaml
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page3.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page3.xaml.vb b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page3.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page3.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page3.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page4.xaml b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page4.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page4.xaml
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page4.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page4.xaml.vb b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page4.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page4.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page4.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page5.xaml b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page5.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page5.xaml
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page5.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page5.xaml.vb b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page5.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page5.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page5.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/propertiesovwsupport.vbproj b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/propertiesovwsupport.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/propertiesovwsupport.vbproj
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/propertiesovwsupport.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/wavy.jpg b/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/wavy.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/wavy.jpg
rename to snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/wavy.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/app.xaml b/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/app.xaml
rename to snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/default.xaml b/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/default.xaml
rename to snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/default.xaml.vb b/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/default.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml b/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml
rename to snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb b/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/xamlapp.vbproj b/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/xamlapp.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/xamlapp.vbproj
rename to snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/xamlapp.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/numericupdown.vb b/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/numericupdown.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/numericupdown.vb
rename to snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/numericupdown.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/numericupdownoneproject.vbproj b/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/numericupdownoneproject.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/numericupdownoneproject.vbproj
rename to snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/numericupdownoneproject.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/themes/generic.xaml b/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/themes/generic.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/themes/generic.xaml
rename to snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/themes/generic.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/dragdropsnippetsvb.vbproj b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/dragdropsnippetsvb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/dragdropsnippetsvb.vbproj
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/dragdropsnippetsvb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/resources.resx b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/MediaElementExample.vbproj b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/MediaElementExample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/MediaElementExample.vbproj
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/MediaElementExample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/MyApp.xaml b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/MyApp.xaml
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/MyApp.xaml.vb b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/PlaybackExample.vb b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/PlaybackExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/PlaybackExample.vb
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/PlaybackExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/PlaybackExample.xaml b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/PlaybackExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/PlaybackExample.xaml
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/PlaybackExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/SampleViewer.xaml b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/SampleViewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/SampleViewer.xaml
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/SampleViewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/SampleViewer.xaml.vb b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/SampleViewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/SampleViewer.xaml.vb
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/SampleViewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/SimpleUsage.xaml b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/SimpleUsage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/SimpleUsage.xaml
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/SimpleUsage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/SimpleUsage.xaml.vb b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/SimpleUsage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/SimpleUsage.xaml.vb
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/SimpleUsage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/TransformExample.xaml b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/TransformExample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/TransformExample.xaml
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/TransformExample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_pause.gif b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/UI_pause.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_pause.gif
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/UI_pause.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_play.gif b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/UI_play.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_play.gif
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/UI_play.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_stop.gif b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/UI_stop.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/images/UI_stop.gif
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/UI_stop.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/mute.bmp b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/mute.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/mute.bmp
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/mute.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/volume.bmp b/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/volume.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/images/volume.bmp
rename to snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/images/volume.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/floaterfiguresnippets.vbproj b/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/floaterfiguresnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/floaterfiguresnippets.vbproj
rename to snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/floaterfiguresnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/blocksnippets.vbproj b/snippets/visualbasic/System.Windows/FlowDirection/Overview/blocksnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/blocksnippets.vbproj
rename to snippets/visualbasic/System.Windows/FlowDirection/Overview/blocksnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/FlowDirection/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/FlowDirection/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/FlowDirection/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/FlowDirection/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/FlowDirection/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/FlowDirection/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml.vb b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml.vb
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml.vb b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml.vb
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontsnippets.vbproj b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontsnippets.vbproj
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontstylesnippets.xaml b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontstylesnippets.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontstylesnippets.xaml
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontstylesnippets.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontstylesnippets.xaml.vb b/snippets/visualbasic/System.Windows/FontStyles/Italic/fontstylesnippets.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontstylesnippets.xaml.vb
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/fontstylesnippets.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/FontStyles/Italic/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/pages/homepage.xaml b/snippets/visualbasic/System.Windows/FontStyles/Italic/pages/homepage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/pages/homepage.xaml
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/pages/homepage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/pages/homepage.xaml.vb b/snippets/visualbasic/System.Windows/FontStyles/Italic/pages/homepage.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/pages/homepage.xaml.vb
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/pages/homepage.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/pages/pericl.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/pages/pericl.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/pages/pericl.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/pages/pericl.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/pericl.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/pericl.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/pericl.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/pericl.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/kooten.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/resources/kooten.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/kooten.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/resources/kooten.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/linds.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/resources/linds.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/linds.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/resources/linds.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/miramo.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/resources/miramo.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/miramo.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/resources/miramo.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/miramob.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/resources/miramob.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/miramob.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/resources/miramob.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/peric.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/resources/peric.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/peric.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/resources/peric.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/pericl.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/resources/pericl.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/pericl.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/resources/pericl.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/pesca.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/resources/pesca.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/pesca.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/resources/pesca.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/pescab.ttf b/snippets/visualbasic/System.Windows/FontStyles/Italic/resources/pescab.ttf
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/resources/pescab.ttf
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/resources/pescab.ttf
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/sampleid.txt b/snippets/visualbasic/System.Windows/FontStyles/Italic/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/sampleid.txt
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/CustomCursor.cur b/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/CustomCursor.cur
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/CustomCursor.cur
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/CustomCursor.cur
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/app.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/cursors.vbproj b/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/cursors.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/cursors.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/cursors.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/sampleid.txt b/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/sampleid.txt
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/textpointer_snippets.vbproj b/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/textpointer_snippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/textpointer_snippets.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/textpointer_snippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/tablesnippets2.vbproj b/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/tablesnippets2.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/tablesnippets2.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/tablesnippets2.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/Height_MinHeight_MaxHeight.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/Height_MinHeight_MaxHeight.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/Height_MinHeight_MaxHeight.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/Height_MinHeight_MaxHeight.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/Width_MinWidth_MaxWidth.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/Width_MinWidth_MaxWidth.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/Width_MinWidth_MaxWidth.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/Width_MinWidth_MaxWidth.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/cubeanimation_xbap.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/cubeanimation_xbap.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/cubeanimation_xbap.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/cubeanimation_xbap.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/images/roundcornersheet.png b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/images/roundcornersheet.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/images/roundcornersheet.png
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/images/roundcornersheet.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/images/star.png b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/images/star.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/images/star.png
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/images/star.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/my project/app.manifest b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/my project/app.manifest
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/my project/app.manifest
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/my project/app.manifest
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/page1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/page1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/trackball.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/trackball.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/trackball.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/trackball.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/bindinggroupsnippets.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/bindinggroupsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/bindinggroupsnippets.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/bindinggroupsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/data.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/data.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/data.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/data.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/resources.resx b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/validationrules.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/validationrules.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/validationrules.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/validationrules.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window2.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window2.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window2.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window2.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/App.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/App1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/App.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/App1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/DocumentPage.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/DocumentPage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/DocumentPage.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/DocumentPage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/FragmentNavigationSampleVisualBasic.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/FragmentNavigationSampleVisualBasic.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/FragmentNavigationSampleVisualBasic.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/FragmentNavigationSampleVisualBasic.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/FragmentNotFoundPage.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/FragmentNotFoundPage.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/FragmentNotFoundPage.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/FragmentNotFoundPage.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/MainWindow.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/MainWindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/MainWindow.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/MainWindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/MainWindow.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/MainWindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/MainWindow.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/MainWindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/baseelementssmorgasbord.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/baseelementssmorgasbord.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/baseelementssmorgasbord.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/baseelementssmorgasbord.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/default.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/default.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/default.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/default.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page2.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page2.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page3.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page3.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page3.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page3.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page3.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page3.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page3.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page3.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page4.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page4.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page4.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page4.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/treasuremap.bmp b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/treasuremap.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/treasuremap.bmp
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/treasuremap.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/treasuremap.gif b/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/treasuremap.gif
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/treasuremap.gif
rename to snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/treasuremap.gif
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/resizingadorner.vb b/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/resizingadorner.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/resizingadorner.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/resizingadorner.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/resizingadorner.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/resizingadorner.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/resizingadorner.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/resizingadorner.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/focussample.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/focussample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/focussample.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/focussample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/animatedheightexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/Name/animatedheightexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/animatedheightexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/Name/animatedheightexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/animateheight.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/Name/animateheight.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/animateheight.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/Name/animateheight.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/Name/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/Name/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/Name/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/Name/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/Parent/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/Parent/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/Parent/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/Parent/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/geometrydesigner.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/Parent/geometrydesigner.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/geometrydesigner.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/Parent/geometrydesigner.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/Parent/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/Parent/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/Parent/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/Parent/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/animateproperty_storyboards_vb.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/animateproperty_storyboards_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/animateproperty_storyboards_vb.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/animateproperty_storyboards_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/controlstoryboardexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/controlstoryboardexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/controlstoryboardexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/controlstoryboardexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/controltemplatestoryboardexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/controltemplatestoryboardexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/controltemplatestoryboardexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/controltemplatestoryboardexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementseekexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementseekexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementseekexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementseekexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementstoryboardexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementstoryboardexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementstoryboardexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementstoryboardexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementstoryboardwithhandoffbehaviorexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementstoryboardwithhandoffbehaviorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementstoryboardwithhandoffbehaviorexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementstoryboardwithhandoffbehaviorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkelementstoryboardhandoffbehaviorexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkelementstoryboardhandoffbehaviorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkelementstoryboardhandoffbehaviorexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkelementstoryboardhandoffbehaviorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/multiplenamescopesexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/multiplenamescopesexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/multiplenamescopesexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/multiplenamescopesexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/sampleviewer.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/sampleviewer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/sampleviewer.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/sampleviewer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/scopeexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/scopeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/scopeexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/scopeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/seekexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/seekexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/seekexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/seekexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/storyboardexample.vb b/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/storyboardexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/storyboardexample.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/storyboardexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/app.ico b/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/app.ico
rename to snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/help.bmp b/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/images/help.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/help.bmp
rename to snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/images/help.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/print.bmp b/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/images/print.bmp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/toolbargraphics/print.bmp
rename to snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/images/print.bmp
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/statusbar.vbproj b/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/statusbar.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/statusbar.vbproj
rename to snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/statusbar.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/recycleitemcontainershippets.vbproj b/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/recycleitemcontainershippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/recycleitemcontainershippets.vbproj
rename to snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/recycleitemcontainershippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/Canvas_Positioning_Properties.vbproj b/snippets/visualbasic/System.Windows/LengthConverter/Overview/Canvas_Positioning_Properties.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/Canvas_Positioning_Properties.vbproj
rename to snippets/visualbasic/System.Windows/LengthConverter/Overview/Canvas_Positioning_Properties.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows/LengthConverter/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows/LengthConverter/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows/LengthConverter/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows/LengthConverter/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/LengthConverter/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/LengthConverter/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/LengthConverter/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/LengthConverter/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/MessageBox/Show/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/MessageBox/Show/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/MessageBox/Show/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/MessageBox/Show/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/MessageBox/Show/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/MessageBox/Show/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/MessageBox/Show/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/MessageBox/Show/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/messageboxsnippets.vbproj b/snippets/visualbasic/System.Windows/MessageBox/Show/messageboxsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/messageboxsnippets.vbproj
rename to snippets/visualbasic/System.Windows/MessageBox/Show/messageboxsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show1window.xaml b/snippets/visualbasic/System.Windows/MessageBox/Show/show1window.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show1window.xaml
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show1window.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show1window.xaml.vb b/snippets/visualbasic/System.Windows/MessageBox/Show/show1window.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show1window.xaml.vb
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show1window.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show2window.xaml b/snippets/visualbasic/System.Windows/MessageBox/Show/show2window.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show2window.xaml
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show2window.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show2window.xaml.vb b/snippets/visualbasic/System.Windows/MessageBox/Show/show2window.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show2window.xaml.vb
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show2window.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show3window.xaml b/snippets/visualbasic/System.Windows/MessageBox/Show/show3window.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show3window.xaml
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show3window.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show3window.xaml.vb b/snippets/visualbasic/System.Windows/MessageBox/Show/show3window.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show3window.xaml.vb
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show3window.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show4window.xaml b/snippets/visualbasic/System.Windows/MessageBox/Show/show4window.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show4window.xaml
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show4window.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show4window.xaml.vb b/snippets/visualbasic/System.Windows/MessageBox/Show/show4window.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show4window.xaml.vb
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show4window.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show5window.xaml b/snippets/visualbasic/System.Windows/MessageBox/Show/show5window.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show5window.xaml
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show5window.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show5window.xaml.vb b/snippets/visualbasic/System.Windows/MessageBox/Show/show5window.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show5window.xaml.vb
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show5window.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show6window.xaml b/snippets/visualbasic/System.Windows/MessageBox/Show/show6window.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show6window.xaml
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show6window.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show6window.xaml.vb b/snippets/visualbasic/System.Windows/MessageBox/Show/show6window.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show6window.xaml.vb
rename to snippets/visualbasic/System.Windows/MessageBox/Show/show6window.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/MessageBox/Show/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/MessageBox/Show/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows/Point/Overview/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows/Point/Overview/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/Point/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/Point/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/Point/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/Point/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb b/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb
rename to snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexamples_snip.vbproj b/snippets/visualbasic/System.Windows/Point/Overview/pointexamples_snip.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexamples_snip.vbproj
rename to snippets/visualbasic/System.Windows/Point/Overview/pointexamples_snip.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows/Point/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows/Point/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows/Point/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows/Point/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/geometriesmiscsnippets.vbproj b/snippets/visualbasic/System.Windows/Rect/Overview/geometriesmiscsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/geometriesmiscsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Rect/Overview/geometriesmiscsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/Rect/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/Rect/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/Rect/Overview/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/Rect/Overview/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb b/snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb
rename to snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows/Rect/Overview/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows/Rect/Overview/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows/Rect/Overview/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows/Rect/Overview/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/app.ico b/snippets/visualbasic/System.Windows/Rect/op_Equality/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows/Rect/op_Equality/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/Rect/op_Equality/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/Rect/op_Equality/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/Rect/op_Equality/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/Rect/op_Equality/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/rectexample.vb b/snippets/visualbasic/System.Windows/Rect/op_Equality/rectexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/rectexample.vb
rename to snippets/visualbasic/System.Windows/Rect/op_Equality/rectexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/rectexamples_snip.vbproj b/snippets/visualbasic/System.Windows/Rect/op_Equality/rectexamples_snip.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/rectexamples_snip.vbproj
rename to snippets/visualbasic/System.Windows/Rect/op_Equality/rectexamples_snip.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows/Rect/op_Equality/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows/Rect/op_Equality/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows/Rect/op_Equality/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows/Rect/op_Equality/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpicker.vb b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpicker.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpicker.vb
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpicker.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpicker.vbproj b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpicker.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpicker.vbproj
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpicker.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpickerdialog.xaml b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpickerdialog.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpickerdialog.xaml
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpickerdialog.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpickerdialog.xaml.vb b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpickerdialog.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpickerdialog.xaml.vb
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpickerdialog.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/supportingclasses.vb b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/supportingclasses.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/supportingclasses.vb
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/supportingclasses.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/themes/generic.xaml b/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/themes/generic.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/themes/generic.xaml
rename to snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/themes/generic.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/autogrid.vbproj b/snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/autogrid.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/autogrid.vbproj
rename to snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/autogrid.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/smiley.png b/snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/smiley.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/smiley.png
rename to snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/smiley.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MyResources.Designer.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MyResources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MyResources.Designer.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MyResources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MyResources.resx b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MyResources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MyResources.resx
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MyResources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MyResources.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MyResources.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/My Project/MyResources.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MyResources.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MySettings.Designer.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MySettings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MySettings.Designer.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MySettings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MySettings.settings b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MySettings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MySettings.settings
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MySettings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MySettings.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MySettings.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/My Project/MySettings.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/My Project/MySettings.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/MyInkEraser.vbproj b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/MyInkEraser.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/MyInkEraser.vbproj
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/MyInkEraser.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/app.config b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/App.ico b/snippets/visualbasic/System.Windows/Style/Setters/App.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/App.ico
rename to snippets/visualbasic/System.Windows/Style/Setters/App.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/ListBoxItemStyle.vbproj b/snippets/visualbasic/System.Windows/Style/Setters/ListBoxItemStyle.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/ListBoxItemStyle.vbproj
rename to snippets/visualbasic/System.Windows/Style/Setters/ListBoxItemStyle.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/Pane1.xaml b/snippets/visualbasic/System.Windows/Style/Setters/Pane1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/Pane1.xaml
rename to snippets/visualbasic/System.Windows/Style/Setters/Pane1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/Pane1.xaml.vb b/snippets/visualbasic/System.Windows/Style/Setters/Pane1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/Pane1.xaml.vb
rename to snippets/visualbasic/System.Windows/Style/Setters/Pane1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/Style/Setters/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/Style/Setters/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Style/Setters/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Style/Setters/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/settings.settings b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/settings.settings
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/numericupdown.vb b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/numericupdown.vb
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/themes/generic.xaml b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/themes/generic.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/themes/generic.xaml
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/themes/generic.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/vsmcustomcontrolvb2.vbproj b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/vsmcustomcontrolvb2.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/vsmcustomcontrolvb2.vbproj
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/vsmcustomcontrolvb2.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/TextDecoration/.ctor/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/TextDecoration/.ctor/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/textdecorationsnippets.vbproj b/snippets/visualbasic/System.Windows/TextDecoration/.ctor/textdecorationsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/textdecorationsnippets.vbproj
rename to snippets/visualbasic/System.Windows/TextDecoration/.ctor/textdecorationsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/snippets.5000.json b/snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/textmarkerstylesnippets.vbproj b/snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/textmarkerstylesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/textmarkerstylesnippets.vbproj
rename to snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/textmarkerstylesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/TextBoxBase.vbproj b/snippets/visualbasic/System.Windows/TextWrapping/Overview/TextBoxBase.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/TextBoxBase.vbproj
rename to snippets/visualbasic/System.Windows/TextWrapping/Overview/TextBoxBase.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/TextWrapping/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/TextWrapping/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/snippets.5000.json b/snippets/visualbasic/System.Windows/TextWrapping/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/TextWrapping/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/acceldecelexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/acceldecelexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/acceldecelexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/acceldecelexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/animationclockexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/animationclockexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/animationclockexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/animationclockexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/autoreverseexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/autoreverseexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/autoreverseexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/autoreverseexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/begintimeexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/begintimeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/begintimeexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/begintimeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/clockcontrollerexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/clockcontrollerexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/clockcontrollerexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/clockcontrollerexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/clockcontrollerspeedratioexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/clockcontrollerspeedratioexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/clockcontrollerspeedratioexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/clockcontrollerspeedratioexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/clockhandoffbehaviorexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/clockhandoffbehaviorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/clockhandoffbehaviorexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/clockhandoffbehaviorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/controlstoryboardexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/controlstoryboardexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/controlstoryboardexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/controlstoryboardexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/fillbehaviorexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/fillbehaviorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/fillbehaviorexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/fillbehaviorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/getanimationbasevalueexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/getanimationbasevalueexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/getanimationbasevalueexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/getanimationbasevalueexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/opacityanimationexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/opacityanimationexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/opacityanimationexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/opacityanimationexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/repeatbehaviorexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/repeatbehaviorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/repeatbehaviorexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/repeatbehaviorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/apple.jpg b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/apple.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/apple.jpg
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/apple.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/berries.jpg b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/berries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/berries.jpg
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/berries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/sampleimages/cherries.jpg b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/cherries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/sampleimages/cherries.jpg
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/cherries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/rippled_metal_smaller.png b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/rippled_metal_smaller.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/rippled_metal_smaller.png
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/rippled_metal_smaller.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/sailboat.jpg b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/sailboat.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/sailboat.jpg
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/sailboat.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/waterlilies.jpg b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/waterlilies.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/waterlilies.jpg
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleimages/waterlilies.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleviewer.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleviewer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleviewer.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleviewer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/seekstoryboardexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/seekstoryboardexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/seekstoryboardexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/seekstoryboardexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/speedexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/speedexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/speedexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/speedexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/stylesexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/stylesexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/stylesexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/stylesexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/timelinecurrentglobalspeedinvalidatedexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/timelinecurrentglobalspeedinvalidatedexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/timelinecurrentglobalspeedinvalidatedexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/timelinecurrentglobalspeedinvalidatedexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/timelinecurrenttimeinvalidatedexample.vb b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/timelinecurrenttimeinvalidatedexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/timelinecurrenttimeinvalidatedexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/timelinecurrenttimeinvalidatedexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/timingbehavior_vb.vbproj b/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/timingbehavior_vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/timingbehavior_vb.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/timingbehavior_vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/animatingsolidcolorbrushexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/animatingsolidcolorbrushexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/animatingsolidcolorbrushexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/animatingsolidcolorbrushexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/brushesintroduction.vbproj b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/brushesintroduction.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/brushesintroduction.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/brushesintroduction.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/brushopacityexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/brushopacityexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/brushopacityexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/brushopacityexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/brushtransformexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/brushtransformexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/brushtransformexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/brushtransformexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/brushtypesexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/brushtypesexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/brushtypesexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/brushtypesexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/dashexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/dashexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/dashexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/dashexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/gradientbrushesexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/gradientbrushesexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/gradientbrushesexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/gradientbrushesexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/gradientbrushesexample.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/gradientbrushesexample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/gradientbrushesexample.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/gradientbrushesexample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/gradientspreadexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/gradientspreadexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/gradientspreadexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/gradientspreadexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/interactivelineargradientbrushexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/interactivelineargradientbrushexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/interactivelineargradientbrushexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/interactivelineargradientbrushexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/interactivelineargradientbrushexample.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/interactivelineargradientbrushexample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/interactivelineargradientbrushexample.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/interactivelineargradientbrushexample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/lineargradientbrushanimationexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/lineargradientbrushanimationexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/lineargradientbrushanimationexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/lineargradientbrushanimationexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/predefinedbrushes.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/predefinedbrushes.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/predefinedbrushes.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/predefinedbrushes.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/radialgradientbrushanimationexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/radialgradientbrushanimationexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/radialgradientbrushanimationexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/radialgradientbrushanimationexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/radialgradientbrushexample.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/radialgradientbrushexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/radialgradientbrushexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/radialgradientbrushexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/cherries.jpg b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/cherries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/sampleimages/cherries.jpg
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/cherries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/clouds.png b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/clouds.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/clouds.png
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/clouds.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/pinkcherries.jpg b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/pinkcherries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/pinkcherries.jpg
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/pinkcherries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/steel.png b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/steel.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/steel.png
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/steel.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/sunset.jpg b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/sunset.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleimages/sunset.jpg
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleimages/sunset.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleresources/toc.xml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleresources/toc.xml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleresources/toc.xml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleresources/toc.xml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/solidcolorbrushsyntax.xaml b/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/solidcolorbrushsyntax.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/solidcolorbrushsyntax.xaml
rename to snippets/visualbasic/System.Windows/UIElement/BeginAnimation/solidcolorbrushsyntax.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/UIElement/CommandBindings/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/UIElement/CommandBindings/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/CommandBindings/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/CommandBindings/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/commandhandlerprocedural.vbproj b/snippets/visualbasic/System.Windows/UIElement/CommandBindings/commandhandlerprocedural.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/commandhandlerprocedural.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/CommandBindings/commandhandlerprocedural.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/snippets.5000.json b/snippets/visualbasic/System.Windows/UIElement/CommandBindings/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/UIElement/CommandBindings/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/CursorToEnd.vbproj b/snippets/visualbasic/System.Windows/UIElement/Focus/CursorToEnd.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/CursorToEnd.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/Focus/CursorToEnd.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows/UIElement/Focus/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows/UIElement/Focus/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/Focus/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/Focus/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/UIElement/Focus/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/UIElement/Focus/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/UIElement/Focus/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/UIElement/Focus/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/RoutedEventAddRemoveHandler.vbproj b/snippets/visualbasic/System.Windows/UIElement/IsEnabled/RoutedEventAddRemoveHandler.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/RoutedEventAddRemoveHandler.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/IsEnabled/RoutedEventAddRemoveHandler.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/app.xaml b/snippets/visualbasic/System.Windows/UIElement/IsEnabled/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/app.xaml
rename to snippets/visualbasic/System.Windows/UIElement/IsEnabled/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/default.xaml b/snippets/visualbasic/System.Windows/UIElement/IsEnabled/default.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/default.xaml
rename to snippets/visualbasic/System.Windows/UIElement/IsEnabled/default.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/default.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/IsEnabled/default.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/default.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/IsEnabled/default.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/sampleid.txt b/snippets/visualbasic/System.Windows/UIElement/IsEnabled/sampleid.txt
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/sampleid.txt
rename to snippets/visualbasic/System.Windows/UIElement/IsEnabled/sampleid.txt
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/UIElement/IsEnabled/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/UIElement/IsEnabled/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/mousesnippetsample.vbproj b/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/mousesnippetsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/mousesnippetsample.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/mousesnippetsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/snippets.5000.json b/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/app.config b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/app.config
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/basicmanipulation.vbproj b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/basicmanipulation.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/basicmanipulation.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/basicmanipulation.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/reportboundaryfeedbackexample.xaml b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/reportboundaryfeedbackexample.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/reportboundaryfeedbackexample.xaml
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/reportboundaryfeedbackexample.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/reportboundaryfeedbackexample.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/reportboundaryfeedbackexample.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/reportboundaryfeedbackexample.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/reportboundaryfeedbackexample.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/adornersmisccode.vbproj b/snippets/visualbasic/System.Windows/UIElement/RenderSize/adornersmisccode.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/adornersmisccode.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/RenderSize/adornersmisccode.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/UIElement/RenderSize/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/UIElement/RenderSize/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/RenderSize/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/RenderSize/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/UIElement/RenderSize/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/UIElement/RenderSize/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/UIElement/RenderSize/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/UIElement/RenderSize/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/RenderSize/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/RenderSize/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/animatingsizeexample.vb b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/animatingsizeexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/animatingsizeexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/animatingsizeexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/project.vbproj b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/project.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/rotateaboutcenterexample.vb b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/rotateaboutcenterexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/rotateaboutcenterexample.vb
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/rotateaboutcenterexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/apple.jpg b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/apple.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/apple.jpg
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/apple.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/berries.jpg b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/berries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/berries.jpg
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/berries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/cherries.jpg b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/cherries.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/cherries.jpg
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/cherries.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/rippled_metal_smaller.png b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/rippled_metal_smaller.png
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/rippled_metal_smaller.png
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/rippled_metal_smaller.png
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/sailboat.jpg b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/sailboat.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/sailboat.jpg
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/sailboat.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/waterlilies.jpg b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/waterlilies.jpg
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleimages/waterlilies.jpg
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleimages/waterlilies.jpg
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/FilterPlugin.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/FilterPlugin.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/FilterPlugin.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/FilterPlugin.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/ImageRenderer.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/ImageRenderer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/ImageRenderer.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/ImageRenderer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/MyEvents.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/MyEvents.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/MyEvents.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/MyEvents.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/Resources.resx b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/Resources.resx
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/Settings.settings b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/My Project/Settings.settings
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/MyApp.xaml b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/MyApp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/MyApp.xaml
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/MyApp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/MyApp.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/MyApp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/MyApp.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/MyApp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StefansStylusControl.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StefansStylusControl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StefansStylusControl.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StefansStylusControl.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusPluginSamples.vbproj b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusPluginSamples.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusPluginSamples.vbproj
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusPluginSamples.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/Window1.xaml b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/Window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/Window1.xaml
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/Window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/Window1.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/Window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/Window1.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/Window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/Window2.xaml b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/Window2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/Window2.xaml
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/Window2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/Window2.xaml.vb b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/Window2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/Window2.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/Window2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/app.config b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/app.config
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/UIElement3D/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/UIElement3D/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/UIElement3D/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement3D/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/shapes.vbproj b/snippets/visualbasic/System.Windows/UIElement3D/Overview/shapes.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/shapes.vbproj
rename to snippets/visualbasic/System.Windows/UIElement3D/Overview/shapes.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/sphere.vb b/snippets/visualbasic/System.Windows/UIElement3D/Overview/sphere.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/sphere.vb
rename to snippets/visualbasic/System.Windows/UIElement3D/Overview/sphere.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/UIElement3D/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/UIElement3D/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/UIElement3D/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/UIElement3D/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/app.ico b/snippets/visualbasic/System.Windows/Vector/Length/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows/Vector/Length/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/myapp.xaml b/snippets/visualbasic/System.Windows/Vector/Length/myapp.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/myapp.xaml
rename to snippets/visualbasic/System.Windows/Vector/Length/myapp.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/myapp.xaml.vb b/snippets/visualbasic/System.Windows/Vector/Length/myapp.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/myapp.xaml.vb
rename to snippets/visualbasic/System.Windows/Vector/Length/myapp.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/sampleviewer.xaml b/snippets/visualbasic/System.Windows/Vector/Length/sampleviewer.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/sampleviewer.xaml
rename to snippets/visualbasic/System.Windows/Vector/Length/sampleviewer.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/sampleviewer.xaml.vb b/snippets/visualbasic/System.Windows/Vector/Length/sampleviewer.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/sampleviewer.xaml.vb
rename to snippets/visualbasic/System.Windows/Vector/Length/sampleviewer.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb b/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb
rename to snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexamples_snip.vbproj b/snippets/visualbasic/System.Windows/Vector/Length/vectorexamples_snip.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexamples_snip.vbproj
rename to snippets/visualbasic/System.Windows/Vector/Length/vectorexamples_snip.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/app.ico b/snippets/visualbasic/System.Windows/Vector/Overview/app.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/app.ico
rename to snippets/visualbasic/System.Windows/Vector/Overview/app.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/app.xaml b/snippets/visualbasic/System.Windows/Vector/Overview/app.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/app.xaml
rename to snippets/visualbasic/System.Windows/Vector/Overview/app.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/app.xaml.vb b/snippets/visualbasic/System.Windows/Vector/Overview/app.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/app.xaml.vb
rename to snippets/visualbasic/System.Windows/Vector/Overview/app.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/milvectorsample.vbproj b/snippets/visualbasic/System.Windows/Vector/Overview/milvectorsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/milvectorsample.vbproj
rename to snippets/visualbasic/System.Windows/Vector/Overview/milvectorsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Vector/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Vector/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/Vector/Overview/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/Vector/Overview/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/Vector/Overview/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/Vector/Overview/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/application.xaml b/snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/application.xaml
rename to snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/application.xaml.vb b/snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/application.xaml.vb
rename to snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/vsmgotoelementstate.vbproj b/snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/vsmgotoelementstate.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/vsmgotoelementstate.vbproj
rename to snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/vsmgotoelementstate.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/Close/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/Close/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/Close/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Close/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/Close/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/Close/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/Close/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Close/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/Close/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/Close/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Window/Close/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Window/Close/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/Close/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/Close/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Window/Close/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Window/Close/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/Close/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/Close/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/Close/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/Close/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/windowclosesnippets.vbproj b/snippets/visualbasic/System.Windows/Window/Close/windowclosesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/windowclosesnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/Close/windowclosesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/Closing/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/Closing/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/Closing/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Closing/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/datawindow.xaml b/snippets/visualbasic/System.Windows/Window/Closing/datawindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/datawindow.xaml
rename to snippets/visualbasic/System.Windows/Window/Closing/datawindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/datawindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/Closing/datawindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/datawindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Closing/datawindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/Closing/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/Closing/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Window/Closing/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Window/Closing/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/Closing/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/Closing/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Window/Closing/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Window/Closing/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/Closing/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/Closing/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/Closing/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/Closing/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/windowclosingsnippets.vbproj b/snippets/visualbasic/System.Windows/Window/Closing/windowclosingsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/windowclosingsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/Closing/windowclosingsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/DialogResult/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/DialogResult/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/DialogResult/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/DialogResult/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/dialogbox.xaml b/snippets/visualbasic/System.Windows/Window/DialogResult/dialogbox.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/dialogbox.xaml
rename to snippets/visualbasic/System.Windows/Window/DialogResult/dialogbox.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/dialogbox.xaml.vb b/snippets/visualbasic/System.Windows/Window/DialogResult/dialogbox.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/dialogbox.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/DialogResult/dialogbox.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/DialogResult/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/DialogResult/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/DialogResult/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/DialogResult/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/DialogResult/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/DialogResult/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Window/DialogResult/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Window/DialogResult/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/DialogResult/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/DialogResult/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Window/DialogResult/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Window/DialogResult/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/DialogResult/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/DialogResult/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/DialogResult/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/DialogResult/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/windowdialogresultsnippets.vbproj b/snippets/visualbasic/System.Windows/Window/DialogResult/windowdialogresultsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/windowdialogresultsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/DialogResult/windowdialogresultsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/DragMove/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/DragMove/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/DragMove/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/DragMove/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/DragMove/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/DragMove/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/DragMove/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/DragMove/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/DragMove/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/DragMove/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/DragMove/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/DragMove/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/resources.vb b/snippets/visualbasic/System.Windows/Window/DragMove/my project/resources.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/resources.vb
rename to snippets/visualbasic/System.Windows/Window/DragMove/my project/resources.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/DragMove/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/DragMove/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/settings.vb b/snippets/visualbasic/System.Windows/Window/DragMove/my project/settings.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/my project/settings.vb
rename to snippets/visualbasic/System.Windows/Window/DragMove/my project/settings.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/DragMove/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/DragMove/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/windowdragmovesnippets.vbproj b/snippets/visualbasic/System.Windows/Window/DragMove/windowdragmovesnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/windowdragmovesnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/DragMove/windowdragmovesnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/Icon/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/Icon/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/Icon/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/Icon/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/Icon/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Icon/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/systemicon.ico b/snippets/visualbasic/System.Windows/Window/Icon/systemicon.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/systemicon.ico
rename to snippets/visualbasic/System.Windows/Window/Icon/systemicon.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/windowiconsample.vbproj b/snippets/visualbasic/System.Windows/Window/Icon/windowiconsample.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/windowiconsample.vbproj
rename to snippets/visualbasic/System.Windows/Window/Icon/windowiconsample.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/wpficon1.ico b/snippets/visualbasic/System.Windows/Window/Icon/wpficon1.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/wpficon1.ico
rename to snippets/visualbasic/System.Windows/Window/Icon/wpficon1.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/wpficon2.ico b/snippets/visualbasic/System.Windows/Window/Icon/wpficon2.ico
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/wpficon2.ico
rename to snippets/visualbasic/System.Windows/Window/Icon/wpficon2.ico
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/Overview/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/Overview/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/Overview/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Overview/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/codeonlywindow.vb b/snippets/visualbasic/System.Windows/Window/Overview/codeonlywindow.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/codeonlywindow.vb
rename to snippets/visualbasic/System.Windows/Window/Overview/codeonlywindow.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/Overview/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/Overview/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/Overview/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Overview/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/markuponlywindow.xaml b/snippets/visualbasic/System.Windows/Window/Overview/markuponlywindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/markuponlywindow.xaml
rename to snippets/visualbasic/System.Windows/Window/Overview/markuponlywindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/Overview/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/Overview/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Window/Overview/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Window/Overview/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/Overview/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/Overview/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Window/Overview/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Window/Overview/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/Overview/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/Overview/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/Overview/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/Overview/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/windowsnippets.vbproj b/snippets/visualbasic/System.Windows/Window/Overview/windowsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/windowsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/Overview/windowsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/OwnedWindows/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/OwnedWindows/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/OwnedWindows/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/OwnedWindows/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/windowownerownedwindowssnippets.vbproj b/snippets/visualbasic/System.Windows/Window/OwnedWindows/windowownerownedwindowssnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/windowownerownedwindowssnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/OwnedWindows/windowownerownedwindowssnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/RestoreBounds/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/RestoreBounds/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/RestoreBounds/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/RestoreBounds/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/RestoreBounds/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/RestoreBounds/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/RestoreBounds/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/RestoreBounds/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/RestoreBounds/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/RestoreBounds/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/windowrestoreboundssnippets.vbproj b/snippets/visualbasic/System.Windows/Window/RestoreBounds/windowrestoreboundssnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/windowrestoreboundssnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/RestoreBounds/windowrestoreboundssnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/Show/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/Show/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/Show/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Show/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/Show/application1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/Show/application1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/Show/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/Show/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/Show/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Show/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/Show/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/Show/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Window/Show/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Window/Show/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/Show/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/Show/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Window/Show/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Window/Show/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/Show/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/Show/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/Show/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/Show/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/Show/snippets.50001.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/Show/snippets.50001.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/Window/Show/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/Window/Show/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/Window/Show/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/Show/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/windowshowsnippets.vbproj b/snippets/visualbasic/System.Windows/Window/Show/windowshowsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/windowshowsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/Show/windowshowsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/windowshowtimingsnippets.vbproj b/snippets/visualbasic/System.Windows/Window/Show/windowshowtimingsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/windowshowtimingsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/Show/windowshowtimingsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/ShowActivated/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/ShowActivated/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/awindow.xaml b/snippets/visualbasic/System.Windows/Window/ShowActivated/awindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/awindow.xaml
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/awindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/awindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/ShowActivated/awindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/awindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/awindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/ShowActivated/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Window/ShowActivated/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/ShowActivated/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Window/ShowActivated/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/ShowActivated/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/ShowActivated/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/window1.xaml b/snippets/visualbasic/System.Windows/Window/ShowActivated/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/window1.xaml
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/window1.xaml.vb b/snippets/visualbasic/System.Windows/Window/ShowActivated/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/window1.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/windowshowactivatedsnippets.vbproj b/snippets/visualbasic/System.Windows/Window/ShowActivated/windowshowactivatedsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/windowshowactivatedsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/ShowActivated/windowshowactivatedsnippets.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/application.xaml b/snippets/visualbasic/System.Windows/Window/ShowDialog/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/application.xaml
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/application.xaml.vb b/snippets/visualbasic/System.Windows/Window/ShowDialog/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/application.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/dialogbox.xaml b/snippets/visualbasic/System.Windows/Window/ShowDialog/dialogbox.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/dialogbox.xaml
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/dialogbox.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/dialogbox.xaml.vb b/snippets/visualbasic/System.Windows/Window/ShowDialog/dialogbox.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/dialogbox.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/dialogbox.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/mainwindow.xaml b/snippets/visualbasic/System.Windows/Window/ShowDialog/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/mainwindow.xaml
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/mainwindow.xaml.vb b/snippets/visualbasic/System.Windows/Window/ShowDialog/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/mainwindow.xaml.vb
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/assemblyinfo.vb b/snippets/visualbasic/System.Windows/Window/ShowDialog/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/my project/assemblyinfo.vb
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/resources.designer.vb b/snippets/visualbasic/System.Windows/Window/ShowDialog/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/resources.designer.vb
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/resources.resx b/snippets/visualbasic/System.Windows/Window/ShowDialog/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/resources.resx
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/settings.designer.vb b/snippets/visualbasic/System.Windows/Window/ShowDialog/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/my project/settings.designer.vb
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/settings.settings b/snippets/visualbasic/System.Windows/Window/ShowDialog/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/my project/settings.settings
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/snippets.5000.json b/snippets/visualbasic/System.Windows/Window/ShowDialog/snippets.5000.json
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/snippets.5000.json
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/snippets.5000.json
diff --git a/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/windowshowdialogsnippets.vbproj b/snippets/visualbasic/System.Windows/Window/ShowDialog/windowshowdialogsnippets.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/windowshowdialogsnippets.vbproj
rename to snippets/visualbasic/System.Windows/Window/ShowDialog/windowshowdialogsnippets.vbproj
diff --git a/xml/Microsoft.Win32/FileDialog.xml b/xml/Microsoft.Win32/FileDialog.xml
index 70c4372b0ca..670b9ddb224 100644
--- a/xml/Microsoft.Win32/FileDialog.xml
+++ b/xml/Microsoft.Win32/FileDialog.xml
@@ -270,7 +270,7 @@ Open and save file dialog boxes have a **Favorite Links** panel on the left side
  The following example shows how to create an <xref:Microsoft.Win32.OpenFileDialog> that contains a default file name and extension type.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/DefaultExt/Window1.xaml.cs" id="Snippetopenfiledialogboxcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/window1.xaml.vb" id="Snippetopenfiledialogboxcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/window1.xaml.vb" id="Snippetopenfiledialogboxcodebehind":::
 
  ]]></format>
         </remarks>
@@ -527,28 +527,28 @@ Open and save file dialog boxes have a **Favorite Links** panel on the left side
  The following examples demonstrate several types of filter strings that can be set by using the <xref:Microsoft.Win32.FileDialog.Filter%2A> property.
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/Filter/Window1.xaml.cs" id="Snippetfilterstring1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb" id="Snippetfilterstring1":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb" id="Snippetfilterstring1":::
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/Filter/Window1.xaml.cs" id="Snippetfilterstring2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb" id="Snippetfilterstring2":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb" id="Snippetfilterstring2":::
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/Filter/Window1.xaml.cs" id="Snippetfilterstring3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb" id="Snippetfilterstring3":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb" id="Snippetfilterstring3":::
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/Filter/Window1.xaml.cs" id="Snippetfilterstring4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb" id="Snippetfilterstring4":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb" id="Snippetfilterstring4":::
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/Filter/Window1.xaml.cs" id="Snippetfilterstring5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb" id="Snippetfilterstring5":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb" id="Snippetfilterstring5":::
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/Filter/Window1.xaml.cs" id="Snippetfilterstring6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb" id="Snippetfilterstring6":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb" id="Snippetfilterstring6":::
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/Filter/Window1.xaml.cs" id="Snippetfilterstring7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb" id="Snippetfilterstring7":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb" id="Snippetfilterstring7":::
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/Filter/Window1.xaml.cs" id="Snippetfilterstring8":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FileDialogFilterSnippets/visualbasic/window1.xaml.vb" id="Snippetfilterstring8":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/Filter/window1.xaml.vb" id="Snippetfilterstring8":::
 
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.Win32/OpenFileDialog.xml b/xml/Microsoft.Win32/OpenFileDialog.xml
index 498ea9c90bd..c2912af12c5 100644
--- a/xml/Microsoft.Win32/OpenFileDialog.xml
+++ b/xml/Microsoft.Win32/OpenFileDialog.xml
@@ -32,7 +32,7 @@ You cannot declare this managed class in XAML.
  The following example shows how to create an <xref:Microsoft.Win32.OpenFileDialog> that contains a default file name and extension type.
 
  :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/DefaultExt/Window1.xaml.cs" id="Snippetopenfiledialogboxcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/window1.xaml.vb" id="Snippetopenfiledialogboxcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/window1.xaml.vb" id="Snippetopenfiledialogboxcodebehind":::
 
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.Win32/SaveFileDialog.xml b/xml/Microsoft.Win32/SaveFileDialog.xml
index 952673a52e4..c2bfc809bf0 100644
--- a/xml/Microsoft.Win32/SaveFileDialog.xml
+++ b/xml/Microsoft.Win32/SaveFileDialog.xml
@@ -34,7 +34,7 @@ You cannot declare this managed class in XAML.
 The following example demonstrates how to create a <xref:Microsoft.Win32.SaveFileDialog> and process the result.
 
 :::code language="csharp" source="~/snippets/csharp/Microsoft.Win32/FileDialog/DefaultExt/Window1.xaml.cs" id="Snippetsavefiledialogboxcodebehind":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DialogBoxesOverviewSnippets/VisualBasic/window1.xaml.vb" id="Snippetsavefiledialogboxcodebehind":::
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.Win32/FileDialog/DefaultExt/window1.xaml.vb" id="Snippetsavefiledialogboxcodebehind":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Collections.ObjectModel/ObservableCollection`1.xml b/xml/System.Collections.ObjectModel/ObservableCollection`1.xml
index 674e87101e0..5e19e81bcaf 100644
--- a/xml/System.Collections.ObjectModel/ObservableCollection`1.xml
+++ b/xml/System.Collections.ObjectModel/ObservableCollection`1.xml
@@ -312,7 +312,7 @@
  The typical usage is to wrap an <xref:System.Collections.ObjectModel.ObservableCollection%601.OnCollectionChanged%2A> call within a `using` scope, as in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/DataSource.cs" id="Snippetblockreentrancy":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/datasource.vb" id="Snippetblockreentrancy":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/datasource.vb" id="Snippetblockreentrancy":::
 
  ]]></format>
         </remarks>
@@ -730,7 +730,7 @@
  When overriding this method, either call the base implementation or use the <xref:System.Collections.ObjectModel.ObservableCollection%601.BlockReentrancy%2A> method to handle reentrant collection changes, as in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/DataSource.cs" id="Snippetblockreentrancy":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ObservableCollection_snip/visualbasic/datasource.vb" id="Snippetblockreentrancy":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Collections.ObjectModel/ObservableCollectionT/BlockReentrancy/datasource.vb" id="Snippetblockreentrancy":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Collections/BitArray.xml b/xml/System.Collections/BitArray.xml
index 8290a60923c..0fed1ac6dd1 100644
--- a/xml/System.Collections/BitArray.xml
+++ b/xml/System.Collections/BitArray.xml
@@ -615,8 +615,6 @@
 ## Remarks
  The specified array must be of a compatible type. Only `bool`, `int`, and `byte` types of arrays are supported.
 
- This method uses <xref:System.Array.Copy%2A?displayProperty=nameWithType> to copy the elements.
-
  This method is an `O(n)` operation, where `n` is <xref:System.Collections.BitArray.Count%2A>.
 
 
diff --git a/xml/System.ComponentModel/IEditableCollectionView.xml b/xml/System.ComponentModel/IEditableCollectionView.xml
index 3937ef965dd..46b452f9c38 100644
--- a/xml/System.ComponentModel/IEditableCollectionView.xml
+++ b/xml/System.ComponentModel/IEditableCollectionView.xml
@@ -34,7 +34,7 @@
  The following example shows how to add an item to a collection by using methods that are defined by <xref:System.ComponentModel.IEditableCollectionView>.  This application displays a list of items for sale and gives the user the option of adding, editing, or removing an item.  When the user adds or edits an item, a form prompts the user to enter a new item.  If the user submits the form, the item is committed to the collection.  If the user cancels the form, the item is discarded. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetadditem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetadditem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetadditem":::
 
  ]]></format>
     </remarks>
@@ -78,7 +78,7 @@
  The following example creates a <xref:System.Windows.Window> that prompts the user to add a new item.  Then it calls <xref:System.ComponentModel.IEditableCollectionView.AddNew%2A> to create a new object and sets the <xref:System.Windows.FrameworkElement.DataContext%2A> of the <xref:System.Windows.Window> to that object. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetadditem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetadditem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetadditem":::
 
  ]]></format>
         </remarks>
@@ -126,7 +126,7 @@
  The following example checks whether an item can be added to the collection.  If <xref:System.ComponentModel.IEditableCollectionView.CanAddNew%2A> is `false`, the example tells the user that an item cannot be added.  Otherwise, it shows a form that prompts the user to add a new item. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections) .
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetadditem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetadditem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetadditem":::
 
  ]]></format>
         </remarks>
@@ -170,7 +170,7 @@
  The following example gets <xref:System.ComponentModel.IEditableCollectionView.CanCancelEdit%2A> to check whether the original values of the edited item can be restored before it calls <xref:System.ComponentModel.IEditableCollectionView.CancelEdit%2A>.  If the values cannot be restored, you must supply additional logic to do so.  If they can be, the values are restored when the example calls <xref:System.ComponentModel.IEditableCollectionView.CancelEdit%2A>.   For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetcanceledit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetcanceledit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetcanceledit":::
 
  ]]></format>
         </remarks>
@@ -213,7 +213,7 @@
  The following example gets <xref:System.ComponentModel.IEditableCollectionView.CanCancelEdit%2A> to check whether the original values of the edited item can be restored before it calls <xref:System.ComponentModel.IEditableCollectionView.CancelEdit%2A>.  If the values cannot be restored, you must supply additional logic to do so.  If they can be, the values are restored when the example calls <xref:System.ComponentModel.IEditableCollectionView.CancelEdit%2A>. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetcanceledit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetcanceledit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetcanceledit":::
 
  ]]></format>
         </remarks>
@@ -251,7 +251,7 @@
  The following example displays a form that prompts the user to add a new item.  If the user submits the form, the example calls <xref:System.ComponentModel.IEditableCollectionView.CommitNew%2A> to add the item to the collection.  If the user cancels the form, the example calls <xref:System.ComponentModel.IEditableCollectionView.CancelNew%2A> to discard the item. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetadditem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetadditem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetadditem":::
 
  ]]></format>
         </remarks>
@@ -295,7 +295,7 @@
  The following example calls <xref:System.ComponentModel.IEditableCollectionView.CanRemove%2A> to check whether an item can be removed from the collection.  If an item can be removed, the example prompts the user to confirm the action and calls <xref:System.ComponentModel.IEditableCollectionView.Remove%2A> if the user clicks **Yes**. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetremoveitem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetremoveitem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetremoveitem":::
 
  ]]></format>
         </remarks>
@@ -333,7 +333,7 @@
  The following example creates a form that prompts the user to edit an existing item.  If the user submits the form, the example calls <xref:System.ComponentModel.IEditableCollectionView.CommitEdit%2A> to save the changes to the collection.  If the user cancels the form, the example calls <xref:System.ComponentModel.IEditableCollectionView.CancelEdit%2A> to discard the changes. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetedititem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetedititem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetedititem":::
 
  ]]></format>
         </remarks>
@@ -376,7 +376,7 @@
  The following example displays a form that prompts the user to add a new item.  If the user submits the form, the example calls <xref:System.ComponentModel.IEditableCollectionView.CommitNew%2A> to add the item to the collection.  If the user cancels the form, the example calls <xref:System.ComponentModel.IEditableCollectionView.CancelNew%2A> to discard the item. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetadditem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetadditem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetadditem":::
 
  ]]></format>
         </remarks>
@@ -473,7 +473,7 @@
  The following example creates a form that prompts the user to edit an existing item.  If the user submits the form, the changes are committed to the collection.  If the user cancels the form, the changes are discarded. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections) .
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetedititem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetedititem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetedititem":::
 
  ]]></format>
         </remarks>
@@ -619,7 +619,7 @@
  The following example calls <xref:System.ComponentModel.IEditableCollectionView.CanRemove%2A> to check whether an item can be removed from the collection.  If an item can be removed, the example prompts the user to confirm the action and calls <xref:System.ComponentModel.IEditableCollectionView.Remove%2A> if the user clicks **Yes**. For the entire sample, see [Changing a Collection by Using IEditableCollectionView Sample](https://github.com/Microsoft/WPF-Samples/tree/master/Data%20Binding/EditingCollections).
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionView/Overview/Window1.xaml.cs" id="Snippetremoveitem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EditingCollectionsSnippets/visualbasic/window1.xaml.vb" id="Snippetremoveitem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionView/Overview/window1.xaml.vb" id="Snippetremoveitem":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ComponentModel/IEditableCollectionViewAddNewItem.xml b/xml/System.ComponentModel/IEditableCollectionViewAddNewItem.xml
index c4241c56f49..25ce8a8c1a2 100644
--- a/xml/System.ComponentModel/IEditableCollectionViewAddNewItem.xml
+++ b/xml/System.ComponentModel/IEditableCollectionViewAddNewItem.xml
@@ -43,7 +43,7 @@
  The following example enables a user to add various types of items to a collection. The user can enter a new item and submit the entry or cancel the transaction. The example gets an <xref:System.ComponentModel.IEditableCollectionViewAddNewItem> from the <xref:System.Windows.Controls.ItemsControl.Items%2A> property of a <xref:System.Windows.Controls.ListBox> and creates an object, whose type is determined by the user. Then the example calls the <xref:System.ComponentModel.IEditableCollectionViewAddNewItem.AddNewItem%2A> method to add the object to the collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/window1.xaml.cs" id="Snippetmainwindowlogic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/window1.xaml.vb" id="Snippetmainwindowlogic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/window1.xaml.vb" id="Snippetmainwindowlogic":::
 
  The following example creates the user interface for the previous example.
 
@@ -56,12 +56,12 @@
  The following example shows the logic for the `AddItemWindow`.
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/additem.xaml.cs" id="Snippetadditemlogic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/additemwindow.xaml.vb" id="Snippetadditemlogic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/additemwindow.xaml.vb" id="Snippetadditemlogic":::
 
  The following example shows the data types and collection that is used in the previous examples.
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/data.cs" id="Snippetdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/data.vb" id="Snippetdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/data.vb" id="Snippetdata":::
 
  ]]></format>
     </remarks>
@@ -109,7 +109,7 @@
  The following example calls the <xref:System.ComponentModel.IEditableCollectionViewAddNewItem.AddNewItem%2A> method to add an object to a collection. For the complete example, see the <xref:System.ComponentModel.IEditableCollectionViewAddNewItem> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/window1.xaml.cs" id="Snippetmainwindowlogic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ieditablecollectionviewadditemexample/visualbasic/window1.xaml.vb" id="Snippetmainwindowlogic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.ComponentModel/IEditableCollectionViewAddNewItem/Overview/window1.xaml.vb" id="Snippetmainwindowlogic":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO.Packaging/EncryptedPackageEnvelope.xml b/xml/System.IO.Packaging/EncryptedPackageEnvelope.xml
index 0a4e0f574c7..4b6650fba4f 100644
--- a/xml/System.IO.Packaging/EncryptedPackageEnvelope.xml
+++ b/xml/System.IO.Packaging/EncryptedPackageEnvelope.xml
@@ -74,7 +74,7 @@
  The following example shows how to use this method to close an <xref:System.IO.Packaging.EncryptedPackageEnvelope>.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
 
  ]]></format>
         </remarks>
@@ -201,7 +201,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.EncryptedPackageEnvelope.CreateFromPackage%2A> method to instantiate an <xref:System.IO.Packaging.EncryptedPackageEnvelope>.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
 
  ]]></format>
         </remarks>
@@ -255,7 +255,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.EncryptedPackageEnvelope.CreateFromPackage%2A> method to instantiate an <xref:System.IO.Packaging.EncryptedPackageEnvelope>.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
 
  ]]></format>
         </remarks>
@@ -315,7 +315,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.EncryptedPackageEnvelope.CreateFromPackage%2A> method to instantiate an <xref:System.IO.Packaging.EncryptedPackageEnvelope>.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
 
  ]]></format>
         </remarks>
@@ -587,7 +587,7 @@
  The following example shows how to use this method to test for encryption.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
 
  ]]></format>
         </remarks>
@@ -853,7 +853,7 @@
  The following example shows how to obtain <xref:System.IO.Packaging.RightsManagementInformation> for an encrypted package by use the <xref:System.IO.Packaging.EncryptedPackageEnvelope.RightsManagementInformation%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO.Packaging/PackUriHelper.xml b/xml/System.IO.Packaging/PackUriHelper.xml
index 672815a04b7..21eb8762328 100644
--- a/xml/System.IO.Packaging/PackUriHelper.xml
+++ b/xml/System.IO.Packaging/PackUriHelper.xml
@@ -289,7 +289,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.PackUriHelper.Create%2A> method to define a pack URI that references a package.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubgetfixdoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubgetfixdoc":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubgetfixdoc":::
 
  ]]></format>
         </remarks>
@@ -380,7 +380,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.PackUriHelper.Create%28System.Uri%29> method to define a pack URI that references a package.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubgetfixdoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubgetfixdoc":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubgetfixdoc":::
 
  ]]></format>
         </remarks>
@@ -483,7 +483,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.PackUriHelper.Create%28System.Uri%29> method to define a pack URI that references a package.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubgetfixdoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubgetfixdoc":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubgetfixdoc":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO.Packaging/PackageStore.xml b/xml/System.IO.Packaging/PackageStore.xml
index 0e7e28507f6..00de86d7873 100644
--- a/xml/System.IO.Packaging/PackageStore.xml
+++ b/xml/System.IO.Packaging/PackageStore.xml
@@ -103,7 +103,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.PackageStore.AddPackage%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewdecrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewdecrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewdecrypt":::
 
  ]]></format>
         </remarks>
@@ -158,7 +158,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.PackageStore.GetPackage%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewopendoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewopendoc":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewopendoc":::
 
  ]]></format>
         </remarks>
@@ -211,7 +211,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.PackageStore.RemovePackage%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewclosedoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewclosedoc":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewclosedoc":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.IO.Packaging/RightsManagementInformation.xml b/xml/System.IO.Packaging/RightsManagementInformation.xml
index a18cddb0245..43fbc90b5b7 100644
--- a/xml/System.IO.Packaging/RightsManagementInformation.xml
+++ b/xml/System.IO.Packaging/RightsManagementInformation.xml
@@ -34,12 +34,12 @@
  The following example shows how to initialize a <xref:System.IO.Packaging.RightsManagementInformation> object for encryption.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
   
  The following example shows how to initialize a <xref:System.IO.Packaging.RightsManagementInformation> object for decryption.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewopenpkg":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewopenpkg":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewopenpkg":::  
   
  ]]></format>
     </remarks>
@@ -78,12 +78,12 @@
  The following example shows how to set the <xref:System.IO.Packaging.RightsManagementInformation.CryptoProvider%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewbind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewbind":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewbind":::  
   
  The following example shows how to access the <xref:System.IO.Packaging.RightsManagementInformation.CryptoProvider%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewdecrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewdecrypt":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewdecrypt":::  
   
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.RightsManagementInformation.LoadPublishLicense%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewopenpkg":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewopenpkg":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewopenpkg":::  
   
  ]]></format>
         </remarks>
@@ -239,7 +239,7 @@
  The following example shows how to use the <xref:System.IO.Packaging.RightsManagementInformation.LoadUseLicense%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewopenpkg":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewopenpkg":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewopenpkg":::  
   
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
  The following example shows how to use of the <xref:System.IO.Packaging.RightsManagementInformation.SaveUseLicense%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Printing/LocalPrintServer.xml b/xml/System.Printing/LocalPrintServer.xml
index 9710d088cde..0fff7f8bdd5 100644
--- a/xml/System.Printing/LocalPrintServer.xml
+++ b/xml/System.Printing/LocalPrintServer.xml
@@ -42,7 +42,7 @@
  The following example shows how to create an instance of the <xref:System.Printing.LocalPrintServer> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetprintqueuesnip":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetprintqueuesnip":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetprintqueuesnip":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Printing/OutputColor.xml b/xml/System.Printing/OutputColor.xml
index 869ce9d25f9..0ee11144c09 100644
--- a/xml/System.Printing/OutputColor.xml
+++ b/xml/System.Printing/OutputColor.xml
@@ -43,7 +43,7 @@
  The following example shows how to use this enumeration to set <xref:System.Printing.PrintTicket> values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetoutputcolorandpageorientation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetoutputcolorandpageorientation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetoutputcolorandpageorientation":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Printing/PageMediaSize.xml b/xml/System.Printing/PageMediaSize.xml
index 5c512ff995d..8281c6d60e2 100644
--- a/xml/System.Printing/PageMediaSize.xml
+++ b/xml/System.Printing/PageMediaSize.xml
@@ -39,7 +39,7 @@
  The following example shows how to use this class to scale a visual element to fit within the margins of the paper on which it is to print.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetpagemediasize":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetpagemediasize":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetpagemediasize":::  
   
  ]]></format>
     </remarks>
@@ -182,7 +182,7 @@
  The following example shows how to use this class to scale a visual element to fit within the margins of the paper on which it is to print.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetpagemediasize":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetpagemediasize":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetpagemediasize":::  
   
  ]]></format>
         </remarks>
@@ -298,7 +298,7 @@
  The following example shows how to use this class to scale a visual element to fit within the margins of the paper on which it is to print.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetpagemediasize":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetpagemediasize":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetpagemediasize":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Printing/PageOrientation.xml b/xml/System.Printing/PageOrientation.xml
index 711e8de3c96..822f8ad364c 100644
--- a/xml/System.Printing/PageOrientation.xml
+++ b/xml/System.Printing/PageOrientation.xml
@@ -43,7 +43,7 @@
  The following example shows how to use this enumeration to set <xref:System.Printing.PrintTicket> values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetoutputcolorandpageorientation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetoutputcolorandpageorientation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetoutputcolorandpageorientation":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Printing/PrintQueue.xml b/xml/System.Printing/PrintQueue.xml
index e01839c1c46..91d263d41d5 100644
--- a/xml/System.Printing/PrintQueue.xml
+++ b/xml/System.Printing/PrintQueue.xml
@@ -984,7 +984,7 @@
  The following example shows how to use this method to create an <xref:System.Windows.Xps.XpsDocumentWriter>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetprintqueuesnip":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetprintqueuesnip":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetprintqueuesnip":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Printing/PrintTicket.xml b/xml/System.Printing/PrintTicket.xml
index 87006152e7f..c8b7cfb08ce 100644
--- a/xml/System.Printing/PrintTicket.xml
+++ b/xml/System.Printing/PrintTicket.xml
@@ -481,7 +481,7 @@
  The following example shows how to use this property to configure a print job.
 
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetoutputcolorandpageorientation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetoutputcolorandpageorientation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetoutputcolorandpageorientation":::
 
  ]]></format>
         </remarks>
@@ -607,7 +607,7 @@
  The following example shows how to use this property to scale a visual element to fit within the margins of the paper on which it is to print.
 
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetpagemediasize":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetpagemediasize":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetpagemediasize":::
 
  ]]></format>
         </remarks>
@@ -743,7 +743,7 @@
  The following example shows how to use this property to configure a print job.
 
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetoutputcolorandpageorientation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetoutputcolorandpageorientation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetoutputcolorandpageorientation":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.RightsManagement/AuthenticationType.xml b/xml/System.Security.RightsManagement/AuthenticationType.xml
index b1bb4b7c417..b8a6c89088e 100644
--- a/xml/System.Security.RightsManagement/AuthenticationType.xml
+++ b/xml/System.Security.RightsManagement/AuthenticationType.xml
@@ -35,7 +35,7 @@
  The following example also shows use of the <xref:System.Security.RightsManagement.AuthenticationType> enumeration.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.RightsManagement/ContentUser.xml b/xml/System.Security.RightsManagement/ContentUser.xml
index f71cb442b13..ba1c0b5b982 100644
--- a/xml/System.Security.RightsManagement/ContentUser.xml
+++ b/xml/System.Security.RightsManagement/ContentUser.xml
@@ -40,7 +40,7 @@
  The following example shows how to use <xref:System.Security.RightsManagement.UnsignedPublishLicense.Owner%2A> property to assign a variable of this type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubunpublic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubunpublic":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubunpublic":::  
   
  ]]></format>
     </remarks>
@@ -85,7 +85,7 @@
  The following example shows how to use this constructor to create a secure environment.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.RightsManagement/CryptoProvider.xml b/xml/System.Security.RightsManagement/CryptoProvider.xml
index 92de75adf0b..e6df14498e4 100644
--- a/xml/System.Security.RightsManagement/CryptoProvider.xml
+++ b/xml/System.Security.RightsManagement/CryptoProvider.xml
@@ -46,7 +46,7 @@
  The following example shows how to use the <xref:System.Security.RightsManagement.CryptoProvider> class to create an <xref:System.IO.Packaging.EncryptedPackageEnvelope>.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
 
  ]]></format>
     </remarks>
@@ -97,7 +97,7 @@
  The following example shows how to use the <xref:System.Security.RightsManagement.CryptoProvider.BlockSize%2A> property in converting clear-text data to encrypted-text data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.RightsManagement/CryptoProvider/BlockSize/Window1.xaml.cs" id="Snippetrmcontpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/window1.xaml.vb" id="Snippetrmcontpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/window1.xaml.vb" id="Snippetrmcontpubencrypt":::
 
  ]]></format>
         </remarks>
@@ -135,7 +135,7 @@
  The following example shows how to use the <xref:System.Security.RightsManagement.CryptoProvider.BoundGrants%2A> property to obtain a list rights granted through a <xref:System.Security.RightsManagement.UseLicense>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.RightsManagement/CryptoProvider/BoundGrants/Window1.xaml.cs" id="Snippetrmcontviewuselicense":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/window1.xaml.vb" id="Snippetrmcontviewuselicense":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/window1.xaml.vb" id="Snippetrmcontviewuselicense":::
 
  ]]></format>
         </remarks>
@@ -179,7 +179,7 @@
  The following example shows how to use the <xref:System.Security.RightsManagement.CryptoProvider.CanDecrypt%2A> property to determine if decryption is allowed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.RightsManagement/CryptoProvider/BoundGrants/Window1.xaml.cs" id="Snippetrmcontviewuselicense":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/window1.xaml.vb" id="Snippetrmcontviewuselicense":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/window1.xaml.vb" id="Snippetrmcontviewuselicense":::
 
  ]]></format>
         </remarks>
@@ -301,7 +301,7 @@
  The following example shows how to use the <xref:System.Security.RightsManagement.CryptoProvider.Decrypt%2A> method to convert encrypted data to unencrypted data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.RightsManagement/CryptoProvider/BoundGrants/Window1.xaml.cs" id="Snippetrmcontviewdecrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentViewer/visualbasic/window1.xaml.vb" id="Snippetrmcontviewdecrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BoundGrants/window1.xaml.vb" id="Snippetrmcontviewdecrypt":::
 
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@
  The following example shows how to use the <xref:System.Security.RightsManagement.CryptoProvider.Encrypt%2A> method to convert clear-text data to encrypted-text data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.RightsManagement/CryptoProvider/BlockSize/Window1.xaml.cs" id="Snippetrmcontpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedContentPublish/visualbasic/window1.xaml.vb" id="Snippetrmcontpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.RightsManagement/CryptoProvider/BlockSize/window1.xaml.vb" id="Snippetrmcontpubencrypt":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.RightsManagement/PublishLicense.xml b/xml/System.Security.RightsManagement/PublishLicense.xml
index e8c03d48d4f..ddbb15437f1 100644
--- a/xml/System.Security.RightsManagement/PublishLicense.xml
+++ b/xml/System.Security.RightsManagement/PublishLicense.xml
@@ -44,7 +44,7 @@
  The following example shows how to initialize a <xref:System.Security.RightsManagement.PublishLicense> by using the <xref:System.Security.RightsManagement.UnsignedPublishLicense.Sign%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.RightsManagement/RightsManagementException.xml b/xml/System.Security.RightsManagement/RightsManagementException.xml
index 31183423b18..75b0331442d 100644
--- a/xml/System.Security.RightsManagement/RightsManagementException.xml
+++ b/xml/System.Security.RightsManagement/RightsManagementException.xml
@@ -36,7 +36,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
     </remarks>
@@ -57,7 +57,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
@@ -91,7 +91,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
@@ -129,7 +129,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException.FailureCode%2A> property to create an error message for the user.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
@@ -173,7 +173,7 @@
  The following example shows use of the <xref:System.Exception.Message%2A> property to create an error message for the user.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
@@ -244,7 +244,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException.FailureCode%2A> and <xref:System.Exception.Message%2A> properties to create an error message for the user.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
@@ -290,7 +290,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException.FailureCode%2A> and <xref:System.Exception.Message%2A> properties to create an error message for the user.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
@@ -336,7 +336,7 @@
  The following example shows use of the <xref:System.Exception.Message%2A> property to create an error message for the user.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
@@ -384,7 +384,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException.FailureCode%2A> and <xref:System.Exception.Message%2A> properties to create an error message for the user.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
@@ -428,7 +428,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException.FailureCode%2A> and <xref:System.Exception.Message%2A> properties to create an error message for the user.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.RightsManagement/RightsManagementFailureCode.xml b/xml/System.Security.RightsManagement/RightsManagementFailureCode.xml
index 6e6eda223b1..98b5d9883ee 100644
--- a/xml/System.Security.RightsManagement/RightsManagementFailureCode.xml
+++ b/xml/System.Security.RightsManagement/RightsManagementFailureCode.xml
@@ -28,7 +28,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.RightsManagementException.FailureCode%2A> and <xref:System.Exception.Message%2A> properties to create an error message for the user.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgbldsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgbldsecenv":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Security.RightsManagement/SecureEnvironment.xml b/xml/System.Security.RightsManagement/SecureEnvironment.xml
index e511709eb68..55d0aa56476 100644
--- a/xml/System.Security.RightsManagement/SecureEnvironment.xml
+++ b/xml/System.Security.RightsManagement/SecureEnvironment.xml
@@ -44,7 +44,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.SecureEnvironment> class
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
 
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.SecureEnvironment.ApplicationManifest%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
 
  ]]></format>
         </remarks>
@@ -103,7 +103,7 @@
  The following example shows how to use this method to create a secure environment.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
 
  ]]></format>
         </remarks>
@@ -152,7 +152,7 @@
  The following example shows how to use this method to create a secure environment.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
 
  ]]></format>
         </remarks>
@@ -208,7 +208,7 @@
  The following example shows how to use this method to create a secure environment.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
 
  ]]></format>
         </remarks>
@@ -377,7 +377,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.SecureEnvironment.IsUserActivated%2A> method to determine if given user has been authorized to access rights managed content.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::
 
  ]]></format>
         </remarks>
@@ -455,7 +455,7 @@
  The following example shows use of the <xref:System.Security.RightsManagement.SecureEnvironment.User%2A> property
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/PackageStore/AddPackage/Window1.xaml.cs" id="Snippetrmpkgviewsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackageViewer/visualbasic/window1.xaml.vb" id="Snippetrmpkgviewsecenv":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/PackageStore/AddPackage/window1.xaml.vb" id="Snippetrmpkgviewsecenv":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.RightsManagement/UnsignedPublishLicense.xml b/xml/System.Security.RightsManagement/UnsignedPublishLicense.xml
index 717bee6ef79..af3a30c6ea7 100644
--- a/xml/System.Security.RightsManagement/UnsignedPublishLicense.xml
+++ b/xml/System.Security.RightsManagement/UnsignedPublishLicense.xml
@@ -116,7 +116,7 @@
  The `publishLicenseTemplate` XrML `<RANGETIME>` or `<INTERVALTIME>` elements are ignored when the <xref:System.Security.RightsManagement.UnsignedPublishLicense> is created by the <xref:System.Security.RightsManagement.UnsignedPublishLicense.%23ctor%2A>(String) constructor.  To specify these values for the publish license, the <xref:System.Security.RightsManagement.ContentGrant> properties for <xref:System.Security.RightsManagement.ContentGrant.ValidFrom%2A> and <xref:System.Security.RightsManagement.ContentGrant.ValidUntil%2A> must be explicitly set.  The following example shows how to explicitly set the <xref:System.Security.RightsManagement.ContentGrant.ValidFrom%2A> and <xref:System.Security.RightsManagement.ContentGrant.ValidUntil%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/Window1.xaml.cs" id="Snippetrmpkgpubgrants":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/UnsignedPubLicense_snip/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubgrants":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Security.RightsManagement/UnsignedPublishLicense/.ctor/window1.xaml.vb" id="Snippetrmpkgpubgrants":::
 
 
 
@@ -124,7 +124,7 @@
  The following example shows how to use this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubunpublic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubunpublic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubunpublic":::
 
  ]]></format>
         </remarks>
@@ -260,7 +260,7 @@
  The following example shows how to use this property to assign a <xref:System.Security.RightsManagement.ContentUser>.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubunpublic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubunpublic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubunpublic":::
 
  ]]></format>
         </remarks>
@@ -366,7 +366,7 @@
  The following example shows how to use this class to initialize a <xref:System.Security.RightsManagement.PublishLicense>.
 
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.RightsManagement/UseLicense.xml b/xml/System.Security.RightsManagement/UseLicense.xml
index 2a37954c53a..3265e335542 100644
--- a/xml/System.Security.RightsManagement/UseLicense.xml
+++ b/xml/System.Security.RightsManagement/UseLicense.xml
@@ -40,7 +40,7 @@
  The following example shows how to use this class to initialize a <xref:System.Security.RightsManagement.PublishLicense>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
   
  ]]></format>
     </remarks>
@@ -158,7 +158,7 @@
  The following example shows how to use this method to initialize a <xref:System.Security.RightsManagement.CryptoProvider>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubencrypt":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubencrypt":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Security.RightsManagement/UserActivationMode.xml b/xml/System.Security.RightsManagement/UserActivationMode.xml
index ccc0bc26695..cb899b31f1e 100644
--- a/xml/System.Security.RightsManagement/UserActivationMode.xml
+++ b/xml/System.Security.RightsManagement/UserActivationMode.xml
@@ -33,7 +33,7 @@
  The following example shows how to use this enumeration to create a <xref:System.Security.RightsManagement.SecureEnvironment>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.IO.Packaging/EncryptedPackageEnvelope/Close/Window1.xaml.cs" id="Snippetrmpkgpubsecenv":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RightsManagedPackagePublish/visualbasic/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.IO.Packaging/EncryptedPackageEnvelope/Close/window1.xaml.vb" id="Snippetrmpkgpubsecenv":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Annotations.Storage/AnnotationStore.xml b/xml/System.Windows.Annotations.Storage/AnnotationStore.xml
index e0a15b4c089..2ce499ffc38 100644
--- a/xml/System.Windows.Annotations.Storage/AnnotationStore.xml
+++ b/xml/System.Windows.Annotations.Storage/AnnotationStore.xml
@@ -485,7 +485,7 @@
  The following example shows how to use the <xref:System.Windows.Annotations.Storage.AnnotationStore.Flush%2A> method when the application closes the <xref:System.Windows.Annotations.AnnotationService>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/AnnotationsHelperXps.cs" id="Snippetstopannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/annotationshelperxps.vb" id="Snippetstopannotations":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/annotationshelperxps.vb" id="Snippetstopannotations":::
 
  The following example shows use of the <xref:System.Windows.Annotations.Storage.AnnotationStore.DeleteAnnotation%2A> and <xref:System.Windows.Annotations.Storage.AnnotationStore.Flush%2A> methods.
 
diff --git a/xml/System.Windows.Annotations.Storage/XmlStreamStore.xml b/xml/System.Windows.Annotations.Storage/XmlStreamStore.xml
index 4a669e556f3..ae7b54cac75 100644
--- a/xml/System.Windows.Annotations.Storage/XmlStreamStore.xml
+++ b/xml/System.Windows.Annotations.Storage/XmlStreamStore.xml
@@ -306,7 +306,7 @@
  The following example shows how to use the <xref:System.Windows.Annotations.Storage.XmlStreamStore.Flush%2A> method when the application closes the <xref:System.Windows.Annotations.AnnotationService>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/AnnotationsHelperXps.cs" id="Snippetstopannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/annotationshelperxps.vb" id="Snippetstopannotations":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/annotationshelperxps.vb" id="Snippetstopannotations":::
 
  The following example shows use of the <xref:System.Windows.Annotations.Storage.XmlStreamStore.DeleteAnnotation%2A> and <xref:System.Windows.Annotations.Storage.XmlStreamStore.Flush%2A> methods.
 
diff --git a/xml/System.Windows.Annotations/AnnotationDocumentPaginator.xml b/xml/System.Windows.Annotations/AnnotationDocumentPaginator.xml
index a3876f0a246..e4ef4724661 100644
--- a/xml/System.Windows.Annotations/AnnotationDocumentPaginator.xml
+++ b/xml/System.Windows.Annotations/AnnotationDocumentPaginator.xml
@@ -34,10 +34,10 @@
  The following example shows use of the <xref:System.Windows.Annotations.AnnotationDocumentPaginator> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/Window1.xaml.cs" id="Snippetdocviewannxpsprint":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/window1.xaml.vb" id="Snippetdocviewannxpsprint":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/window1.xaml.vb" id="Snippetdocviewannxpsprint":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/AnnotationsHelperXps.cs" id="Snippetdocviewannxpsdocpaginator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/annotationshelperxps.vb" id="Snippetdocviewannxpsdocpaginator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/annotationshelperxps.vb" id="Snippetdocviewannxpsdocpaginator":::  
   
  ]]></format>
     </remarks>
@@ -146,10 +146,10 @@
  The following example shows use of the <xref:System.Windows.Annotations.AnnotationDocumentPaginator.%23ctor%2A> constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/Window1.xaml.cs" id="Snippetdocviewannxpsprint":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/window1.xaml.vb" id="Snippetdocviewannxpsprint":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/window1.xaml.vb" id="Snippetdocviewannxpsprint":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/AnnotationsHelperXps.cs" id="Snippetdocviewannxpsdocpaginator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXps/visualbasic/annotationshelperxps.vb" id="Snippetdocviewannxpsdocpaginator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationDocumentPaginator/Overview/annotationshelperxps.vb" id="Snippetdocviewannxpsdocpaginator":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Annotations/AnnotationHelper.xml b/xml/System.Windows.Annotations/AnnotationHelper.xml
index 078ebbd1a40..fe749e8ef43 100644
--- a/xml/System.Windows.Annotations/AnnotationHelper.xml
+++ b/xml/System.Windows.Annotations/AnnotationHelper.xml
@@ -378,7 +378,7 @@
  The following example demonstrates how to implement the event handler of such a list box that serves as the comments pane.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/Window1.xaml.cs" id="Snippethandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml.vb" id="Snippethandler":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml.vb" id="Snippethandler":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Annotations/AnnotationService.xml b/xml/System.Windows.Annotations/AnnotationService.xml
index 7f74cd0d40d..aa6eed407e2 100644
--- a/xml/System.Windows.Annotations/AnnotationService.xml
+++ b/xml/System.Windows.Annotations/AnnotationService.xml
@@ -30,7 +30,7 @@
  The following example shows how to create and start an <xref:System.Windows.Annotations.AnnotationService>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstartannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
   
  ]]></format>
     </remarks>
@@ -65,7 +65,7 @@
  The following example shows use of the <xref:System.Windows.Annotations.AnnotationService.%23ctor%2A> constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstartannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
   
  ]]></format>
         </remarks>
@@ -103,7 +103,7 @@
  The following example shows use of the <xref:System.Windows.Annotations.AnnotationService.%23ctor%2A> constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstartannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
   
  ]]></format>
         </remarks>
@@ -142,7 +142,7 @@
  The following example shows use of the <xref:System.Windows.Annotations.AnnotationService.%23ctor%2A> constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstartannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
   
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@
  The following example shows use of the <xref:System.Windows.Annotations.AnnotationService.%23ctor%2A> constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstartannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
   
  ]]></format>
         </remarks>
@@ -479,7 +479,7 @@
  The following example shows how to use the <xref:System.Windows.Annotations.AnnotationService.Disable%2A> method when you stop the <xref:System.Windows.Annotations.AnnotationService>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstopannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstopannotations":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstopannotations":::  
   
  ]]></format>
         </remarks>
@@ -527,7 +527,7 @@
  The following example shows how to use the <xref:System.Windows.Annotations.AnnotationService.Enable%2A> method when you start an <xref:System.Windows.Annotations.AnnotationService>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstartannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
   
  ]]></format>
         </remarks>
@@ -771,7 +771,7 @@
  The following example shows how to use the <xref:System.Windows.Annotations.AnnotationService.IsEnabled%2A> property when you create and start an <xref:System.Windows.Annotations.AnnotationService>.  Also if the user chooses to open a new document in the viewer control, the <xref:System.Windows.Annotations.AnnotationService> must be disabled for the old document and then enabled for the new document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstartannotations":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstartannotations":::  
   
  ]]></format>
         </remarks>
@@ -822,7 +822,7 @@
  The following example shows how to use the <xref:System.Windows.Annotations.AnnotationService.Store%2A> property when you start and stop an <xref:System.Windows.Annotations.AnnotationService>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationService/Overview/Window1.xaml.cs" id="Snippetdocviewxmlstartstopannotat":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocViewerAnnotationsXml/visualbasic/window1.xaml.vb" id="Snippetdocviewxmlstartstopannotat":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationService/Overview/window1.xaml.vb" id="Snippetdocviewxmlstartstopannotat":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Annotations/IAnchorInfo.xml b/xml/System.Windows.Annotations/IAnchorInfo.xml
index fd7dca700f8..03e2d23547a 100644
--- a/xml/System.Windows.Annotations/IAnchorInfo.xml
+++ b/xml/System.Windows.Annotations/IAnchorInfo.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to implement the event handler of such a list box that serves as the comments pane:  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/Window1.xaml.cs" id="Snippethandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml.vb" id="Snippethandler":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml.vb" id="Snippethandler":::  
   
  ]]></format>
     </remarks>
@@ -127,7 +127,7 @@
  The following example demonstrates how to implement the event handler of such a list box that serves as the comments pane:  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/Window1.xaml.cs" id="Snippethandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml.vb" id="Snippethandler":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml.vb" id="Snippethandler":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Annotations/TextAnchor.xml b/xml/System.Windows.Annotations/TextAnchor.xml
index a40544b0ce7..f2cf7b8f937 100644
--- a/xml/System.Windows.Annotations/TextAnchor.xml
+++ b/xml/System.Windows.Annotations/TextAnchor.xml
@@ -34,7 +34,7 @@
  The following example demonstrates how to implement the event handler of such a list box that serves as the comments pane.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/Window1.xaml.cs" id="Snippethandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml.vb" id="Snippethandler":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml.vb" id="Snippethandler":::  
   
  ]]></format>
     </remarks>
@@ -106,7 +106,7 @@
  The following example demonstrates how to implement the event handler of such a list box that serves as the comments pane.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/Window1.xaml.cs" id="Snippethandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentAnnotatedViewer/visualbasic/window1.xaml.vb" id="Snippethandler":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Annotations/AnnotationHelper/GetAnchorInfo/window1.xaml.vb" id="Snippethandler":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Automation.Peers/IViewAutomationPeer.xml b/xml/System.Windows.Automation.Peers/IViewAutomationPeer.xml
index b266de72506..25721166fcf 100644
--- a/xml/System.Windows.Automation.Peers/IViewAutomationPeer.xml
+++ b/xml/System.Windows.Automation.Peers/IViewAutomationPeer.xml
@@ -27,9 +27,9 @@
  The following code shows a custom view implementing <xref:System.Windows.Automation.Peers.IViewAutomationPeer> in a separate class to handle a button that appears at the top of the <xref:System.Windows.Controls.ListView> control.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/OneButtonHeaderView.cs" id="Snippetivapcreate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/onebuttonheaderview.vb" id="Snippetivapcreate":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/onebuttonheaderview.vb" id="Snippetivapcreate":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/OneButtonHeaderView.cs" id="Snippetivap":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCustomView/visualbasic/onebuttonheaderview.vb" id="Snippetivap":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Automation.Peers/IViewAutomationPeer/Overview/onebuttonheaderview.vb" id="Snippetivap":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Automation/TextPattern.xml b/xml/System.Windows.Automation/TextPattern.xml
index 99a3c790b2b..5405ac1a9ea 100644
--- a/xml/System.Windows.Automation/TextPattern.xml
+++ b/xml/System.Windows.Automation/TextPattern.xml
@@ -337,7 +337,7 @@
  In the following code example, the targetTextPattern member variable is a <xref:System.Windows.Automation.TextPattern> object obtained from a text provider of interest.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.cs" id="Snippetdocumentrange":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/SearchWindow.vb" id="Snippetdocumentrange":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.vb" id="Snippetdocumentrange":::
 
  ]]></format>
         </remarks>
@@ -1584,7 +1584,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.cs" id="Snippettextpatternpattern":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/SearchWindow.vb" id="Snippettextpatternpattern":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.vb" id="Snippettextpatternpattern":::
 
  ]]></format>
         </remarks>
@@ -1823,7 +1823,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.cs" id="Snippetsupportedtextselection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/SearchWindow.vb" id="Snippetsupportedtextselection":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.vb" id="Snippetsupportedtextselection":::
 
  ]]></format>
         </remarks>
@@ -1919,7 +1919,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.cs" id="Snippettextchanged":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/SearchWindow.vb" id="Snippettextchanged":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.vb" id="Snippettextchanged":::
 
  ]]></format>
         </remarks>
@@ -2017,7 +2017,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.cs" id="Snippetselectionchanged":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FindText/VisualBasic/SearchWindow.vb" id="Snippetselectionchanged":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Automation/TextPattern/DocumentRange/SearchWindow.vb" id="Snippetselectionchanged":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/BulletDecorator.xml b/xml/System.Windows.Controls.Primitives/BulletDecorator.xml
index 5ea77e6e949..e0e5d58a661 100644
--- a/xml/System.Windows.Controls.Primitives/BulletDecorator.xml
+++ b/xml/System.Windows.Controls.Primitives/BulletDecorator.xml
@@ -40,7 +40,7 @@
  The following examples show how to define a <xref:System.Windows.Controls.Primitives.BulletDecorator> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml" id="Snippet1":::
 
  ]]></format>
@@ -161,7 +161,7 @@
  The following examples show how to set the <xref:System.Windows.Controls.Primitives.BulletDecorator.Background%2A> property on a <xref:System.Windows.Controls.Primitives.BulletDecorator> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BulletPanelExample/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/BulletDecorator/Overview/Window1.xaml" id="Snippet1":::
 
  ]]></format>
@@ -250,7 +250,7 @@
  The following examples show how to set the <xref:System.Windows.Controls.Primitives.BulletDecorator.Bullet%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/BulletDecorator/Bullet/Window1.xaml.cs" id="Snippetbulletdecorator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ExpanderRichContent/VisualBasic/Window1.xaml.vb" id="Snippetbulletdecorator":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/BulletDecorator/Bullet/Window1.xaml.vb" id="Snippetbulletdecorator":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/BulletDecorator/Bullet/Window1.xaml" id="Snippetbulletdecorator":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls.Primitives/ButtonBase.xml b/xml/System.Windows.Controls.Primitives/ButtonBase.xml
index cf9625d3573..8e64cbd7e2c 100644
--- a/xml/System.Windows.Controls.Primitives/ButtonBase.xml
+++ b/xml/System.Windows.Controls.Primitives/ButtonBase.xml
@@ -144,7 +144,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Button/Overview/Pane1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Button/Overview/Pane1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Button/Overview/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/GeneratorPosition.xml b/xml/System.Windows.Controls.Primitives/GeneratorPosition.xml
index 3530fe9aef2..9e0a97035b3 100644
--- a/xml/System.Windows.Controls.Primitives/GeneratorPosition.xml
+++ b/xml/System.Windows.Controls.Primitives/GeneratorPosition.xml
@@ -35,17 +35,17 @@
  The following example illustrates how to use <xref:System.Windows.Controls.Primitives.GeneratorPosition> to start generating forward from the beginning of an item list.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/GeneratorPosition/Overview/Window1.xaml.cs" id="Snippetgenerateforwardfrombeginningcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/window1.xaml.vb" id="Snippetgenerateforwardfrombeginningcode":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/window1.xaml.vb" id="Snippetgenerateforwardfrombeginningcode":::  
   
  The following example illustrates how to use <xref:System.Windows.Controls.Primitives.GeneratorPosition> to start generating backward from the end of an item list.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/GeneratorPosition/Overview/Window1.xaml.cs" id="Snippetgeneratebackwardfromendcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/window1.xaml.vb" id="Snippetgeneratebackwardfromendcode":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/window1.xaml.vb" id="Snippetgeneratebackwardfromendcode":::  
   
  The following example illustrates how to use <xref:System.Windows.Controls.Primitives.GeneratorPosition> to start generating forward from the middle of an item list.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/GeneratorPosition/Overview/Window1.xaml.cs" id="Snippetgenerateforwardfrommiddlecode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeneratorPositionSnippets/visualbasic/window1.xaml.vb" id="Snippetgenerateforwardfrommiddlecode":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/GeneratorPosition/Overview/window1.xaml.vb" id="Snippetgenerateforwardfrommiddlecode":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/IScrollInfo.xml b/xml/System.Windows.Controls.Primitives/IScrollInfo.xml
index f5846bb0d01..c090cd61a5a 100644
--- a/xml/System.Windows.Controls.Primitives/IScrollInfo.xml
+++ b/xml/System.Windows.Controls.Primitives/IScrollInfo.xml
@@ -66,7 +66,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.IScrollInfo.CanHorizontallyScroll%2A> property by using procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -105,7 +105,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.IScrollInfo.CanVerticallyScroll%2A> property by using procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -264,7 +264,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.LineLeft%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -302,7 +302,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.LineRight%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -410,7 +410,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.MouseWheelDown%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -448,7 +448,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.MouseWheelLeft%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet13":::  
   
  ]]></format>
         </remarks>
@@ -486,7 +486,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.MouseWheelRight%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet14":::  
   
  ]]></format>
         </remarks>
@@ -524,7 +524,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.MouseWheelUp%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet12":::  
   
  ]]></format>
         </remarks>
@@ -562,7 +562,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.PageDown%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -600,7 +600,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.PageLeft%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -638,7 +638,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.PageRight%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -676,7 +676,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.IScrollInfo.MouseWheelLeft%2A> method in procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -721,7 +721,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.IScrollInfo.ScrollOwner%2A> property by using procedural code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/IScrollInfoMethods/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/IScrollInfo/CanHorizontallyScroll/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/LayoutInformation.xml b/xml/System.Windows.Controls.Primitives/LayoutInformation.xml
index 741817cc01b..2baefdee1dc 100644
--- a/xml/System.Windows.Controls.Primitives/LayoutInformation.xml
+++ b/xml/System.Windows.Controls.Primitives/LayoutInformation.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.LayoutInformation.GetLayoutSlot%2A> method to translate the bounding box of a <xref:System.Windows.FrameworkElement> into a <xref:System.Windows.Media.GeometryDrawing>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/LayoutInformation/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/Window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -150,7 +150,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.LayoutInformation.GetLayoutSlot%2A> method to translate the bounding box of a <xref:System.Windows.FrameworkElement> into a <xref:System.Windows.Media.GeometryDrawing>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/LayoutInformation/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/LayoutInformation/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/LayoutInformation/Overview/Window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/Popup.xml b/xml/System.Windows.Controls.Primitives/Popup.xml
index f1079dfa918..f0774456673 100644
--- a/xml/System.Windows.Controls.Primitives/Popup.xml
+++ b/xml/System.Windows.Controls.Primitives/Popup.xml
@@ -75,7 +75,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/IsFocused/Window1.xaml" id="Snippet2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsFocused/Window1.xaml.cs" id="Snippetcreatepopup":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSimple/VisualBasic/Window1.xaml.vb" id="Snippetcreatepopup":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/Overview/Window1.xaml.vb" id="Snippetcreatepopup":::
 
  ]]></format>
     </remarks>
@@ -162,7 +162,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.Popup.AllowsTransparency%2A> property on a <xref:System.Windows.Controls.Primitives.Popup> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippetallowstransparency":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippetallowstransparency":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippetallowstransparency":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml" id="Snippetallowstransparency":::
 
  ]]></format>
@@ -262,7 +262,7 @@
  The following example shows how to add content to a <xref:System.Windows.Controls.Primitives.Popup> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippetchild":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippetchild":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippetchild":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml" id="Snippetchild":::
 
  ]]></format>
@@ -332,7 +332,7 @@
  The following example shows how to define an event handler for the <xref:System.Windows.Controls.Primitives.Popup.Closed> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippetclosed":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippetclosed":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippetclosed":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml" id="Snippetclosed":::
 
  ]]></format>
@@ -456,10 +456,10 @@
  The following example shows how to set a <xref:System.Windows.Controls.Primitives.Popup.CustomPopupPlacementCallback%2A> delegate.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/Window1.xaml.cs" id="Snippetdelegatedefinition":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/window1.xaml.vb" id="Snippetdelegatedefinition":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/window1.xaml.vb" id="Snippetdelegatedefinition":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/Window1.xaml.cs" id="Snippetdelegateinstance":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupCustomPlacement/visualbasic/window1.xaml.vb" id="Snippetdelegateinstance":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/CustomPopupPlacementCallback/window1.xaml.vb" id="Snippetdelegateinstance":::
 
  ]]></format>
         </remarks>
@@ -568,7 +568,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.Primitives.Popup.HasDropShadow%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippethasdropshadow":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippethasdropshadow":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippethasdropshadow":::
 
  ]]></format>
         </remarks>
@@ -793,7 +793,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.Popup.IsOpen%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippetisopen":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippetisopen":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippetisopen":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml" id="Snippetisopen":::
 
  ]]></format>
@@ -1151,7 +1151,7 @@
  The following example shows how to define an event handler for the <xref:System.Windows.Controls.Primitives.Popup.Opened> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippetopened":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippetopened":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippetopened":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml" id="Snippetopened":::
 
  ]]></format>
@@ -1498,11 +1498,11 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.Popup.PopupAnimation%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippetallowstransparency":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippetallowstransparency":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippetallowstransparency":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml" id="Snippetallowstransparency":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippetanimation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippetanimation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippetanimation":::
 
  ]]></format>
         </remarks>
@@ -1592,7 +1592,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.Popup.StaysOpen%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml.cs" id="Snippetstaysopen":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PopupSnips/visualbasic/window1.xaml.vb" id="Snippetstaysopen":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Popup/AllowsTransparency/window1.xaml.vb" id="Snippetstaysopen":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Popup/AllowsTransparency/Window1.xaml" id="Snippetstaysopen":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls.Primitives/RangeBase.xml b/xml/System.Windows.Controls.Primitives/RangeBase.xml
index c423aaf6508..5724ac12fad 100644
--- a/xml/System.Windows.Controls.Primitives/RangeBase.xml
+++ b/xml/System.Windows.Controls.Primitives/RangeBase.xml
@@ -215,7 +215,7 @@
  <xref:System.Windows.Controls.Primitives.RangeBase> controls such as <xref:System.Windows.Controls.Slider> and <xref:System.Windows.Controls.ProgressBar> inherit the <xref:System.Windows.Controls.Primitives.RangeBase> properties. The following example shows a <xref:System.Windows.Controls.Slider> that uses the <xref:System.Windows.Controls.Primitives.RangeBase.Maximum%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetbasic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetbasic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetbasic":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetbasic":::
 
  ]]></format>
@@ -304,7 +304,7 @@
  <xref:System.Windows.Controls.Primitives.RangeBase> controls such as <xref:System.Windows.Controls.Slider> and <xref:System.Windows.Controls.ProgressBar> inherit the <xref:System.Windows.Controls.Primitives.RangeBase> properties. The following example shows a <xref:System.Windows.Controls.Slider> that uses the <xref:System.Windows.Controls.Primitives.RangeBase.Minimum%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetbasic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetbasic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetbasic":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetbasic":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls.Primitives/RepeatButton.xml b/xml/System.Windows.Controls.Primitives/RepeatButton.xml
index 14decf48472..3aa4198bef1 100644
--- a/xml/System.Windows.Controls.Primitives/RepeatButton.xml
+++ b/xml/System.Windows.Controls.Primitives/RepeatButton.xml
@@ -43,7 +43,7 @@
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/RepeatButton/Overview/Pane1.xaml" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/RepeatButton/Overview/Pane1.xaml.cs" id="Snippet2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RepeatButton/VisualBasic/Pane1.xaml.vb" id="Snippet2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/RepeatButton/Overview/Pane1.xaml.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/ScrollBar.xml b/xml/System.Windows.Controls.Primitives/ScrollBar.xml
index 4fe82558144..2c4f531e93f 100644
--- a/xml/System.Windows.Controls.Primitives/ScrollBar.xml
+++ b/xml/System.Windows.Controls.Primitives/ScrollBar.xml
@@ -682,7 +682,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.ScrollBar.Orientation%2A> property for a <xref:System.Windows.Controls.Primitives.ScrollBar> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Orientation/Overview/Window1.xaml.cs" id="Snippetorientation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/window1.xaml.vb" id="Snippetorientation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/window1.xaml.vb" id="Snippetorientation":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Orientation/Overview/Window1.xaml" id="Snippetorientation":::
 
  ]]></format>
@@ -984,7 +984,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Orientation/Overview/Window1.xaml" id="Snippetscroll":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Orientation/Overview/Window1.xaml.cs" id="Snippetscrollhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/window1.xaml.vb" id="Snippetscrollhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/window1.xaml.vb" id="Snippetscrollhandler":::
 
  ]]></format>
         </remarks>
@@ -1413,7 +1413,7 @@
  The following example shows how to access the <xref:System.Windows.Controls.Primitives.Track> control that is used with a <xref:System.Windows.Controls.Primitives.ScrollBar> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Orientation/Overview/Window1.xaml.cs" id="Snippettrack":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/window1.xaml.vb" id="Snippettrack":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/window1.xaml.vb" id="Snippettrack":::
 
  ]]></format>
         </remarks>
@@ -1482,7 +1482,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Primitives.ScrollBar.ViewportSize%2A> on a <xref:System.Windows.Controls.Primitives.ScrollBar> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Orientation/Overview/Window1.xaml.cs" id="Snippetviewport":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ScrollBarSnips/visualbasic/window1.xaml.vb" id="Snippetviewport":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/ScrollBar/Orientation/window1.xaml.vb" id="Snippetviewport":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Orientation/Overview/Window1.xaml" id="Snippetviewport":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls.Primitives/Selector.xml b/xml/System.Windows.Controls.Primitives/Selector.xml
index 5bd4d8d08e0..8cf9932f555 100644
--- a/xml/System.Windows.Controls.Primitives/Selector.xml
+++ b/xml/System.Windows.Controls.Primitives/Selector.xml
@@ -817,7 +817,7 @@
  :::code language="xml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Selector/Selected/Window1.xaml" id="Snippetselectorevents":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Selector/Selected/Window1.xaml.cs" id="Snippetselectorselected":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/window1.xaml.vb" id="Snippetselectorselected":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/window1.xaml.vb" id="Snippetselectorselected":::
 
  ]]></format>
         </remarks>
@@ -925,7 +925,7 @@
  The following example uses the <xref:System.Windows.Controls.Primitives.Selector.SelectedIndex%2A> property to determine whether the item at index 0 is the first item in the selection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Selector/Selected/Window1.xaml.cs" id="Snippetselectorselectedindex":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/window1.xaml.vb" id="Snippetselectorselectedindex":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/window1.xaml.vb" id="Snippetselectorselectedindex":::
 
  ]]></format>
         </remarks>
@@ -1023,7 +1023,7 @@
  The following example gets the <xref:System.Windows.Controls.Primitives.Selector.SelectedItem%2A> from a <xref:System.Windows.Controls.ListBox>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1305,7 +1305,7 @@
  The following example shows how to handle the <xref:System.Windows.Controls.Primitives.Selector.SelectionChanged> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1413,7 +1413,7 @@
  :::code language="xml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Selector/Selected/Window1.xaml" id="Snippetselectorevents":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Selector/Selected/Window1.xaml.cs" id="Snippetselectorunselected":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItems_snip/visualbasic/window1.xaml.vb" id="Snippetselectorunselected":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Selector/Selected/window1.xaml.vb" id="Snippetselectorunselected":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/TextBoxBase.xml b/xml/System.Windows.Controls.Primitives/TextBoxBase.xml
index b38e446e5d0..3cad488f227 100644
--- a/xml/System.Windows.Controls.Primitives/TextBoxBase.xml
+++ b/xml/System.Windows.Controls.Primitives/TextBoxBase.xml
@@ -44,7 +44,7 @@
  The following example demonstrates how to use the derived <xref:System.Windows.Controls.RichTextBox> object in code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_richtextbox_mouseupdown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_richtextbox_mouseupdown":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_richtextbox_mouseupdown":::
 
  ]]></format>
     </remarks>
@@ -238,7 +238,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.AppendText%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase11":::
 
  ]]></format>
         </remarks>
@@ -363,7 +363,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.BeginChange%2A> and <xref:System.Windows.Controls.Primitives.TextBoxBase.EndChange%2A> methods to create a change block.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/BeginChangeEndChangeExample.cs" id="Snippetbeginchangeendchangecodeexampleinline1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/beginchangeendchangeexample.vb" id="Snippetbeginchangeendchangecodeexampleinline1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/beginchangeendchangeexample.vb" id="Snippetbeginchangeendchangecodeexampleinline1":::
 
  ]]></format>
         </remarks>
@@ -407,7 +407,7 @@
  The following code example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.CanRedo%2A> property to determine whether the most recent undo action can be redone.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase9":::
 
  ]]></format>
         </remarks>
@@ -451,7 +451,7 @@
  The following code example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.CanUndo%2A> property to determine whether the most recent action can be undone.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase8":::
 
  ]]></format>
         </remarks>
@@ -570,7 +570,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.Copy%2A> method to copy the text that is selected in a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase4":::
 
  ]]></format>
         </remarks>
@@ -620,7 +620,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.Cut%2A> method to delete the text that is selected in a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase5":::
 
  ]]></format>
         </remarks>
@@ -705,7 +705,7 @@ TextBox with CaretBrush set to blue
  The following example shows how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.BeginChange%2A> and <xref:System.Windows.Controls.Primitives.TextBoxBase.EndChange%2A> methods to create a change block.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/BeginChangeEndChangeExample.cs" id="Snippetbeginchangeendchangecodeexampleinline1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/beginchangeendchangeexample.vb" id="Snippetbeginchangeendchangecodeexampleinline1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/beginchangeendchangeexample.vb" id="Snippetbeginchangeendchangecodeexampleinline1":::
 
  ]]></format>
         </remarks>
@@ -751,7 +751,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to read the value of the <xref:System.Windows.Controls.Primitives.TextBoxBase.ExtentHeight%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase3":::
 
  ]]></format>
         </remarks>
@@ -796,7 +796,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to read the value of the <xref:System.Windows.Controls.Primitives.TextBoxBase.ExtentWidth%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase3":::
 
  ]]></format>
         </remarks>
@@ -848,7 +848,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to read the value of the <xref:System.Windows.Controls.Primitives.TextBoxBase.HorizontalOffset%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase3":::
 
  ]]></format>
         </remarks>
@@ -1326,7 +1326,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.LineDown%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase13":::
 
  ]]></format>
         </remarks>
@@ -1367,7 +1367,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.LineLeft%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase14":::
 
  ]]></format>
         </remarks>
@@ -1408,7 +1408,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.LineRight%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase15":::
 
  ]]></format>
         </remarks>
@@ -1449,7 +1449,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.LineUp%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase16":::
 
  ]]></format>
         </remarks>
@@ -2320,7 +2320,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.PageDown%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase17":::
 
  ]]></format>
         </remarks>
@@ -2361,7 +2361,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.PageLeft%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase18":::
 
  ]]></format>
         </remarks>
@@ -2402,7 +2402,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.PageRight%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase19":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase19":::
 
  ]]></format>
         </remarks>
@@ -2443,7 +2443,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.PageUp%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase20":::
 
  ]]></format>
         </remarks>
@@ -2484,7 +2484,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.Paste%2A> method to paste selected content into a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase6":::
 
  ]]></format>
         </remarks>
@@ -2526,7 +2526,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.Redo%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase9":::
 
  ]]></format>
         </remarks>
@@ -2569,7 +2569,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.ScrollToEnd%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase22":::
 
  ]]></format>
         </remarks>
@@ -2608,7 +2608,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.ScrollToHome%2A> method to scroll the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase21":::
 
  ]]></format>
         </remarks>
@@ -2711,7 +2711,7 @@ TextBox with CaretBrush set to blue
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.SelectAll%2A> method to select all the contents of a <xref:System.Windows.Controls.TextBox> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase7":::
 
  ]]></format>
         </remarks>
@@ -2833,7 +2833,7 @@ Selected text in a TextBox with SelectionBrush set to red
  The following example demonstrates how to handle the <xref:System.Windows.Controls.Primitives.TextBoxBase.SelectionChanged> event by using code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase10":::
 
  ]]></format>
         </remarks>
@@ -3148,7 +3148,7 @@ If this property is `null`, selected text is not rendered.
  The following example demonstrates how to use the <xref:System.Windows.Controls.Primitives.TextBoxBase.Undo%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase8":::
 
  ]]></format>
         </remarks>
@@ -3275,7 +3275,7 @@ If this property is `null`, selected text is not rendered.
  The following example demonstrates how to read the value of the <xref:System.Windows.Controls.Primitives.TextBoxBase.VerticalOffset%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase3":::
 
  ]]></format>
         </remarks>
@@ -3397,7 +3397,7 @@ If this property is `null`, selected text is not rendered.
  The following example demonstrates how to read the value of the <xref:System.Windows.Controls.Primitives.TextBoxBase.ViewportHeight%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase3":::
 
  ]]></format>
         </remarks>
@@ -3442,7 +3442,7 @@ If this property is `null`, selected text is not rendered.
  The following example demonstrates how to read the value of the <xref:System.Windows.Controls.Primitives.TextBoxBase.ViewportWidth%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/Thumb.xml b/xml/System.Windows.Controls.Primitives/Thumb.xml
index b1605d2067b..25c907c9740 100644
--- a/xml/System.Windows.Controls.Primitives/Thumb.xml
+++ b/xml/System.Windows.Controls.Primitives/Thumb.xml
@@ -188,7 +188,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml" id="Snippetthumb":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml.cs" id="Snippetdragcompletedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/Pane1.xaml.vb" id="Snippetdragcompletedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml.vb" id="Snippetdragcompletedhandler":::
 
  ]]></format>
         </remarks>
@@ -371,7 +371,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml" id="Snippetthumb":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml.cs" id="Snippetdragstartedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Thumb/VisualBasic/Pane1.xaml.vb" id="Snippetdragstartedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls.Primitives/Thumb/DragCompleted/Pane1.xaml.vb" id="Snippetdragstartedhandler":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls.Primitives/ToggleButton.xml b/xml/System.Windows.Controls.Primitives/ToggleButton.xml
index 2283c5b823f..85ba766033d 100644
--- a/xml/System.Windows.Controls.Primitives/ToggleButton.xml
+++ b/xml/System.Windows.Controls.Primitives/ToggleButton.xml
@@ -130,7 +130,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CheckBox/Overview/Window1.xaml" id="Snippet2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CheckBox/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -706,7 +706,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CheckBox/Overview/Window1.xaml" id="Snippet2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CheckBox/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/Button.xml b/xml/System.Windows.Controls/Button.xml
index 0c21fca3631..9cf6e6b43e7 100644
--- a/xml/System.Windows.Controls/Button.xml
+++ b/xml/System.Windows.Controls/Button.xml
@@ -52,7 +52,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Button/Overview/Pane1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Button/Overview/Pane1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Button/Overview/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -267,7 +267,7 @@
  The following example shows how to determine whether the <xref:System.Windows.Controls.Button.IsDefaulted%2A> property is `true` for a default button.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Button/IsCancel/Page1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ButtonProps_snip/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Button/IsDefaulted/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/Calendar.xml b/xml/System.Windows.Controls/Calendar.xml
index cb3addfbd1a..d1e52c033b7 100644
--- a/xml/System.Windows.Controls/Calendar.xml
+++ b/xml/System.Windows.Controls/Calendar.xml
@@ -93,7 +93,7 @@ Calendar controls
  The following code and XAML creates a page with two <xref:System.Windows.Controls.Calendar> controls that is similar to the previous illustration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet1":::
 
  ]]></format>
@@ -184,7 +184,7 @@ Calendar controls
  The following example creates a <xref:System.Windows.Controls.Calendar> that has some dates that cannot be selected.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::
 
  The preceding example produces output that is similar to the following illustration.
@@ -508,7 +508,7 @@ Calendar with dates that cannot be selected
  The following code sets up a <xref:System.Windows.Controls.Calendar> with a particular range of displayable dates, and sets the currently selected and displayed date.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet2":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet2":::
 
  ]]></format>
@@ -619,7 +619,7 @@ Calendar with dates that cannot be selected
  The following code sets up a <xref:System.Windows.Controls.Calendar> with a particular range of displayable dates, and sets the currently selected and displayed date.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet2":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet2":::
 
  ]]></format>
@@ -735,7 +735,7 @@ Calendar with dates that cannot be selected
  The following code sets up a <xref:System.Windows.Controls.Calendar> with a particular range of displayable dates, and sets the currently selected and displayed date.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet2":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet2":::
 
  ]]></format>
@@ -819,11 +819,11 @@ Calendar with dates that cannot be selected
  The following example creates a calendar that displays the months in a year and handles the <xref:System.Windows.Controls.Calendar.DisplayModeChanged> event so that when the user clicks on a month or the year, the calendar does not change its <xref:System.Windows.Controls.Calendar.DisplayMode%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet4":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet4":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -871,11 +871,11 @@ Calendar with dates that cannot be selected
  The following example creates a calendar that displays the months in a year and handles the <xref:System.Windows.Controls.Calendar.DisplayModeChanged> event so that when the user clicks on a month or the year, the calendar does not change its <xref:System.Windows.Controls.Calendar.DisplayMode%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet4":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet4":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1036,7 +1036,7 @@ Calendar with dates that cannot be selected
  The following example creates a <xref:System.Windows.Controls.Calendar> where the current date is not highlighted.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::
 
  ]]></format>
@@ -1414,7 +1414,7 @@ Calendar with dates that cannot be selected
  The following example creates a <xref:System.Windows.Controls.Calendar> with a particular range of displayable dates, and sets the currently selected and displayed date.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet2":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet2":::
 
  ]]></format>
@@ -1517,7 +1517,7 @@ Calendar with dates that cannot be selected
  The following example creates a <xref:System.Windows.Controls.Calendar> that has multiple ranges of dates selected.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::
 
  ]]></format>
@@ -1640,7 +1640,7 @@ Calendar with dates that cannot be selected
  The following example creates a <xref:System.Windows.Controls.Calendar> that has multiple ranges of dates selected.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/CalendarBlackoutDatesCollection.xml b/xml/System.Windows.Controls/CalendarBlackoutDatesCollection.xml
index 1d5ef039ed8..3b7aae29583 100644
--- a/xml/System.Windows.Controls/CalendarBlackoutDatesCollection.xml
+++ b/xml/System.Windows.Controls/CalendarBlackoutDatesCollection.xml
@@ -53,7 +53,7 @@
  The following example creates a <xref:System.Windows.Controls.Calendar> in code and markup that has some dates that cannot be selected.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::  
   
  The preceding example produces output that is similar to the following illustration.  
@@ -132,7 +132,7 @@ Calendar with dates that cannot be selected
  The following example shows the <xref:System.Windows.FrameworkElement.Loaded> event handler. The event handler calls the <xref:System.Windows.Controls.CalendarBlackoutDatesCollection.AddDatesInPast%2A> method to make only future dates selectable.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/CalendarDateRange.xml b/xml/System.Windows.Controls/CalendarDateRange.xml
index ff046e11624..f8b5aaa6caf 100644
--- a/xml/System.Windows.Controls/CalendarDateRange.xml
+++ b/xml/System.Windows.Controls/CalendarDateRange.xml
@@ -37,7 +37,7 @@
  The following example creates <xref:System.Windows.Controls.CalendarDateRange> objects to specify which dates in a <xref:System.Windows.Controls.Calendar> cannot be selected.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::
 
  ]]></format>
@@ -191,7 +191,7 @@
  The following example creates <xref:System.Windows.Controls.CalendarDateRange> objects to specify which dates in a <xref:System.Windows.Controls.Calendar> cannot be selected.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::
 
  ]]></format>
@@ -281,7 +281,7 @@
  The following example creates <xref:System.Windows.Controls.CalendarDateRange> objects to specify which dates in a <xref:System.Windows.Controls.Calendar> cannot be selected.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/CalendarMode.xml b/xml/System.Windows.Controls/CalendarMode.xml
index 6b4fac9830d..65f41c8f533 100644
--- a/xml/System.Windows.Controls/CalendarMode.xml
+++ b/xml/System.Windows.Controls/CalendarMode.xml
@@ -38,11 +38,11 @@
  The following example creates a calendar that displays the months in a year and handles the <xref:System.Windows.Controls.Calendar.DisplayModeChanged> event so that when the user clicks on a month or the year, the calendar does not change its <xref:System.Windows.Controls.Calendar.DisplayMode%2A>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet4":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet4":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/CalendarSelectionMode.xml b/xml/System.Windows.Controls/CalendarSelectionMode.xml
index f6427a84fc4..92a86fdef47 100644
--- a/xml/System.Windows.Controls/CalendarSelectionMode.xml
+++ b/xml/System.Windows.Controls/CalendarSelectionMode.xml
@@ -27,7 +27,7 @@
  The following example sets the <xref:System.Windows.Controls.Calendar.SelectionMode%2A> property to MultipleRange.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::  
   
  ]]></format>
diff --git a/xml/System.Windows.Controls/CharacterCasing.xml b/xml/System.Windows.Controls/CharacterCasing.xml
index 291d78406ff..e19c390541a 100644
--- a/xml/System.Windows.Controls/CharacterCasing.xml
+++ b/xml/System.Windows.Controls/CharacterCasing.xml
@@ -35,7 +35,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/charactercasingexample.xaml" id="Snippetcharactercasingexamplewholepage":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/CharacterCasingExample.cs" id="Snippetcharactercasingcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/charactercasingexample.vb" id="Snippetcharactercasingcodeexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/charactercasingexample.vb" id="Snippetcharactercasingcodeexamplewholepage":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/CheckBox.xml b/xml/System.Windows.Controls/CheckBox.xml
index f08b9c78c17..92f8c4f2ddb 100644
--- a/xml/System.Windows.Controls/CheckBox.xml
+++ b/xml/System.Windows.Controls/CheckBox.xml
@@ -54,7 +54,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CheckBox/Overview/Window1.xaml" id="Snippet4":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CheckBox/Overview/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CheckBox_Snippets/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CheckBox/Overview/Window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/ClickMode.xml b/xml/System.Windows.Controls/ClickMode.xml
index 8807ae9c622..d158ca64bec 100644
--- a/xml/System.Windows.Controls/ClickMode.xml
+++ b/xml/System.Windows.Controls/ClickMode.xml
@@ -36,7 +36,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Button/Overview/Pane1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Button/Overview/Pane1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ClickModes_snip/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Button/Overview/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/ColumnDefinitionCollection.xml b/xml/System.Windows.Controls/ColumnDefinitionCollection.xml
index f23143c4711..fe7db93a5e2 100644
--- a/xml/System.Windows.Controls/ColumnDefinitionCollection.xml
+++ b/xml/System.Windows.Controls/ColumnDefinitionCollection.xml
@@ -91,7 +91,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.ColumnDefinitionCollection.Add%2A> method to add a <xref:System.Windows.Controls.ColumnDefinition> to a <xref:System.Windows.Controls.ColumnDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet11":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -136,7 +136,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.ColumnDefinitionCollection.Clear%2A> method to clear the content of a <xref:System.Windows.Controls.ColumnDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet12":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -185,7 +185,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.ColumnDefinitionCollection.Contains%2A> method to determine whether a <xref:System.Windows.Controls.ColumnDefinition> exists in a <xref:System.Windows.Controls.ColumnDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet13":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -290,7 +290,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.ColumnDefinitionCollection.Count%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet17":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet17":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -338,7 +338,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.ColumnDefinitionCollection.IndexOf%2A> method to determine the index position of a <xref:System.Windows.Controls.ColumnDefinition> within a <xref:System.Windows.Controls.ColumnDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet14":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -392,7 +392,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.ColumnDefinitionCollection.Insert%2A> method to insert a <xref:System.Windows.Controls.ColumnDefinition> to a specific `index` position within a <xref:System.Windows.Controls.ColumnDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet14":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -440,7 +440,7 @@
  The following example demonstrates how to get the value of the <xref:System.Windows.Controls.ColumnDefinitionCollection.IsReadOnly%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet10":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -614,7 +614,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.ColumnDefinitionCollection.RemoveAt%2A> method to remove a <xref:System.Windows.Controls.ColumnDefinition> to a <xref:System.Windows.Controls.ColumnDefinitionCollection> at a specific `index` position.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet15":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet15":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -665,7 +665,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.ColumnDefinitionCollection.RemoveRange%2A> method to remove a range of <xref:System.Windows.Controls.ColumnDefinition> elements from a <xref:System.Windows.Controls.ColumnDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet16":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet16":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
diff --git a/xml/System.Windows.Controls/ComboBox.xml b/xml/System.Windows.Controls/ComboBox.xml
index e8f3bfa9dcf..c6df6f9df4e 100644
--- a/xml/System.Windows.Controls/ComboBox.xml
+++ b/xml/System.Windows.Controls/ComboBox.xml
@@ -80,7 +80,7 @@
  The following example defines the collection object that the <xref:System.Windows.Controls.ComboBox> in the preceding example binds to.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ComboBox/Overview/Window1.xaml.cs" id="Snippetdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxItems/VIsualBasic/Window1.xaml.vb" id="Snippetdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ComboBox/Overview/Window1.xaml.vb" id="Snippetdata":::
 
  ]]></format>
     </remarks>
@@ -145,7 +145,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml" id="Snippetcomboboxevents1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml.cs" id="Snippetcomboboxevents2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/Pane1.xaml.vb" id="Snippetcomboboxevents2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml.vb" id="Snippetcomboboxevents2":::
 
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml" id="Snippetcomboboxevents1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml.cs" id="Snippetcomboboxevents2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ComboBoxSimple/VisualBasic/Pane1.xaml.vb" id="Snippetcomboboxevents2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ComboBox/DropDownClosed/Pane1.xaml.vb" id="Snippetcomboboxevents2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ContentControl.xml b/xml/System.Windows.Controls/ContentControl.xml
index ff0ac2cdf5a..5805a16b68d 100644
--- a/xml/System.Windows.Controls/ContentControl.xml
+++ b/xml/System.Windows.Controls/ContentControl.xml
@@ -75,7 +75,7 @@ Four buttons with different types of content
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb" id="Snippet2":::
 
  The following example shows how to make a style for a <xref:System.Windows.Controls.ContentControl> so that the control has an enhanced visual appearance.
 
@@ -267,7 +267,7 @@ Four buttons with different types of content
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb" id="Snippet2":::
 
  The following illustration shows the four buttons created in the previous example.
 
@@ -561,7 +561,7 @@ Four buttons with different types of content
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContentControl/ContentTemplateSelector/Window1.xaml" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/ContentTemplateSelector/Window1.xaml.cs" id="Snippet2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentControlTemplateSelector/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/ContentTemplateSelector/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -650,7 +650,7 @@ Four buttons with different types of content
  The following example shows how to use the <xref:System.Windows.Controls.ContentControl.HasContent%2A> property to determine whether a content control contains content.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Page1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentControl/VisualBasic/Page1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/HasContent/Page1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ContextMenu.xml b/xml/System.Windows.Controls/ContextMenu.xml
index c77639f2c67..10020c2fa85 100644
--- a/xml/System.Windows.Controls/ContextMenu.xml
+++ b/xml/System.Windows.Controls/ContextMenu.xml
@@ -68,7 +68,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Pane1.xaml" id="Snippetevents":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -146,7 +146,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Pane1.xaml" id="Snippetcontextmenuevents":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Pane1.xaml.cs" id="Snippetcontextmenueventhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/Pane1.xaml.vb" id="Snippetcontextmenueventhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/Pane1.xaml.vb" id="Snippetcontextmenueventhandlers":::
 
  ]]></format>
         </remarks>
@@ -569,7 +569,7 @@
  This example shows how to check to determine whether the <xref:System.Windows.Controls.ContextMenu.IsOpen%2A> property is set to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Pane1.xaml.cs" id="Snippetcontextmenuisopen":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/Pane1.xaml.vb" id="Snippetcontextmenuisopen":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/Pane1.xaml.vb" id="Snippetcontextmenuisopen":::
 
  ]]></format>
         </remarks>
@@ -863,7 +863,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Pane1.xaml" id="Snippetcontextmenuevents":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Pane1.xaml.cs" id="Snippetcontextmenueventhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContextMenu/VisualBasic/Pane1.xaml.vb" id="Snippetcontextmenueventhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/Closed/Pane1.xaml.vb" id="Snippetcontextmenueventhandlers":::
 
  ]]></format>
         </remarks>
@@ -1138,10 +1138,10 @@
  The target of a <xref:System.Windows.Controls.ContextMenu> is its parent. The following examples show how to use the <xref:System.Windows.Controls.ContextMenu.PlacementTarget%2A> property to find the parent of a <xref:System.Windows.Controls.ContextMenu>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/PlacementTarget/Pane11.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TabControlwithContextMenu/visualbasic/pane1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane11.xaml.vb" id="Snippet3":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/PlacementTarget/Pane1.xaml.cs" id="Snippetfromitemcontainer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TabControlContextMenu_snip/visualbasic/pane1.xaml.vb" id="Snippetfromitemcontainer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/PlacementTarget/pane1.xaml.vb" id="Snippetfromitemcontainer":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/Control.xml b/xml/System.Windows.Controls/Control.xml
index 7e9adcae026..21245cc7bb4 100644
--- a/xml/System.Windows.Controls/Control.xml
+++ b/xml/System.Windows.Controls/Control.xml
@@ -186,7 +186,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet11":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet1":::
 
  The following example shows a template that enables a trigger to change the background of a button when it is pressed.
 
@@ -280,7 +280,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet17":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -370,7 +370,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml" id="Snippetadditionalcontrolprops11":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml.cs" id="Snippetadditionalcontrolprops1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml.vb" id="Snippetadditionalcontrolprops1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml.vb" id="Snippetadditionalcontrolprops1":::
 
  ]]></format>
         </remarks>
@@ -464,7 +464,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet13":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -593,7 +593,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet14":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -683,7 +683,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml" id="Snippetadditionalcontrolprops12":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml.cs" id="Snippetadditionalcontrolprops2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml.vb" id="Snippetadditionalcontrolprops2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml.vb" id="Snippetadditionalcontrolprops2":::
 
  ]]></format>
         </remarks>
@@ -773,7 +773,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet15":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -863,7 +863,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet16":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -953,7 +953,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet12":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1074,7 +1074,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet18":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -1165,7 +1165,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml" id="Snippetadditionalcontrolprops15":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml.cs" id="Snippetadditionalcontrolprops4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml.vb" id="Snippetadditionalcontrolprops4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml.vb" id="Snippetadditionalcontrolprops4":::
 
  ]]></format>
         </remarks>
@@ -1290,7 +1290,7 @@
  The following example shows the event handler of the <xref:System.Windows.Controls.Control.MouseDoubleClick> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml.cs" id="Snippetcontrolevents1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml.vb" id="Snippetcontrolevents1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml.vb" id="Snippetcontrolevents1":::
 
  ]]></format>
         </remarks>
@@ -1514,7 +1514,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml" id="Snippetadditionalcontrolprops13":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml.cs" id="Snippetadditionalcontrolprops3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml.vb" id="Snippetadditionalcontrolprops3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml.vb" id="Snippetadditionalcontrolprops3":::
 
  ]]></format>
         </remarks>
@@ -1600,7 +1600,7 @@
  The following example shows the event handler of the <xref:System.Windows.Controls.Control.PreviewMouseDoubleClick> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/BorderThickness/Pane1.xaml.cs" id="Snippetcontrolevents2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps_snip/VisualBasic/Window1.xaml.vb" id="Snippetcontrolevents2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/BorderThickness/Window1.xaml.vb" id="Snippetcontrolevents2":::
 
  ]]></format>
         </remarks>
@@ -1900,7 +1900,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml" id="Snippet19":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Control/Background/Pane1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlProps/VisualBasic/Pane1.xaml.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Control/Background/Pane1.xaml.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/DataGrid.xml b/xml/System.Windows.Controls/DataGrid.xml
index 8745e6efd59..03aa3bf1c41 100644
--- a/xml/System.Windows.Controls/DataGrid.xml
+++ b/xml/System.Windows.Controls/DataGrid.xml
@@ -121,26 +121,26 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid1/vb/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window1.xaml.vb" id="Snippet2":::
 
  The following example shows how to create a <xref:System.Windows.Controls.DataGrid> with a customized <xref:System.Windows.Controls.DataGrid.Columns%2A> collection.
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml" id="Snippetall1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetusing":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetusing":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetusing":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippettop":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippettop":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippettop":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetall2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetall2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetall2":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetcustomerclass":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetcustomerclass":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetcustomerclass":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetallend":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetallend":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetallend":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetenum":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetenum":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetenum":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippethyperlink3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippethyperlink3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippethyperlink3":::
 
  ]]></format>
     </remarks>
@@ -379,7 +379,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -489,7 +489,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_autogencolumns/vb/datagrid_autogencolumns_vb/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/AutoGenerateColumns/window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1920,9 +1920,9 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml" id="Snippetdatagrid2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml.cs" id="Snippetadd1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml.vb" id="Snippetadd1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml.vb" id="Snippetadd1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml.cs" id="Snippetadd2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml.vb" id="Snippetadd2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml.vb" id="Snippetadd2":::
 
  The following example shows how to remove a column from the collection.
 
@@ -1930,7 +1930,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml" id="Snippetdatagrid":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml.cs" id="Snippetdelete2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml.vb" id="Snippetdelete2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml.vb" id="Snippetdelete2":::
 
  The following example shows how to set properties on columns in the collection when they are auto-generated and when an event occurs.
 
@@ -1938,7 +1938,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml" id="Snippetdatagrid":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml.cs" id="Snippetvisible2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml.vb" id="Snippetvisible2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml.vb" id="Snippetvisible2":::
 
  ]]></format>
         </remarks>
@@ -2725,9 +2725,9 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.vb" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/window1.xaml.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -5922,7 +5922,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/RowHeaderStyle/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_rowheader/vb/datagrid_rowheader_vb/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/RowHeaderStyle/window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -6446,7 +6446,7 @@
  The following example demonstrates a <xref:System.Windows.Controls.ValidationRule> that checks whether the `StartDate` property value for a `Course` object is earlier than its `EndDate` property value. This code example is part of a larger example provided for the [How to: Implement Validation with the DataGrid Control](/dotnet/framework/wpf/controls/how-to-implement-validation-with-the-datagrid-control) topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/RowValidationErrorTemplate/mainwindow.xaml.cs" id="Snippetcoursevalidationrule":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_validation/vb/mainwindow.xaml.vb" id="Snippetcoursevalidationrule":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/RowValidationRules/mainwindow.xaml.vb" id="Snippetcoursevalidationrule":::
 
  The following example sets the <xref:System.Windows.Controls.DataGrid.RowValidationRules%2A> property in XAML. The <xref:System.Windows.Controls.ValidationRule.ValidationStep%2A> property is set to <xref:System.Windows.Controls.ValidationStep.UpdatedValue> so that the validation occurs only after the bound data object is updated. When a user specifies an end date that is earlier than the start date, a red exclamation mark (!) appears in the row header.
 
@@ -6692,7 +6692,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/SelectedCellsChanged/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_cellselection/vb/datagrid_cellselection_vb/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/SelectedCellsChanged/window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/DataGridColumn.xml b/xml/System.Windows.Controls/DataGridColumn.xml
index adf0ef66eca..59b79c5b684 100644
--- a/xml/System.Windows.Controls/DataGridColumn.xml
+++ b/xml/System.Windows.Controls/DataGridColumn.xml
@@ -1213,9 +1213,9 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml" id="Snippet1":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_frozencolumn/vb/window1.xaml.vb" id="Snippet3":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/FrozenColumnCount/window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -1861,7 +1861,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml" id="Snippetdatagrid":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Columns/window1.xaml.cs" id="Snippetvisible2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_columnsmanipulation/vb/datagrid_columnsmanipulation_vb/window1.xaml.vb" id="Snippetvisible2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Columns/window1.xaml.vb" id="Snippetvisible2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/DataGridComboBoxColumn.xml b/xml/System.Windows.Controls/DataGridComboBoxColumn.xml
index a4a8db22730..e5ba6329ef5 100644
--- a/xml/System.Windows.Controls/DataGridComboBoxColumn.xml
+++ b/xml/System.Windows.Controls/DataGridComboBoxColumn.xml
@@ -67,13 +67,13 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml" id="Snippetcombobox2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippettop":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippettop":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippettop":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetall2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetall2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetall2":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetcustomerclass":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetcustomerclass":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetcustomerclass":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetenum":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetenum":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetenum":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/DataGridHyperlinkColumn.xml b/xml/System.Windows.Controls/DataGridHyperlinkColumn.xml
index d0c5d7318ef..9188660e844 100644
--- a/xml/System.Windows.Controls/DataGridHyperlinkColumn.xml
+++ b/xml/System.Windows.Controls/DataGridHyperlinkColumn.xml
@@ -61,15 +61,15 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml" id="Snippethyperlinkc":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippettop":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippettop":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippettop":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetall2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetall2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetall2":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetcustomerclass":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetcustomerclass":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetcustomerclass":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippetallend":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippetallend":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippetallend":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DataGrid/Overview/window11.xaml.cs" id="Snippethyperlink3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datagrid_customcolumns/vb/window1.xaml.vb" id="Snippethyperlink3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataGrid/Overview/window11.xaml.vb" id="Snippethyperlink3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/DataTemplateSelector.xml b/xml/System.Windows.Controls/DataTemplateSelector.xml
index d40156d3473..59bec5ab985 100644
--- a/xml/System.Windows.Controls/DataTemplateSelector.xml
+++ b/xml/System.Windows.Controls/DataTemplateSelector.xml
@@ -38,7 +38,7 @@
  To supply logic to choose which <xref:System.Windows.DataTemplate> to use based on the `Priority` value of the data object, create a subclass of <xref:System.Windows.Controls.DataTemplateSelector> and override the <xref:System.Windows.Controls.DataTemplateSelector.SelectTemplate%2A> method. In the following example, the <xref:System.Windows.Controls.DataTemplateSelector.SelectTemplate%2A> method provides logic to return the appropriate template based on the value of the `Priority` property. The template to return is found in the resources of the enveloping <xref:System.Windows.Window> element.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Overview/TaskListDataTemplateSelector.cs" id="Snippetdtsclass":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/tasklistdatatemplateselector.vb" id="Snippetdtsclass":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/tasklistdatatemplateselector.vb" id="Snippetdtsclass":::  
   
  We can then declare the `TaskListDataTemplateSelector` as a resource:  
   
@@ -131,7 +131,7 @@
  To supply logic to choose which <xref:System.Windows.DataTemplate> to use based on the `Priority` value of the data object, create a subclass of <xref:System.Windows.Controls.DataTemplateSelector> and override the <xref:System.Windows.Controls.DataTemplateSelector.SelectTemplate%2A> method. In the following example, the <xref:System.Windows.Controls.DataTemplateSelector.SelectTemplate%2A> method provides logic to return the appropriate template based on the value of the `Priority` property. The template to return is found in the resources of the enveloping <xref:System.Windows.Window> element.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Overview/TaskListDataTemplateSelector.cs" id="Snippetdtsclass":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataTemplatingIntro_snip/visualbasic/tasklistdatatemplateselector.vb" id="Snippetdtsclass":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DataTemplateSelector/Overview/tasklistdatatemplateselector.vb" id="Snippetdtsclass":::  
   
  We can then declare the `TaskListDataTemplateSelector` as a resource:  
   
diff --git a/xml/System.Windows.Controls/DatePicker.xml b/xml/System.Windows.Controls/DatePicker.xml
index 6d2649d0e1a..54b3a4e775e 100644
--- a/xml/System.Windows.Controls/DatePicker.xml
+++ b/xml/System.Windows.Controls/DatePicker.xml
@@ -84,7 +84,7 @@ DatePicker Control
 - Displays Monday as the first day of the week.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet1":::
 
  ]]></format>
@@ -170,13 +170,13 @@ DatePicker Control
  The following example creates a <xref:System.Windows.Controls.DatePicker> that displays the dates in August 2009 and specifies that each Saturday and Sunday is not selectable.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet2":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet2":::
 
  The <xref:System.Windows.Controls.DatePicker> handles the <xref:System.Windows.Controls.DatePicker.DateValidationError> event, as shown in the following code. If the user enters a date that is not selectable, the example displays a message. If the user enters text that is not a valid date, an exception is thrown.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet3":::
 
  The preceding example produces output that is similar to the following illustration.
 
@@ -231,7 +231,7 @@ DatePicker with dates that are not selectable
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet7":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@ DatePicker with dates that are not selectable
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet7":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -425,13 +425,13 @@ DatePicker with dates that are not selectable
  The following example creates a <xref:System.Windows.Controls.DatePicker> that displays the dates in August 2009 and specifies that each Saturday and Sunday is not selectable.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet2":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet2":::
 
  The <xref:System.Windows.Controls.DatePicker> handles the <xref:System.Windows.Controls.DatePicker.DateValidationError> event, as shown in the following code. If the user enters a date that is not selectable, the example displays a message. If the user enters text that is not a valid date, an exception is thrown.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -558,7 +558,7 @@ DatePicker with dates that are not selectable
  The following example creates a <xref:System.Windows.Controls.DatePicker> that limits the drop-down calendar to display dates only in the year 2009.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet1":::
 
  ]]></format>
@@ -674,7 +674,7 @@ DatePicker with dates that are not selectable
  The following example creates a <xref:System.Windows.Controls.DatePicker> that limits the drop-down calendar to display dates only in the year 2009.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet1":::
 
  ]]></format>
@@ -756,7 +756,7 @@ DatePicker with dates that are not selectable
  The following example creates a <xref:System.Windows.Controls.DatePicker> that displays Monday as the first day of the week.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet1":::
 
  ]]></format>
@@ -1368,7 +1368,7 @@ DatePicker with dates that are not selectable
  The following example creates that <xref:System.Windows.Controls.DatePicker> that displays the date using unabbreviated days of the week and month names.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet1":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/DatePickerDateValidationErrorEventArgs.xml b/xml/System.Windows.Controls/DatePickerDateValidationErrorEventArgs.xml
index f0bae9820ac..bb5f7b1496b 100644
--- a/xml/System.Windows.Controls/DatePickerDateValidationErrorEventArgs.xml
+++ b/xml/System.Windows.Controls/DatePickerDateValidationErrorEventArgs.xml
@@ -40,11 +40,11 @@
  The following example creates a <xref:System.Windows.Controls.DatePicker> that displays the dates in August 2009 and specifies that each Saturday and Sunday is not selectable. The <xref:System.Windows.Controls.DatePicker> handles the <xref:System.Windows.Controls.DatePicker.DateValidationError> event. If the user enters a date that is not selectable, the example displays a message. If the user enters text that is not a valid date, an exception is thrown.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet2":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet2":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/DatePickerFormat.xml b/xml/System.Windows.Controls/DatePickerFormat.xml
index 079c56e1aa4..78fa6c7636b 100644
--- a/xml/System.Windows.Controls/DatePickerFormat.xml
+++ b/xml/System.Windows.Controls/DatePickerFormat.xml
@@ -27,7 +27,7 @@
  The following example creates a <xref:System.Windows.Controls.DatePicker> that displays the date by using unabbreviated days of the week and month names.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/DatePicker/Overview/window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/datepickersnippets/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/DatePicker/Overview/window1.xaml.vb" id="Snippet1":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/datepickersnippets/xaml/window1.xaml" id="Snippet1":::  
   
  ]]></format>
diff --git a/xml/System.Windows.Controls/Decorator.xml b/xml/System.Windows.Controls/Decorator.xml
index 7316df424eb..340efc5d37f 100644
--- a/xml/System.Windows.Controls/Decorator.xml
+++ b/xml/System.Windows.Controls/Decorator.xml
@@ -52,7 +52,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Decorator/Overview/simpleborder.xaml" id="Snippetsimpleborderwholepage":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Decorator/Overview/BasicBorderExample.cs" id="Snippetbasicbordercodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Border_Procedural_snip/visualbasic/basicborderexample.vb" id="Snippetbasicbordercodeexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Decorator/Overview/basicborderexample.vb" id="Snippetbasicbordercodeexamplewholepage":::  
   
  The preceding example produces output that is similar to the following illustration.  
   
diff --git a/xml/System.Windows.Controls/ExpandDirection.xml b/xml/System.Windows.Controls/ExpandDirection.xml
index 2f134e615e7..c5b97f3c3b2 100644
--- a/xml/System.Windows.Controls/ExpandDirection.xml
+++ b/xml/System.Windows.Controls/ExpandDirection.xml
@@ -35,7 +35,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ExpandDirection/Overview/Page1.xaml" id="Snippet1":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ExpandDirection/Overview/Page1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ExpanderExample/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ExpandDirection/Overview/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/Expander.xml b/xml/System.Windows.Controls/Expander.xml
index 2deb416e613..ae69b09102d 100644
--- a/xml/System.Windows.Controls/Expander.xml
+++ b/xml/System.Windows.Controls/Expander.xml
@@ -140,13 +140,13 @@
  The following example shows how to specify the event handler for the <xref:System.Windows.Controls.Expander.Collapsed> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml.cs" id="Snippetcollapsed":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml.vb" id="Snippetcollapsed":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml.vb" id="Snippetcollapsed":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml" id="Snippetcollapsed":::
 
  The following example shows how to define the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml.cs" id="Snippetcollapsedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml.vb" id="Snippetcollapsedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml.vb" id="Snippetcollapsedhandler":::
 
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Expander.ExpandDirection%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml.cs" id="Snippetexpanddirection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml.vb" id="Snippetexpanddirection":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml.vb" id="Snippetexpanddirection":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml" id="Snippetexpanddirection":::
 
  ]]></format>
@@ -314,13 +314,13 @@
  The following example shows how to specify the event handler for the <xref:System.Windows.Controls.Expander.Expanded> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml.cs" id="Snippetexpanded":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml.vb" id="Snippetexpanded":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml.vb" id="Snippetexpanded":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml" id="Snippetexpanded":::
 
  The following example shows how to define the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml.cs" id="Snippetexpandedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml.vb" id="Snippetexpandedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml.vb" id="Snippetexpandedhandler":::
 
  ]]></format>
         </remarks>
@@ -409,7 +409,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Expander.IsExpanded%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml.cs" id="Snippetisexpanded":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ExpanderSnips/visualbasic/window1.xaml.vb" id="Snippetisexpanded":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Expander/Collapsed/window1.xaml.vb" id="Snippetisexpanded":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Expander/Collapsed/Window1.xaml" id="Snippetisexpanded":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/FlowDocumentPageViewer.xml b/xml/System.Windows.Controls/FlowDocumentPageViewer.xml
index 943f502e518..772f56d05d7 100644
--- a/xml/System.Windows.Controls/FlowDocumentPageViewer.xml
+++ b/xml/System.Windows.Controls/FlowDocumentPageViewer.xml
@@ -646,7 +646,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml" id="Snippet_flowdocumentpageviewerxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpageviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpageviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpageviewer":::
 
  ]]></format>
         </remarks>
@@ -732,7 +732,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml" id="Snippet_flowdocumentpageviewerxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpageviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpageviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpageviewer":::
 
  ]]></format>
         </remarks>
@@ -1472,7 +1472,7 @@
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window1.xaml" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window1.xaml.cs" id="Snippet2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1659,7 +1659,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml" id="Snippet_flowdocumentpageviewerxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpageviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpageviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpageviewer":::
 
  ]]></format>
         </remarks>
@@ -1716,7 +1716,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml" id="Snippet_flowdocumentpageviewerxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpageviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpageviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpageviewer":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/FlowDocumentReader.xml b/xml/System.Windows.Controls/FlowDocumentReader.xml
index e49314f81cc..bc7ef9b681b 100644
--- a/xml/System.Windows.Controls/FlowDocumentReader.xml
+++ b/xml/System.Windows.Controls/FlowDocumentReader.xml
@@ -760,7 +760,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentReader.IsFindEnabled%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentreader":::
 
  ]]></format>
         </remarks>
@@ -988,7 +988,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentReader.IsPrintEnabled%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentreader":::
 
  ]]></format>
         </remarks>
@@ -1320,7 +1320,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentReader.MaxZoom%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentreader":::
 
  ]]></format>
         </remarks>
@@ -1408,7 +1408,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentReader.MinZoom%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentreader":::
 
  ]]></format>
         </remarks>
@@ -2165,7 +2165,7 @@
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window3.xaml" id="Snippet5":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window3.xaml.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window3.xaml.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window3.xaml.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -2636,7 +2636,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentReader.Zoom%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentreader":::
 
  ]]></format>
         </remarks>
@@ -2699,7 +2699,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentReader.ZoomIncrement%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentreader":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/FlowDocumentScrollViewer.xml b/xml/System.Windows.Controls/FlowDocumentScrollViewer.xml
index fdaa11478ba..920e3b71f26 100644
--- a/xml/System.Windows.Controls/FlowDocumentScrollViewer.xml
+++ b/xml/System.Windows.Controls/FlowDocumentScrollViewer.xml
@@ -492,7 +492,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentScrollViewer.HorizontalScrollBarVisibility%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentscrollviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
 
  ]]></format>
         </remarks>
@@ -762,7 +762,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentScrollViewer.IsSelectionEnabled%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentscrollviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
 
  ]]></format>
         </remarks>
@@ -849,7 +849,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentScrollViewer.IsToolBarVisible%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentscrollviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
 
  ]]></format>
         </remarks>
@@ -960,7 +960,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentScrollViewer.MaxZoom%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentscrollviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
 
  ]]></format>
         </remarks>
@@ -1047,7 +1047,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentScrollViewer.MinZoom%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentscrollviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
 
  ]]></format>
         </remarks>
@@ -1580,7 +1580,7 @@
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window2.xaml" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window2.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocSelection/VisualBasic/Window2.xaml.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/Selection/Window2.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1871,7 +1871,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentScrollViewer.VerticalScrollBarVisibility%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentscrollviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
 
  ]]></format>
         </remarks>
@@ -1954,7 +1954,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentScrollViewer.Zoom%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentscrollviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
 
  ]]></format>
         </remarks>
@@ -2013,7 +2013,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.FlowDocumentScrollViewer.ZoomIncrement%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentscrollviewer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentscrollviewer":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/Frame.xml b/xml/System.Windows.Controls/Frame.xml
index 7c46c1079de..9bff515a938 100644
--- a/xml/System.Windows.Controls/Frame.xml
+++ b/xml/System.Windows.Controls/Frame.xml
@@ -1035,7 +1035,7 @@
  The following example shows how to navigate to content that is contained by an object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/Navigate/MainWindow.xaml.cs" id="Snippetnavigatetopageobjcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetnavigatetopageobjcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb" id="Snippetnavigatetopageobjcode":::
 
  ]]></format>
         </remarks>
@@ -1089,7 +1089,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.Frame.Navigate%2A> method to navigate to a uniform resource identifier (URI).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/Navigate/MainWindow.xaml.cs" id="Snippetnavigatetopagenavcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetnavigatetopagenavcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb" id="Snippetnavigatetopagenavcode":::
 
  ]]></format>
         </remarks>
@@ -1384,9 +1384,9 @@
 >  <xref:System.Windows.Controls.Frame.NavigationService%2A> does not return a reference to the same <xref:System.Windows.Controls.Frame.NavigationService%2A> as calling <xref:System.Windows.Navigation.NavigationService.GetNavigationService%2A> and passing <xref:System.Windows.Controls.Frame> does. The former returns the <xref:System.Windows.Controls.Frame.NavigationService%2A> that is owned by the <xref:System.Windows.Controls.Frame> while the latter returns the <xref:System.Windows.Controls.Frame.NavigationService%2A> for the navigation host that navigated to the content in which the <xref:System.Windows.Controls.Frame> is hosted. The following code demonstrates the differences.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/NavigationService/Window1.xaml.cs" id="Snippetnsframediffcode1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/window1.xaml.vb" id="Snippetnsframediffcode1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/window1.xaml.vb" id="Snippetnsframediffcode1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/NavigationService/Window1.xaml.cs" id="Snippetnsframediffcode2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NSGNSvsFNSSnippets/visualbasic/window1.xaml.vb" id="Snippetnsframediffcode2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/NavigationService/window1.xaml.vb" id="Snippetnsframediffcode2":::
 
  ]]></format>
         </remarks>
@@ -1486,7 +1486,7 @@
  The following example demonstrates how to make sure the navigation chrome of a <xref:System.Windows.Controls.Frame> is always visible by setting <xref:System.Windows.Controls.Frame.NavigationUIVisibility%2A> to <xref:System.Windows.Navigation.NavigationUIVisibility.Visible>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/NavigationUIVisibility/Window1.xaml.cs" id="Snippetsetnavigationuivisibility":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/window1.xaml.vb" id="Snippetsetnavigationuivisibility":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/window1.xaml.vb" id="Snippetsetnavigationuivisibility":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/XAML/Window1.xaml" id="Snippetsetnavigationuivisibility":::
 
  ]]></format>
@@ -1884,7 +1884,7 @@
  The following example shows how to navigate to a uniform resource identifier (URI) by setting the <xref:System.Windows.Controls.Frame.Source%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/Navigate/MainWindow.xaml.cs" id="Snippetnavigatetopagesrccode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetnavigatetopagesrccode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb" id="Snippetnavigatetopagesrccode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/Grid.xml b/xml/System.Windows.Controls/Grid.xml
index b90b728469f..b911d83558e 100644
--- a/xml/System.Windows.Controls/Grid.xml
+++ b/xml/System.Windows.Controls/Grid.xml
@@ -602,7 +602,7 @@
  Events defined in Extensible Application Markup Language (XAML) are handled using code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Grid/IsSharedSizeScope/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/gridIssharedsizescopeProp/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Grid/IsSharedSizeScope/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/GridSplitter.xml b/xml/System.Windows.Controls/GridSplitter.xml
index b24585de764..352d1f5e3a8 100644
--- a/xml/System.Windows.Controls/GridSplitter.xml
+++ b/xml/System.Windows.Controls/GridSplitter.xml
@@ -57,7 +57,7 @@
  The following example shows how to define a <xref:System.Windows.Controls.GridSplitter> that resizes columns in a <xref:System.Windows.Controls.Grid> by overlaying the edge of a column.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml.cs" id="Snippetgridsplittersimpleexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml.vb" id="Snippetgridsplittersimpleexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml.vb" id="Snippetgridsplittersimpleexample":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml" id="Snippetgridsplittersimpleexample":::
 
  The following example shows how to define a <xref:System.Windows.Controls.GridSplitter> that resizes columns in a <xref:System.Windows.Controls.Grid> and that occupies a column in the <xref:System.Windows.Controls.Grid>.
@@ -147,7 +147,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.GridSplitter.DragIncrement%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml.cs" id="Snippetdragincrement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml.vb" id="Snippetdragincrement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml.vb" id="Snippetdragincrement":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml" id="Snippetdragincrement":::
 
  ]]></format>
@@ -225,7 +225,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.GridSplitter.KeyboardIncrement%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml.cs" id="Snippetkeyboardincrement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml.vb" id="Snippetkeyboardincrement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml.vb" id="Snippetkeyboardincrement":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml" id="Snippetkeyboardincrement":::
 
  ]]></format>
@@ -530,7 +530,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.GridSplitter.ResizeBehavior%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml.cs" id="Snippetresizebehavior":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml.vb" id="Snippetresizebehavior":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml.vb" id="Snippetresizebehavior":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml" id="Snippetresizebehavior":::
 
  ]]></format>
@@ -616,7 +616,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.GridSplitter.ResizeDirection%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml.cs" id="Snippetresizedirection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml.vb" id="Snippetresizedirection":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml.vb" id="Snippetresizedirection":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml" id="Snippetresizedirection":::
 
  ]]></format>
@@ -700,7 +700,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.GridSplitter.ShowsPreview%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml.cs" id="Snippetshowspreview":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GridSplitterSnips/visualbasic/window1.xaml.vb" id="Snippetshowspreview":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridSplitter/Overview/window1.xaml.vb" id="Snippetshowspreview":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridSplitter/Overview/Window1.xaml" id="Snippetshowspreview":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/GridView.xml b/xml/System.Windows.Controls/GridView.xml
index 53e8abb2ed4..a62f7ee0f10 100644
--- a/xml/System.Windows.Controls/GridView.xml
+++ b/xml/System.Windows.Controls/GridView.xml
@@ -55,7 +55,7 @@
  The following example shows how to define the columns of a <xref:System.Windows.Controls.GridView>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml.cs" id="Snippetgridviewcolumn":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb" id="Snippetgridviewcolumn":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb" id="Snippetgridviewcolumn":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml" id="Snippetgridviewcolumn":::
 
  To style the rows in a <xref:System.Windows.Controls.GridView>, define a style for the <xref:System.Windows.Controls.ListViewItem> controls in the <xref:System.Windows.Controls.ListView>.
@@ -232,7 +232,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml" id="Snippetgridviewallowscolumnreorderpart2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml.cs" id="Snippetgridviewallowscolumnreorder":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb" id="Snippetgridviewallowscolumnreorder":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb" id="Snippetgridviewallowscolumnreorder":::
 
  ]]></format>
         </remarks>
@@ -959,7 +959,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml" id="Snippetgridviewallowscolumnreorderpart2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml.cs" id="Snippetgridviewallowscolumnreorder":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb" id="Snippetgridviewallowscolumnreorder":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb" id="Snippetgridviewallowscolumnreorder":::
 
  ]]></format>
         </remarks>
@@ -1060,7 +1060,7 @@
  The following example shows how to add a <xref:System.Windows.Controls.GridViewColumn> to the columns in a <xref:System.Windows.Controls.GridView> by using the <xref:System.Collections.ObjectModel.Collection%601.Add%2A> method on the <xref:System.Windows.Controls.GridView.Columns%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml.cs" id="Snippetaddtocolumns":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb" id="Snippetaddtocolumns":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb" id="Snippetaddtocolumns":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/GridViewColumn.xml b/xml/System.Windows.Controls/GridViewColumn.xml
index 0fb256e96bf..b9148065266 100644
--- a/xml/System.Windows.Controls/GridViewColumn.xml
+++ b/xml/System.Windows.Controls/GridViewColumn.xml
@@ -433,7 +433,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.GridViewColumn.DisplayMemberBinding%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml.cs" id="Snippetgridviewcolumnproperties":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb" id="Snippetgridviewcolumnproperties":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb" id="Snippetgridviewcolumnproperties":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml" id="Snippetgridviewcolumnproperties":::
 
  ]]></format>
@@ -506,7 +506,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.GridViewColumn.Header%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml.cs" id="Snippetgridviewcolumnproperties":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb" id="Snippetgridviewcolumnproperties":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb" id="Snippetgridviewcolumnproperties":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml" id="Snippetgridviewcolumnproperties":::
 
  ]]></format>
@@ -1185,7 +1185,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.GridViewColumn.Width%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml.cs" id="Snippetgridviewcolumnproperties":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb" id="Snippetgridviewcolumnproperties":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb" id="Snippetgridviewcolumnproperties":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml" id="Snippetgridviewcolumnproperties":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/GroupStyle.xml b/xml/System.Windows.Controls/GroupStyle.xml
index 0003001c235..44885a5c182 100644
--- a/xml/System.Windows.Controls/GroupStyle.xml
+++ b/xml/System.Windows.Controls/GroupStyle.xml
@@ -44,7 +44,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml" id="Snippetxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml.cs" id="Snippetcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb" id="Snippetcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb" id="Snippetcode":::
 
  ]]></format>
     </remarks>
@@ -386,7 +386,7 @@
  The following example shows the `GroupByPrice` class, the `PurchaseItem` class, and the collection that the <xref:System.Windows.Controls.ListBox> is bound to.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/ContentStringFormat/Window1.xaml.cs" id="Snippetgroupstyledata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/window1.xaml.vb" id="Snippetgroupstyledata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/window1.xaml.vb" id="Snippetgroupstyledata":::
 
  ]]></format>
         </remarks>
@@ -438,7 +438,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml" id="Snippetxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml.cs" id="Snippetcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb" id="Snippetcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb" id="Snippetcode":::
 
  The following example shows how to use the <xref:System.Windows.Controls.GroupStyle.HeaderTemplate%2A> property:
 
diff --git a/xml/System.Windows.Controls/HeaderedContentControl.xml b/xml/System.Windows.Controls/HeaderedContentControl.xml
index d7473953f77..2660708d959 100644
--- a/xml/System.Windows.Controls/HeaderedContentControl.xml
+++ b/xml/System.Windows.Controls/HeaderedContentControl.xml
@@ -146,7 +146,7 @@ TabControl with different types in the Header property
  The following example tests whether the control has a header containing content.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentPresenter/ContentSource/Page1.xaml.cs" id="Snippethasheader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HeaderedContentControl/VisualBasic/Page1.xaml.vb" id="Snippethasheader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/HeaderedContentControl/HasHeader/Page1.xaml.vb" id="Snippethasheader":::
 
  ]]></format>
         </remarks>
@@ -335,7 +335,7 @@ TabControl with different types in the Header property
  The following example implements the <xref:System.IFormattable.ToString%2A?displayProperty=nameWithType> method to return either the `Name` of the student or a string that lists the student's courses.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/ContentStringFormat/Window1.xaml.cs" id="Snippettabcontroltostring":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/window1.xaml.vb" id="Snippettabcontroltostring":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/window1.xaml.vb" id="Snippettabcontroltostring":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/HeaderedItemsControl.xml b/xml/System.Windows.Controls/HeaderedItemsControl.xml
index 63bc6f2b107..f87201e4786 100644
--- a/xml/System.Windows.Controls/HeaderedItemsControl.xml
+++ b/xml/System.Windows.Controls/HeaderedItemsControl.xml
@@ -163,7 +163,7 @@
  The following example shows how to use this property to determine whether the control has a header.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/HeaderedItemsControl/Overview/Page1.xaml.cs" id="Snippetheadereditemscontrol_hasheader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HeaderedItemsControl/visualbasic/page1.xaml.vb" id="Snippetheadereditemscontrol_hasheader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/HeaderedItemsControl/HasHeader/page1.xaml.vb" id="Snippetheadereditemscontrol_hasheader":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/Image.xml b/xml/System.Windows.Controls/Image.xml
index c5d1e6809a2..6ae07fed153 100644
--- a/xml/System.Windows.Controls/Image.xml
+++ b/xml/System.Windows.Controls/Image.xml
@@ -559,7 +559,7 @@
  The following example demonstrates how to use this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Image/Stretch/ImageSimpleExample.xaml.cs" id="Snippetimagesimpleexampleinlinecode2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageSimpleExample.xaml.vb" id="Snippetimagesimpleexampleinlinecode2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageSimpleExample.xaml.vb" id="Snippetimagesimpleexampleinlinecode2":::
 
  ]]></format>
         </remarks>
@@ -610,7 +610,7 @@
  The following example demonstrates how to use this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Image/Stretch/ImageSimpleExample.xaml.cs" id="Snippetimagesimpleexampleinlinecode2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample_snip/VB/ImageSimpleExample.xaml.vb" id="Snippetimagesimpleexampleinlinecode2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Image/Stretch/ImageSimpleExample.xaml.vb" id="Snippetimagesimpleexampleinlinecode2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/InkCanvas.xml b/xml/System.Windows.Controls/InkCanvas.xml
index 9fba8293bca..f69fe1c0958 100644
--- a/xml/System.Windows.Controls/InkCanvas.xml
+++ b/xml/System.Windows.Controls/InkCanvas.xml
@@ -47,7 +47,7 @@
  The following example demonstrates how to simulate the use of both a pen and a highlighter on the same <xref:System.Windows.Controls.InkCanvas>. The example assumes that the root element in the markup language (XAML) file is a <xref:System.Windows.Controls.DockPanel> called `root`. It also assumes that there is a <xref:System.Windows.Controls.Button> called `switchHighlighter` and that both the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> and <xref:System.Windows.FrameworkElement.Loaded> events are connected to the example's event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet3":::
 
  The following example declares two <xref:System.Windows.Controls.InkCanvas> objects in XAML and establishes data binding between them and other data sources. The first <xref:System.Windows.Controls.InkCanvas>, called `ic`, is bound to two data sources. The <xref:System.Windows.Controls.InkCanvas.EditingMode%2A> and <xref:System.Windows.Controls.InkCanvas.DefaultDrawingAttributes%2A> properties on `ic` are bound to <xref:System.Windows.Controls.ListBox> objects, which are, in turn, bound to arrays defined in the XAML. The <xref:System.Windows.Controls.InkCanvas.EditingMode%2A>, <xref:System.Windows.Controls.InkCanvas.DefaultDrawingAttributes%2A>, and <xref:System.Windows.Controls.InkCanvas.Strokes%2A> properties of the second <xref:System.Windows.Controls.InkCanvas> are bound to the first <xref:System.Windows.Controls.InkCanvas> in the following code.
 
@@ -127,7 +127,7 @@
  The following example reports the value of <xref:System.Windows.Controls.InkCanvas.ActiveEditingMode%2A> whenever it changes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet36":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet36":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet36":::
 
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@
  The following example reports the value of <xref:System.Windows.Controls.InkCanvas.ActiveEditingMode%2A> whenever it changes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet36":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet36":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet36":::
 
  ]]></format>
         </remarks>
@@ -331,7 +331,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Controls.InkCanvas.Background%2A> property on an <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet37":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet37":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet37":::
 
  ]]></format>
         </remarks>
@@ -427,7 +427,7 @@
 ## Examples
  The following example demonstrates how to set the position of a <xref:System.Windows.Controls.Label> on an <xref:System.Windows.Controls.InkCanvas>.
 
- :::code language="xml" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml" id="Snippet35":::
+ :::code language="xml" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -499,7 +499,7 @@
  The following example copies an element to the Clipboard and pastes it to the <xref:System.Windows.Controls.InkCanvas>. This example assumes that there is an element called `rect1`, and that the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> events have been connected to the event handlers in the example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -567,7 +567,7 @@
  The following example adds a <xref:System.Windows.Controls.TextBlock> to an <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -610,7 +610,7 @@
  The following example selects two elements on an <xref:System.Windows.Controls.InkCanvas> and copies them to the Clipboard. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textbox1` and a <xref:System.Windows.Controls.Button> called `button1 -` and that both controls are child elements of the <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -655,7 +655,7 @@
  The following example selects and cuts two elements on an <xref:System.Windows.Controls.InkCanvas>. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textbox1` and a <xref:System.Windows.Controls.Button> called `button1` - and that both controls are child elements of the <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -706,7 +706,7 @@
  The following example demonstrates how to use two <xref:System.Windows.Ink.DrawingAttributes> objects to simulate the experience of using a pen and a highlighter on the same <xref:System.Windows.Controls.InkCanvas>. The example assumes that the root element in the markup language (XAML) file is a <xref:System.Windows.Controls.DockPanel> called `root`. It also assumes that there is a <xref:System.Windows.Controls.Button> called `switchHighlighter` and that the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet3":::
 
  The following example demonstrates how to bind the <xref:System.Windows.Controls.InkCanvas.DefaultDrawingAttributes%2A> property to a data source.
 
@@ -777,7 +777,7 @@
  The following example checks the value of the <xref:System.Windows.Ink.DrawingAttributes.IsHighlighter%2A> property of the new <xref:System.Windows.Ink.DrawingAttributes> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -837,7 +837,7 @@
 > Only the strokes that are added to the <xref:System.Windows.Controls.InkCanvas> after the <xref:System.Windows.Controls.InkCanvas.DefaultStylusPointDescription%2A> is set to contain the additional property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -931,7 +931,7 @@
  The following example creates an application that uses the various types of editing modes on an <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/EditingMode/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ICEditingModeSample/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/EditingMode/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -989,7 +989,7 @@
  The following example checks whether the <xref:System.Windows.Controls.InkCanvas.EditingMode%2A> property is set to <xref:System.Windows.Controls.InkCanvasEditingMode.Ink> or <xref:System.Windows.Controls.InkCanvasEditingMode.Select>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -1069,7 +1069,7 @@
  The following example demonstrates how to allow a user to partially erase strokes with the inverted tip of a stylus. An elliptical cursor appears on the <xref:System.Windows.Controls.InkCanvas> when the user erases ink.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1126,7 +1126,7 @@
  The following example checks whether the <xref:System.Windows.Controls.InkCanvas.EditingModeInverted%2A> property is set to <xref:System.Windows.Controls.InkCanvasEditingMode.EraseByPoint> or <xref:System.Windows.Controls.InkCanvasEditingMode.EraseByStroke>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet20":::
 
  ]]></format>
         </remarks>
@@ -1268,7 +1268,7 @@
  The following example demonstrates how to allow a user to partially erase strokes with the inverted tip of a stylus. An elliptical cursor appears on the <xref:System.Windows.Controls.InkCanvas> when the user erases ink.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1410,7 +1410,7 @@
  The following example demonstrates how to get the position of a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -1449,7 +1449,7 @@
  The following example demonstrates how to get the enabled application gestures from the <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet24":::
 
  ]]></format>
         </remarks>
@@ -1506,7 +1506,7 @@
  The following example demonstrates how to get the position of a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet31":::
 
  ]]></format>
         </remarks>
@@ -1562,7 +1562,7 @@
  The following example demonstrates how to get the position of a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet32":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet32":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -1610,7 +1610,7 @@
  The following example doubles the height and width of each selected element on an <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -1658,7 +1658,7 @@
  The following example changes the color of each selected stroke on an <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -1699,7 +1699,7 @@
  The following example prevents the user from making a selection smaller than its original size.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -1755,7 +1755,7 @@
  The following example demonstrates how to get the position of a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet33":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet33":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet33":::
 
  ]]></format>
         </remarks>
@@ -1867,7 +1867,7 @@
  The following example demonstrates how use <xref:System.Windows.Controls.InkCanvas.HitTestSelection%2A> to determine whether to create a <xref:System.Windows.DataObject> to initiate drag and drop.  To implement drag and drop between two <xref:System.Windows.Controls.InkCanvas> objects, see [How to: Drag and Drop Ink](/dotnet/framework/wpf/advanced/how-to-drag-and-drop-ink).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/HitTestSelection/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -2015,7 +2015,7 @@
 ## Examples
  The following example demonstrates how to set the position of a <xref:System.Windows.Controls.Label> on an <xref:System.Windows.Controls.InkCanvas>.
 
- :::code language="xml" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml" id="Snippet35":::
+ :::code language="xml" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -2149,7 +2149,7 @@
  The following example prevents a user from moving and resizing the elements and strokes on a <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -2806,7 +2806,7 @@
  The following example copies an element to the Clipboard and pastes it to the <xref:System.Windows.Controls.InkCanvas>. This example assumes that there is an element called `rect1`, and that the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> events have been connected to the event handlers in the example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2854,7 +2854,7 @@
  The following example copies an element to the Clipboard and pastes it to the <xref:System.Windows.Controls.InkCanvas>. This example assumes that there is an element called `rect1`, and that the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> events are connected to the event handlers in the example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2924,7 +2924,7 @@
  The following example sets the <xref:System.Windows.Controls.InkCanvas.PreferredPasteFormats%2A> to make the <xref:System.Windows.Controls.InkCanvas> accept Extensible Application Markup Language (XAML) format, Ink Serialized Format (ISF).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet26":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet26":::
 
  The following example accomplishes the same thing in Extensible Application Markup Language (XAML).
 
@@ -2974,7 +2974,7 @@
  The following example prevents a user from moving and resizing the elements and strokes on a <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -3043,7 +3043,7 @@
 ## Examples
  The following example demonstrates how to set the position of a <xref:System.Windows.Controls.Label> on an <xref:System.Windows.Controls.InkCanvas>.
 
- :::code language="xml" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml" id="Snippet35":::
+ :::code language="xml" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -3143,7 +3143,7 @@
  The following example selects all the strokes and two elements on an <xref:System.Windows.Controls.InkCanvas>. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textbox1` and a <xref:System.Windows.Controls.Button> called `button1` - and that both controls are child elements of the <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3197,7 +3197,7 @@
  The following example selects all the strokes and two elements on an <xref:System.Windows.Controls.InkCanvas>.  This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textbox1` and a <xref:System.Windows.Controls.Button> called `button1` - and that both controls are child elements of the <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3248,7 +3248,7 @@
  The following example selects all the strokes and two elements on an <xref:System.Windows.Controls.InkCanvas>.  This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textbox1` and a <xref:System.Windows.Controls.Button> called `button1` - and that both controls are child elements of the <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3294,7 +3294,7 @@
  The following example prevents the user from making a selection smaller than its original size.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -3347,7 +3347,7 @@
  The following example makes selected strokes royal blue.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -3394,7 +3394,7 @@
  The following example unselects items on an <xref:System.Windows.Controls.InkCanvas> after the user moves them.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet19":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet19":::
 
  ]]></format>
         </remarks>
@@ -3444,7 +3444,7 @@
  The following example prevents the user from moving selected items vertically on an <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -3492,7 +3492,7 @@
  The following example unselects all the items on an <xref:System.Windows.Controls.InkCanvas> after the user re-sizes the selection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -3542,7 +3542,7 @@
  The following example prevents the user from making a selection smaller than its original size.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -3588,7 +3588,7 @@
  The following example demonstrates how to set the position of a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
@@ -3675,7 +3675,7 @@
  The following example demonstrates how to set the position of a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet29":::
 
  ]]></format>
         </remarks>
@@ -3718,7 +3718,7 @@
  The following example demonstrates how to set the position of a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet30":::
 
  ]]></format>
         </remarks>
@@ -3761,7 +3761,7 @@
  The following example demonstrates how to set the position of a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet27":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet27":::
 
  ]]></format>
         </remarks>
@@ -3822,7 +3822,7 @@
  The following example saves the time as a custom property when a user adds a stroke to the <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
@@ -3907,7 +3907,7 @@
  The following example reports the number of strokes that are on an <xref:System.Windows.Controls.InkCanvas> when the <xref:System.Windows.Controls.InkCanvas.StrokeErased> event occurs. If <xref:System.Windows.Controls.InkCanvas.EditingMode%2A> is set to <xref:System.Windows.Controls.InkCanvasEditingMode.EraseByPoint> and the user erases the middle of a stroke, the number of strokes on the <xref:System.Windows.Controls.InkCanvas> increases. This is because the old stroke was replaced by two new strokes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -3977,7 +3977,7 @@
  The following example prevents any strokes rendered as highlighters from being erased. The example assumes that the <xref:System.Windows.Controls.InkCanvas> is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -4027,7 +4027,7 @@
  The following example demonstrates how to use two <xref:System.Windows.Ink.StrokeCollection> objects for the same <xref:System.Windows.Controls.InkCanvas>. In this example, player one and player two each use an individual "inking surface" even though they share the same <xref:System.Windows.Controls.InkCanvas>. This example assumes the click event is connected to the event handler, `switchPlayersButton_Click`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet15":::
 
  The following example demonstrates how to bind the <xref:System.Windows.Controls.InkCanvas.Strokes%2A> property of an <xref:System.Windows.Controls.InkCanvas> to another <xref:System.Windows.Controls.InkCanvas>.
 
@@ -4097,7 +4097,7 @@
  The following example demonstrates how to use two <xref:System.Windows.Ink.StrokeCollection> objects that are co-located on the same <xref:System.Windows.Controls.InkCanvas>. In this example, player one and player two each use an individual "inking surface" even though they share the same <xref:System.Windows.Controls.InkCanvas>. This example assumes that the `switchPlayersButton_Click` event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -4234,7 +4234,7 @@
 ## Examples
  The following example demonstrates how to set the position of a <xref:System.Windows.Controls.Label> on an <xref:System.Windows.Controls.InkCanvas>.
 
- :::code language="xml" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml" id="Snippet35":::
+ :::code language="xml" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -4315,7 +4315,7 @@
  The following example demonstrates how to use a cursor that is different than the one supplied by the <xref:System.Windows.Controls.InkCanvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/InkCanvasClipboardFormat.xml b/xml/System.Windows.Controls/InkCanvasClipboardFormat.xml
index f24012265d2..77ed5aeb9fe 100644
--- a/xml/System.Windows.Controls/InkCanvasClipboardFormat.xml
+++ b/xml/System.Windows.Controls/InkCanvasClipboardFormat.xml
@@ -28,7 +28,7 @@
  The following example sets the <xref:System.Windows.Controls.InkCanvas.PreferredPasteFormats%2A> to make the <xref:System.Windows.Controls.InkCanvas> accept Extensible Application Markup Language (XAML) format, Ink Serialized Format (ISF).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet26":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet26":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/InkCanvasEditingMode.xml b/xml/System.Windows.Controls/InkCanvasEditingMode.xml
index 449b2aed6d8..2f0d0eafafd 100644
--- a/xml/System.Windows.Controls/InkCanvasEditingMode.xml
+++ b/xml/System.Windows.Controls/InkCanvasEditingMode.xml
@@ -33,7 +33,7 @@
  The following example demonstrates how to allow users to partially erase strokes with the inverted tip of a stylus. An elliptical cursor appears on the <xref:System.Windows.Controls.InkCanvas> when the user erases ink.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkCanvasSamples/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/ActiveEditingMode/Window1.xaml.vb" id="Snippet6":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/InkCanvasSelectionHitResult.xml b/xml/System.Windows.Controls/InkCanvasSelectionHitResult.xml
index e233d081a94..63d6fb9aeb9 100644
--- a/xml/System.Windows.Controls/InkCanvasSelectionHitResult.xml
+++ b/xml/System.Windows.Controls/InkCanvasSelectionHitResult.xml
@@ -37,7 +37,7 @@
  The following example demonstrates how use <xref:System.Windows.Controls.InkCanvas.HitTestSelection%2A> to determine whether to create a <xref:System.Windows.DataObject> to initiate drag and drop.  To implement drag and drop between two <xref:System.Windows.Controls.InkCanvas> objects, see [How to: Drag and Drop Ink](/dotnet/framework/wpf/advanced/how-to-drag-and-drop-ink).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/HitTestSelection/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkDragDrop/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/HitTestSelection/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/InkPresenter.xml b/xml/System.Windows.Controls/InkPresenter.xml
index 8ca6cfd70ca..5f25b1009e9 100644
--- a/xml/System.Windows.Controls/InkPresenter.xml
+++ b/xml/System.Windows.Controls/InkPresenter.xml
@@ -36,7 +36,7 @@
  The following example programmatically creates a stroke and adds it to the <xref:System.Windows.Controls.InkPresenter>. Only static rendering is done in this example, which assumes that the <xref:System.Windows.FrameworkElement.Loaded> event is connected to the event handler, `WindowLoaded`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -141,7 +141,7 @@
  The following example demonstrates how to attach the visual and <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer.DrawingAttributes%2A> of a <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer> to an <xref:System.Windows.Controls.InkPresenter>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/StylusControl.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -189,7 +189,7 @@
  The following example re-attaches the visual of a <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer> to the <xref:System.Windows.Controls.InkPresenter> whenever the <xref:System.Windows.Ink.DrawingAttributes> on the changes.  This example assumes that the <xref:System.Windows.Ink.DrawingAttributes.AttributeChanged> event is attached to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.cs" id="Snippet39":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/InkSelector.vb" id="Snippet39":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.vb" id="Snippet39":::
 
  ]]></format>
         </remarks>
@@ -368,7 +368,7 @@
  The following example programmatically creates a stroke and adds it to the <xref:System.Windows.Controls.InkPresenter>. The example assumes that the <xref:System.Windows.FrameworkElement.Loaded> event is connected to the event handler, `WindowLoaded`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkPresenterSample/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ItemCollection.xml b/xml/System.Windows.Controls/ItemCollection.xml
index 31ad6abf284..87d99fc03a2 100644
--- a/xml/System.Windows.Controls/ItemCollection.xml
+++ b/xml/System.Windows.Controls/ItemCollection.xml
@@ -84,16 +84,16 @@
  The following example shows how to sort the content of a <xref:System.Windows.Controls.ListBox> named `myListBox`. In this example, `Content` is the name of the property to sort by.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ItemCollection/Overview/Window1.xaml.cs" id="Snippetsort":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/window1.xaml.vb" id="Snippetsort":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/window1.xaml.vb" id="Snippetsort":::
 
  When you do this, the view might or might not be the default view, depending on how the data is set up on your <xref:System.Windows.Controls.ItemsControl>. For example, when the <xref:System.Windows.Controls.ItemsControl.ItemsSource%2A> property is bound to a <xref:System.Windows.Data.CollectionViewSource>, the view that you obtain using the <xref:System.Windows.Controls.ItemsControl.Items%2A> property is not the default view.
 
  If your <xref:System.Windows.Controls.ItemsControl> is bound (you are using the <xref:System.Windows.Controls.ItemsControl.ItemsSource%2A> property), then you can do the following to get the default view:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml.cs" id="Snippetmyview":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb" id="Snippetmyview":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb" id="Snippetmyview":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml.cs" id="Snippetgetview":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb" id="Snippetgetview":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb" id="Snippetgetview":::
 
  Alternately, you can specify filtering, sorting, and grouping criteria in XAML using <xref:System.Windows.Data.CollectionViewSource>.
 
@@ -375,7 +375,7 @@
  The following example shows how to use this method. In the example, `sbar` is a <xref:System.Windows.Controls.Primitives.StatusBar> control, which is an <xref:System.Windows.Controls.ItemsControl>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/ToolTip/Window1.xaml.cs" id="Snippetmakeprogressbar":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/window1.xaml.vb" id="Snippetmakeprogressbar":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/window1.xaml.vb" id="Snippetmakeprogressbar":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ItemsControl.xml b/xml/System.Windows.Controls/ItemsControl.xml
index 91a1077bb59..228978e8c7b 100644
--- a/xml/System.Windows.Controls/ItemsControl.xml
+++ b/xml/System.Windows.Controls/ItemsControl.xml
@@ -94,7 +94,7 @@ ListBox that contains multiple types of objects
  The following examples demonstrate binding data to an <xref:System.Windows.Controls.ItemsControl>. The first example creates a class called `MyData` that is a simple string collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb" id="Snippet8":::
 
  The following example binds the <xref:System.Windows.Controls.ItemsControl.ItemsSource%2A> object of an <xref:System.Windows.Controls.ItemsControl> to `MyData`.
 
@@ -102,7 +102,7 @@ ListBox that contains multiple types of objects
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml" id="Snippet6":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb" id="Snippet9":::
 
  The following illustration shows the <xref:System.Windows.Controls.ListBox> control created in the previous example.
 
@@ -121,7 +121,7 @@ ListBox that contains multiple types of objects
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml" id="Snippet3":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb" id="Snippet4":::
 
  The following illustration shows the <xref:System.Windows.Controls.ListBox> created in the previous example.
 
@@ -848,7 +848,7 @@ ListBox that contains multiple types of objects
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml" id="Snippetxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml.cs" id="Snippetcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb" id="Snippetcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb" id="Snippetcode":::
 
  ]]></format>
         </remarks>
@@ -1362,7 +1362,7 @@ ListBox that contains multiple types of objects
  The following example gets the item container and calls <xref:System.Windows.Data.BindingGroup.UpdateSources%2A> on the container's <xref:System.Windows.Data.BindingGroup> to validate the data. You must validate the data by calling a method on the item container's <xref:System.Windows.FrameworkContentElement.BindingGroup%2A>, not on the <xref:System.Windows.Controls.ItemsControl.ItemBindingGroup%2A> of the <xref:System.Windows.Controls.ItemsControl>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window2.xaml.cs" id="Snippetupdatesources":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window2.xaml.vb" id="Snippetupdatesources":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window2.xaml.vb" id="Snippetupdatesources":::
 
  ]]></format>
         </remarks>
@@ -1738,7 +1738,7 @@ ListBox that contains multiple types of objects
  The following examples demonstrate binding data to an <xref:System.Windows.Controls.ItemsControl>. The first example creates a class called `MyData` that is a simple string collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb" id="Snippet8":::
 
  The following example binds the <xref:System.Windows.Controls.ItemsControl.ItemsSource%2A> object of an <xref:System.Windows.Controls.ItemsControl> to `MyData`.
 
@@ -1746,7 +1746,7 @@ ListBox that contains multiple types of objects
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml" id="Snippet6":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb" id="Snippet9":::
 
  The following illustration shows the <xref:System.Windows.Controls.ListBox> control created in the previous example.
 
@@ -1765,7 +1765,7 @@ ListBox that contains multiple types of objects
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml" id="Snippet3":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ControlContentOverviewSnippets/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContentControl/Overview/Window1.xaml.vb" id="Snippet4":::
 
  The following illustration shows the <xref:System.Windows.Controls.ListBox> created in the previous example.
 
@@ -1776,16 +1776,16 @@ ListBox that contains multiple types of objects
  For example, if you have an instance of a <xref:System.Windows.Controls.ListBox>, `myListBox`, you can do the following to sort the content of the <xref:System.Windows.Controls.ListBox>. In this example, `Content` is the name of the property to sort by.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ItemCollection/Overview/Window1.xaml.cs" id="Snippetsort":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxSort_snip/visualbasic/window1.xaml.vb" id="Snippetsort":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ItemCollection/Overview/window1.xaml.vb" id="Snippetsort":::
 
  Note that when you do this, if the control is bound to a collection directly, the default collection view is used, and the sort criteria are applied to all other controls bound to the same collection directly. The view will not be the default view if  the <xref:System.Windows.Controls.ItemsControl.ItemsSource%2A> property is bound to a <xref:System.Windows.Data.CollectionViewSource>.
 
  If your <xref:System.Windows.Controls.ItemsControl> is bound directly to a collection, then you can do the following to get the default view:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml.cs" id="Snippetmyview":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb" id="Snippetmyview":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb" id="Snippetmyview":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GroupStyle/Overview/Window1.xaml.cs" id="Snippetgetview":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GroupingSample/visualbasic/window1.xaml.vb" id="Snippetgetview":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/Overview/window1.xaml.vb" id="Snippetgetview":::
 
  Alternately, you can specify filtering, sorting, and grouping criteria in XAML or code by using a <xref:System.Windows.Data.CollectionViewSource>.
 
@@ -2312,7 +2312,7 @@ ListBox that contains multiple types of objects
  The following example shows the implementation of the `AuctionItemDataTemplateSelector` class with an override of the <xref:System.Windows.Controls.DataTemplateSelector.SelectTemplate%2A> method:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ItemsControl/ItemTemplateSelector/AuctionItemDataTemplateSelector.cs" id="Snippetdatatemplateselector":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataTemplateSelector/visualbasic/auctionitemdatatemplateselector.vb" id="Snippetdatatemplateselector":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ItemsControl/ItemTemplateSelector/auctionitemdatatemplateselector.vb" id="Snippetdatatemplateselector":::
 
  In this case, within the <xref:System.Windows.Controls.DataTemplateSelector.SelectTemplate%2A> method of the class, there is logic to return the appropriate template based on the value of the `SpecialFeatures` property of the `item` object passed. The template to return is found in the resources of the enveloping <xref:System.Windows.Window> element.
 
diff --git a/xml/System.Windows.Controls/ListBox.xml b/xml/System.Windows.Controls/ListBox.xml
index d3fb1cc3747..762f327f0ce 100644
--- a/xml/System.Windows.Controls/ListBox.xml
+++ b/xml/System.Windows.Controls/ListBox.xml
@@ -66,7 +66,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -454,7 +454,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.ListBox.ScrollIntoView%2A> method to scroll an item in the list box into the viewport.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/ScrollIntoView/Window1.xaml.cs" id="Snippetlistboxscrollintoview":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml.vb" id="Snippetlistboxscrollintoview":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml.vb" id="Snippetlistboxscrollintoview":::
 
  ]]></format>
         </remarks>
@@ -492,7 +492,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.ListBox.SelectAll%2A> method to select and highlight all the items in a list box.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/ScrollIntoView/Window1.xaml.cs" id="Snippetlistboxselectall":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml.vb" id="Snippetlistboxselectall":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml.vb" id="Snippetlistboxselectall":::
 
  ]]></format>
         </remarks>
@@ -562,7 +562,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.ListBox.SelectedItems%2A> property to determine whether a list box has any selected items.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/ScrollIntoView/Window1.xaml.cs" id="Snippetlistboxselecteditems":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml.vb" id="Snippetlistboxselecteditems":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml.vb" id="Snippetlistboxselecteditems":::
 
  ]]></format>
         </remarks>
@@ -737,7 +737,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.ListBox.UnselectAll%2A> method to unselect all the items in a list box.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/ScrollIntoView/Window1.xaml.cs" id="Snippetlistboxunselectall":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml.vb" id="Snippetlistboxunselectall":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml.vb" id="Snippetlistboxunselectall":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ListBoxItem.xml b/xml/System.Windows.Controls/ListBoxItem.xml
index 790748ebb59..a4a1144fc9d 100644
--- a/xml/System.Windows.Controls/ListBoxItem.xml
+++ b/xml/System.Windows.Controls/ListBoxItem.xml
@@ -494,7 +494,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ListBox/ScrollIntoView/Window1.xaml" id="Snippetlistboxitemsevents":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/ScrollIntoView/Window1.xaml.cs" id="Snippetlistboxitemseventselected":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml.vb" id="Snippetlistboxitemseventselected":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml.vb" id="Snippetlistboxitemseventselected":::
 
  ]]></format>
         </remarks>
@@ -574,7 +574,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ListBox/ScrollIntoView/Window1.xaml" id="Snippetlistboxitemsevents":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/ScrollIntoView/Window1.xaml.cs" id="Snippetlistboxitemseventunselected":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBox_snip/visualbasic/window1.xaml.vb" id="Snippetlistboxitemseventunselected":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/ScrollIntoView/window1.xaml.vb" id="Snippetlistboxitemseventunselected":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ListView.xml b/xml/System.Windows.Controls/ListView.xml
index 30afe69410c..cda9ceace16 100644
--- a/xml/System.Windows.Controls/ListView.xml
+++ b/xml/System.Windows.Controls/ListView.xml
@@ -351,7 +351,7 @@
  The following example shows how to specify a <xref:System.Windows.Controls.GridView> object as the <xref:System.Windows.Controls.ListView.View%2A> for a <xref:System.Windows.Controls.ListView> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml.cs" id="Snippetlistviewview":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewCode/visualbasic/window1.xaml.vb" id="Snippetlistviewview":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GridView/Overview/window1.xaml.vb" id="Snippetlistviewview":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window1.xaml" id="Snippetlistviewview":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/MediaElement.xml b/xml/System.Windows.Controls/MediaElement.xml
index fafdffc816b..a43bea791f1 100644
--- a/xml/System.Windows.Controls/MediaElement.xml
+++ b/xml/System.Windows.Controls/MediaElement.xml
@@ -1626,7 +1626,7 @@ Different gradient spread methods
 
 
 ## Examples
- :::code language="xaml" source="~/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/StretchMediaElementExample.xaml" id="Snippetstretchmediaelementexamplewholepage":::
+ :::code language="xaml" source="~/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/StretchMediaElementExample.xaml" id="Snippetstretchmediaelementexamplewholepage":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/MediaElement/StretchDirection/StretchMediaElementExample.xaml" id="Snippetstretchmediaelementexamplewholepage":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/MenuItem.xml b/xml/System.Windows.Controls/MenuItem.xml
index acbd6c11183..10707d2d802 100644
--- a/xml/System.Windows.Controls/MenuItem.xml
+++ b/xml/System.Windows.Controls/MenuItem.xml
@@ -81,7 +81,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -171,7 +171,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml" id="Snippet3":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -257,7 +257,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1058,7 +1058,7 @@
  The following example shows how to determine whether a menu item is highlighted.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml.cs" id="Snippetmenuitemishighlighted":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml.vb" id="Snippetmenuitemishighlighted":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml.vb" id="Snippetmenuitemishighlighted":::
 
  ]]></format>
         </remarks>
@@ -1282,7 +1282,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml" id="Snippetissubmenuopenmenu":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml.cs" id="Snippetissubmenuopen":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml.vb" id="Snippetissubmenuopen":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml.vb" id="Snippetissubmenuopen":::
 
  ]]></format>
         </remarks>
@@ -2108,7 +2108,7 @@
  This example shows how to use the <xref:System.Windows.Controls.MenuItem.OnSubmenuClosed%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml.cs" id="Snippetsubmenueventclosed2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml.vb" id="Snippetsubmenueventclosed2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml.vb" id="Snippetsubmenueventclosed2":::
 
  ]]></format>
         </remarks>
@@ -2149,7 +2149,7 @@
  This example shows how to use the <xref:System.Windows.Controls.MenuItem.OnSubmenuOpened%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml.cs" id="Snippetsubmenueventopened2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml.vb" id="Snippetsubmenueventopened2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml.vb" id="Snippetsubmenueventopened2":::
 
  ]]></format>
         </remarks>
@@ -2564,7 +2564,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml" id="Snippetsubmenuevents1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml.cs" id="Snippetsubmenueventclosed2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml.vb" id="Snippetsubmenueventclosed2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml.vb" id="Snippetsubmenueventclosed2":::
 
  ]]></format>
         </remarks>
@@ -2727,7 +2727,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml" id="Snippetsubmenuevents1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/MenuItem/Command/Pane11.xaml.cs" id="Snippetsubmenueventopened2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItems_snip/visualbasic/pane1.xaml.vb" id="Snippetsubmenueventopened2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/MenuItem/IsHighlighted/pane1.xaml.vb" id="Snippetsubmenueventopened2":::
 
  ]]></format>
         </remarks>
@@ -2890,7 +2890,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml" id="Snippet3":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MenuItemCommandsAndEvents/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ContextMenu/Overview/Window1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/Page.xml b/xml/System.Windows.Controls/Page.xml
index 4c2e0218a49..563f33986b1 100644
--- a/xml/System.Windows.Controls/Page.xml
+++ b/xml/System.Windows.Controls/Page.xml
@@ -89,14 +89,14 @@
  The following example shows how a standard page is defined using only code:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Page/Overview/CodePage.cs" id="Snippetcodepagecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/codepage.vb" id="Snippetcodepagecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Page/Overview/codepage.vb" id="Snippetcodepagecodebehind":::
 
  The following example shows how a standard page is defined using a combination of markup and code-behind.
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Page/Overview/MarkupAndCodeBehindPage.xaml" id="Snippetmarkupandcodebehindpagemarkup":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Page/Overview/MarkupAndCodeBehindPage.xaml.cs" id="Snippetmarkupandcodebehindpagecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PageSnippets/visualbasic/markupandcodebehindpage.xaml.vb" id="Snippetmarkupandcodebehindpagecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Page/Overview/markupandcodebehindpage.xaml.vb" id="Snippetmarkupandcodebehindpagecodebehind":::
 
  ]]></format>
     </remarks>
@@ -666,7 +666,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Page/KeepAlive/HomePage.xaml" id="Snippetsetpagekeepalivexamlforlang2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Page/KeepAlive/HomePage.xaml.cs" id="Snippetsetpagekeepalivecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PageKeepAliveSnippets/visualbasic/homepage.xaml.vb" id="Snippetsetpagekeepalivecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Page/KeepAlive/homepage.xaml.vb" id="Snippetsetpagekeepalivecodebehind":::
 
  ]]></format>
         </remarks>
@@ -818,7 +818,7 @@
  The following example shows how a page can check if a navigation service is available and, if so, use it to navigate back to the previous page.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Page/NavigationService/HomePage.xaml.cs" id="Snippetgetpagenavigationservicecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PageNavigationServiceSnippets/visualbasic/homepage.xaml.vb" id="Snippetgetpagenavigationservicecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Page/NavigationService/homepage.xaml.vb" id="Snippetgetpagenavigationservicecodebehind":::
 
  ]]></format>
         </remarks>
@@ -1149,7 +1149,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Page/ShowsNavigationUI/HomePage.xaml" id="Snippetsetpageshowsnavigationuixamllang2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Page/ShowsNavigationUI/HomePage.xaml.cs" id="Snippetsetpageshowsnavigationuicodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PageShowsNavigationUISnippets/visualbasic/homepage.xaml.vb" id="Snippetsetpageshowsnavigationuicodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Page/ShowsNavigationUI/homepage.xaml.vb" id="Snippetsetpageshowsnavigationuicodebehind":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/PageRangeSelection.xml b/xml/System.Windows.Controls/PageRangeSelection.xml
index 723a6a94791..05f5ce83003 100644
--- a/xml/System.Windows.Controls/PageRangeSelection.xml
+++ b/xml/System.Windows.Controls/PageRangeSelection.xml
@@ -37,7 +37,7 @@
  ...  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PageRangeSelection/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/Panel.xml b/xml/System.Windows.Controls/Panel.xml
index 0b40cb03708..8e7278f1ee0 100644
--- a/xml/System.Windows.Controls/Panel.xml
+++ b/xml/System.Windows.Controls/Panel.xml
@@ -54,7 +54,7 @@
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/Panel/Overview/StackPanelExample.xaml" id="Snippetstackpanelexamplewholepage":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Panel/Overview/StackpanelExample.cs" id="Snippetstackpanelexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Stackpanel_Procedural_snip/visualbasic/stackpanelexample.vb" id="Snippetstackpanelexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Panel/Overview/stackpanelexample.vb" id="Snippetstackpanelexamplewholepage":::
 
  ]]></format>
     </remarks>
@@ -220,7 +220,7 @@
  The following code example demonstrates how to use the <xref:System.Windows.Controls.Panel.Children%2A> property to add a <xref:System.Windows.UIElement> child to a <xref:System.Windows.Controls.Panel> element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Panel/Children/Window1.xaml.cs" id="Snippetframenavigatesetup":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FrameSnips/visualbasic/window1.xaml.vb" id="Snippetframenavigatesetup":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Panel/Children/window1.xaml.vb" id="Snippetframenavigatesetup":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/PasswordBox.xml b/xml/System.Windows.Controls/PasswordBox.xml
index 3e4ab900d15..bde00ac1db5 100644
--- a/xml/System.Windows.Controls/PasswordBox.xml
+++ b/xml/System.Windows.Controls/PasswordBox.xml
@@ -52,7 +52,7 @@
  The following example shows the corresponding event handler.  In this case, the event handler simply increments a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PasswordBox/Overview/Window1.xaml.cs" id="Snippet_pwbox_pwchanged":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_pwbox_pwchanged":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb" id="Snippet_pwbox_pwchanged":::
 
  ]]></format>
     </remarks>
@@ -192,7 +192,7 @@ PasswordBox with CaretBrush set to red
  The following example shows how to clear a <xref:System.Windows.Controls.PasswordBox> with the <xref:System.Windows.Controls.PasswordBox.Clear%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PasswordBox/Overview/Window1.xaml.cs" id="Snippet_pwdbox_clear":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_pwdbox_clear":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb" id="Snippet_pwdbox_clear":::
 
  ]]></format>
         </remarks>
@@ -397,7 +397,7 @@ PasswordBox with CaretBrush set to red
  The following example shows how to set the <xref:System.Windows.Controls.PasswordBox.MaxLength%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PasswordBox/Overview/Window1.xaml.cs" id="Snippet_pwdbox_maxlen":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_pwdbox_maxlen":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb" id="Snippet_pwdbox_maxlen":::
 
  ]]></format>
         </remarks>
@@ -1154,7 +1154,7 @@ PasswordBox with CaretBrush set to red
  The following example shows how to set the <xref:System.Windows.Controls.PasswordBox.Password%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PasswordBox/Overview/Window1.xaml.cs" id="Snippet_pwdbox_pwd":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_pwdbox_pwd":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb" id="Snippet_pwdbox_pwd":::
 
  ]]></format>
         </remarks>
@@ -1210,7 +1210,7 @@ PasswordBox with CaretBrush set to red
  The following example shows the corresponding event handler.  In this case, the event handler simply increments a counter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PasswordBox/Overview/Window1.xaml.cs" id="Snippet_pwbox_pwchanged":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_pwbox_pwchanged":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb" id="Snippet_pwbox_pwchanged":::
 
  ]]></format>
         </remarks>
@@ -1292,7 +1292,7 @@ PasswordBox with CaretBrush set to red
  The following example shows how to set the <xref:System.Windows.Controls.PasswordBox.PasswordChar%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PasswordBox/Overview/Window1.xaml.cs" id="Snippet_pwdbox_pwdchar":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_pwdbox_pwdchar":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb" id="Snippet_pwdbox_pwdchar":::
 
  ]]></format>
         </remarks>
@@ -1362,7 +1362,7 @@ PasswordBox with CaretBrush set to red
  The following example shows how to paste content into a <xref:System.Windows.Controls.PasswordBox> with the <xref:System.Windows.Controls.PasswordBox.Paste%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PasswordBox/Overview/Window1.xaml.cs" id="Snippet_pwdbox_paste":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PasswordBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_pwdbox_paste":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PasswordBox/Overview/window1.xaml.vb" id="Snippet_pwdbox_paste":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/PrintDialog.xml b/xml/System.Windows.Controls/PrintDialog.xml
index 130b6478d28..06ef6e2638c 100644
--- a/xml/System.Windows.Controls/PrintDialog.xml
+++ b/xml/System.Windows.Controls/PrintDialog.xml
@@ -42,7 +42,7 @@
  ...  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PageRangeSelection/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -271,7 +271,7 @@
  ...  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PageRangeSelection/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -313,7 +313,7 @@
  ...  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PageRangeSelection/Overview/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -355,7 +355,7 @@
  ...  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PageRangeSelection/Overview/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -596,7 +596,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.PrintDialog.ShowDialog%2A> method in code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PageRangeSelection/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -649,7 +649,7 @@
  ...  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/PageRangeSelection/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PrintDialog/visualbasic/window1.xaml.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/PageRangeSelection/Overview/window1.xaml.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ProgressBar.xml b/xml/System.Windows.Controls/ProgressBar.xml
index f425670687e..4edf3cf7dea 100644
--- a/xml/System.Windows.Controls/ProgressBar.xml
+++ b/xml/System.Windows.Controls/ProgressBar.xml
@@ -57,7 +57,7 @@
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ProgressBar/Overview/Window11.xaml" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ProgressBar/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -134,7 +134,7 @@
  The following example sets the <xref:System.Windows.Controls.ProgressBar.IsIndeterminate%2A> property to `true` to create a <xref:System.Windows.Controls.ProgressBar> that shows generic progress.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ProgressBar/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -365,7 +365,7 @@
  The following example which creates a <xref:System.Windows.Controls.ProgressBar> shows how to use the <xref:System.Windows.Controls.ProgressBar.Orientation%2A> property to make a horizontal bar.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ProgressBar/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ProgressBar/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ProgressBar/Overview/window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/RadioButton.xml b/xml/System.Windows.Controls/RadioButton.xml
index 20b0c34ff19..6984ba5a390 100644
--- a/xml/System.Windows.Controls/RadioButton.xml
+++ b/xml/System.Windows.Controls/RadioButton.xml
@@ -52,7 +52,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/RadioButton/Overview/Pane1.xaml" id="Snippet3":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RadioButton/Overview/Pane1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RadioButton/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RadioButton/Overview/Window1.xaml.vb" id="Snippet5":::
 
  The following code sample creates two separate <xref:System.Windows.Controls.RadioButton> groups: `colorgrp` and `numgrp`. The user can choose one <xref:System.Windows.Controls.RadioButton> in each group.
 
diff --git a/xml/System.Windows.Controls/RichTextBox.xml b/xml/System.Windows.Controls/RichTextBox.xml
index a2cb0eba744..b424b97e937 100644
--- a/xml/System.Windows.Controls/RichTextBox.xml
+++ b/xml/System.Windows.Controls/RichTextBox.xml
@@ -77,7 +77,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml" id="Snippet_rtb_xaml":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/RichTextBoxExample.cs" id="Snippetrichtextboxcodeonlyexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxMiscSnippets_procedural_snip/visualbasic/richtextboxexample.vb" id="Snippetrichtextboxcodeonlyexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/Overview/richtextboxexample.vb" id="Snippetrichtextboxcodeonlyexample":::  
   
  ]]></format>
     </remarks>
@@ -161,7 +161,7 @@
  The following example illustrates use of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_rtb_constructor":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_rtb_constructor":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_rtb_constructor":::  
   
  ]]></format>
         </remarks>
@@ -211,7 +211,7 @@
  The following example illustrates the use of this property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_rtb_caretposition":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_rtb_caretposition":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_rtb_caretposition":::  
   
  ]]></format>
         </remarks>
@@ -259,7 +259,7 @@
  The following example illustrates the use of this property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_rtb_document":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_rtb_document":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_rtb_document":::  
   
  ]]></format>
         </remarks>
@@ -467,7 +467,7 @@
 ## Examples  
  The following example creates <xref:System.Windows.Controls.CheckBox> and a <xref:System.Windows.Controls.RichTextBox> that contains a <xref:System.Windows.Documents.Hyperlink> and a <xref:System.Windows.Controls.Button>.  The <xref:System.Windows.Controls.RichTextBox.IsDocumentEnabled%2A> property of the <xref:System.Windows.Controls.RichTextBox> is bound to the <xref:System.Windows.Controls.Primitives.ToggleButton.IsChecked%2A> property of the <xref:System.Windows.Controls.CheckBox>.  When the user selects the <xref:System.Windows.Controls.CheckBox>, the user can interact with the <xref:System.Windows.Controls.Button> and <xref:System.Windows.Documents.Hyperlink>. When the user clears the <xref:System.Windows.Controls.CheckBox>, the <xref:System.Windows.Controls.Button> and <xref:System.Windows.Documents.Hyperlink> are disabled.  
   
- :::code language="xaml" source="~/snippets/visualbasic/VS_Snippets_Wpf/RTBIsDocumentEnabled/VB/Window1.xaml" id="Snippet1":::  
+ :::code language="xaml" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/IsDocumentEnabled/Window1.xaml" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -674,7 +674,7 @@
  The following example illustrates the use of this property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_rtb_selection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_rtb_selection":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_rtb_selection":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/RowDefinitionCollection.xml b/xml/System.Windows.Controls/RowDefinitionCollection.xml
index 1ccfe662f42..d16b7564401 100644
--- a/xml/System.Windows.Controls/RowDefinitionCollection.xml
+++ b/xml/System.Windows.Controls/RowDefinitionCollection.xml
@@ -91,7 +91,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.RowDefinitionCollection.Add%2A> method to add a <xref:System.Windows.Controls.RowDefinition> to a <xref:System.Windows.Controls.RowDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet3":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -136,7 +136,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.RowDefinitionCollection.Clear%2A> method to clear the content of a <xref:System.Windows.Controls.RowDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet4":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -185,7 +185,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.RowDefinitionCollection.Contains%2A> method to determine whether a <xref:System.Windows.Controls.RowDefinition> exists in a <xref:System.Windows.Controls.RowDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet8":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -295,7 +295,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.RowDefinitionCollection.Count%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet7":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -343,7 +343,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.RowDefinitionCollection.IndexOf%2A> method to determine the index position of a <xref:System.Windows.Controls.RowDefinition> within a <xref:System.Windows.Controls.RowDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet9":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -397,7 +397,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.RowDefinitionCollection.Insert%2A> method to insert a <xref:System.Windows.Controls.RowDefinition> to a specific `index` position within a <xref:System.Windows.Controls.RowDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet9":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -445,7 +445,7 @@
  The following example demonstrates how to get the value of the <xref:System.Windows.Controls.RowDefinitionCollection.IsReadOnly%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet10":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -619,7 +619,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.RowDefinitionCollection.RemoveAt%2A> method to remove a <xref:System.Windows.Controls.RowDefinition> to a <xref:System.Windows.Controls.RowDefinitionCollection> at a specific `index` position.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet5":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
@@ -670,7 +670,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Controls.RowDefinitionCollection.RemoveRange%2A> method to remove a range of <xref:System.Windows.Controls.RowDefinition> elements from a <xref:System.Windows.Controls.RowDefinitionCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColumnDefinitionsGrid/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ColumnDefinitionCollection/Add/Window1.xaml.vb" id="Snippet6":::  
   
  To view the complete sample, see [How to: Manipulate Columns and Rows by Using ColumnDefinitionsCollections and RowDefinitionsCollections](/dotnet/framework/wpf/controls/manipulate-columns-and-rows-by-using-columndefinitionscollections).  
   
diff --git a/xml/System.Windows.Controls/ScrollChangedEventArgs.xml b/xml/System.Windows.Controls/ScrollChangedEventArgs.xml
index b829e8cb6cf..bb33793f059 100644
--- a/xml/System.Windows.Controls/ScrollChangedEventArgs.xml
+++ b/xml/System.Windows.Controls/ScrollChangedEventArgs.xml
@@ -59,7 +59,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.ExtentHeight%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -97,7 +97,7 @@
  The following  example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.ExtentHeightChange%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -135,7 +135,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.ExtentWidth%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -173,7 +173,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.ExtentWidthChange%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -211,7 +211,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.HorizontalChange%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -249,7 +249,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.HorizontalOffset%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -327,7 +327,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.VerticalChange%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -365,7 +365,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.VerticalOffset%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -403,7 +403,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.ViewportHeight%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -441,7 +441,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.ViewportHeightChange%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -479,7 +479,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.ViewportWidth%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -517,7 +517,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.ScrollChangedEventArgs.ViewportWidthChange%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ScrollViewer.xml b/xml/System.Windows.Controls/ScrollViewer.xml
index 5589d53c71b..b99b3081dc5 100644
--- a/xml/System.Windows.Controls/ScrollViewer.xml
+++ b/xml/System.Windows.Controls/ScrollViewer.xml
@@ -183,7 +183,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Controls.ScrollViewer.CanContentScroll%2A> property by using code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/scrollchangedeventargsLayout/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ScrollChangedEventArgs/ExtentHeight/Window1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/SelectedDatesCollection.xml b/xml/System.Windows.Controls/SelectedDatesCollection.xml
index 851be0da66e..d5b036532d7 100644
--- a/xml/System.Windows.Controls/SelectedDatesCollection.xml
+++ b/xml/System.Windows.Controls/SelectedDatesCollection.xml
@@ -43,7 +43,7 @@
  The following example creates a <xref:System.Windows.Controls.Calendar> that has multiple ranges of dates selected.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Calendar/Overview/window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/calendarsnippets/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Calendar/Overview/window1.xaml.vb" id="Snippet3":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/calendarsnippets/xaml/window1.xaml" id="Snippet3":::  
   
  ]]></format>
diff --git a/xml/System.Windows.Controls/SelectionChangedEventArgs.xml b/xml/System.Windows.Controls/SelectionChangedEventArgs.xml
index d7b3caa2743..c7fc8305b71 100644
--- a/xml/System.Windows.Controls/SelectionChangedEventArgs.xml
+++ b/xml/System.Windows.Controls/SelectionChangedEventArgs.xml
@@ -31,7 +31,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml" id="Snippet8":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml.vb" id="Snippet9":::  
   
  ]]></format>
     </remarks>
@@ -76,7 +76,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml" id="Snippet8":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -155,7 +155,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml" id="Snippet8":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ListBox/Overview/Pane1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxEvent/VisualBasic/Pane1.xaml.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ListBox/Overview/Pane1.xaml.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/Slider.xml b/xml/System.Windows.Controls/Slider.xml
index d7219347d93..8b58eec33ae 100644
--- a/xml/System.Windows.Controls/Slider.xml
+++ b/xml/System.Windows.Controls/Slider.xml
@@ -217,7 +217,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Controls.Slider.AutoToolTipPlacement%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetbasic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetbasic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetbasic":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetbasic":::
 
  ]]></format>
@@ -313,7 +313,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.AutoToolTipPrecision%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetselectionrange":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetselectionrange":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetselectionrange":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetselectionrange":::
 
  ]]></format>
@@ -776,7 +776,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.IsDirectionReversed%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetselectionrange":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetselectionrange":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetselectionrange":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetselectionrange":::
 
  ]]></format>
@@ -875,7 +875,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.IsMoveToPointEnabled%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetselectionrange":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetselectionrange":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetselectionrange":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetselectionrange":::
 
  ]]></format>
@@ -980,7 +980,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.IsSelectionRangeEnabled%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetselectionrange":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetselectionrange":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetselectionrange":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetselectionrange":::
 
  ]]></format>
@@ -1079,7 +1079,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.IsSnapToTickEnabled%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetbasic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetbasic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetbasic":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetbasic":::
 
  ]]></format>
@@ -1800,7 +1800,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.Orientation%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetbasic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetbasic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetbasic":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetbasic":::
 
  ]]></format>
@@ -1896,7 +1896,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.SelectionEnd%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetselectionrange":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetselectionrange":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetselectionrange":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetselectionrange":::
 
  ]]></format>
@@ -1994,7 +1994,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.SelectionEnd%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetselectionrange":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetselectionrange":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetselectionrange":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetselectionrange":::
 
  ]]></format>
@@ -2096,7 +2096,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.TickFrequency%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetbasic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetbasic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetbasic":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetbasic":::
 
  ]]></format>
@@ -2185,7 +2185,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.TickPlacement%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetbasic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetbasic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetbasic":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetbasic":::
 
  ]]></format>
@@ -2284,7 +2284,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.Slider.Ticks%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.cs" id="Snippetselectionrange":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Slider/VisualBasic/Pane1.xaml.vb" id="Snippetselectionrange":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Slider/AutoToolTipPlacement/Pane1.xaml.vb" id="Snippetselectionrange":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/Slider/xaml/window1.xaml" id="Snippetselectionrange":::
 
  ]]></format>
diff --git a/xml/System.Windows.Controls/SoundPlayerAction.xml b/xml/System.Windows.Controls/SoundPlayerAction.xml
index a8ff333e3c6..68056e6a0fe 100644
--- a/xml/System.Windows.Controls/SoundPlayerAction.xml
+++ b/xml/System.Windows.Controls/SoundPlayerAction.xml
@@ -39,7 +39,7 @@
  The following example shows how use the <xref:System.Windows.Controls.SoundPlayerAction> to trigger audio playback of a .wav file using an <xref:System.Windows.EventTrigger> on the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> and <xref:System.Windows.UIElement.MouseEnter> events.
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/MediaElement/StretchDirection/SoundPlayerActionTriggers.xaml" id="Snippetsoundplayeractionfullpage":::
- :::code language="xaml" source="~/snippets/visualbasic/VS_Snippets_Wpf/MediaGallery_snip/VB/SoundPlayerActionTriggers.xaml" id="Snippetsoundplayeractionfullpage":::
+ :::code language="xaml" source="~/snippets/visualbasic/System.Windows.Controls/MediaElement/StretchDirection/SoundPlayerActionTriggers.xaml" id="Snippetsoundplayeractionfullpage":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/SpellCheck.xml b/xml/System.Windows.Controls/SpellCheck.xml
index e5f23d69b9c..ed2ee9c1b26 100644
--- a/xml/System.Windows.Controls/SpellCheck.xml
+++ b/xml/System.Windows.Controls/SpellCheck.xml
@@ -94,7 +94,7 @@ ListBox
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/SpellCheck/CustomDictionaries/window1.xaml" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/SpellCheck/CustomDictionaries/window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/wpfcustomdictionary/vb/mainwindow.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/SpellCheck/CustomDictionaries/mainwindow.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/StyleSelector.xml b/xml/System.Windows.Controls/StyleSelector.xml
index 7810677bb6c..0e24e54d15a 100644
--- a/xml/System.Windows.Controls/StyleSelector.xml
+++ b/xml/System.Windows.Controls/StyleSelector.xml
@@ -34,7 +34,7 @@
  The following example shows how to define a <xref:System.Windows.Controls.StyleSelector> that defines a <xref:System.Windows.Style> for a row. This example defines the <xref:System.Windows.Controls.Control.Background%2A> color according to the row index.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window11.xaml.cs" id="Snippetitemstyleselector":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/window1.xaml.vb" id="Snippetitemstyleselector":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/window1.xaml.vb" id="Snippetitemstyleselector":::
 
  The following example shows how to define a <xref:System.Windows.ResourceKey> for the <xref:System.Windows.Controls.StyleSelector>. The `namespc` prefix maps to a CLR namespace and the corresponding assembly where the <xref:System.Windows.Controls.StyleSelector> is defined. For more information, see [XAML Namespaces and Namespace Mapping for WPF XAML](/dotnet/framework/wpf/advanced/xaml-namespaces-and-namespace-mapping-for-wpf-xaml).
 
@@ -126,7 +126,7 @@
  The following example shows how to define a <xref:System.Windows.Controls.StyleSelector> that defines a <xref:System.Windows.Style> for a row. This example defines the <xref:System.Windows.Controls.Control.Background%2A> color according to the row index.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/GridView/Overview/Window11.xaml.cs" id="Snippetitemstyleselector":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListViewSnips/visualbasic/window1.xaml.vb" id="Snippetitemstyleselector":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/StyleSelector/Overview/window1.xaml.vb" id="Snippetitemstyleselector":::
 
  The following example shows how to define a <xref:System.Windows.ResourceKey> for the <xref:System.Windows.Controls.StyleSelector>. The `namespc` prefix maps to a CLR namespace and the corresponding assembly where the <xref:System.Windows.Controls.StyleSelector> is defined. For more information, see [XAML Namespaces and Namespace Mapping for WPF XAML](/dotnet/framework/wpf/advanced/xaml-namespaces-and-namespace-mapping-for-wpf-xaml).
 
diff --git a/xml/System.Windows.Controls/TabControl.xml b/xml/System.Windows.Controls/TabControl.xml
index 2f766bc02c1..a0176c80150 100644
--- a/xml/System.Windows.Controls/TabControl.xml
+++ b/xml/System.Windows.Controls/TabControl.xml
@@ -129,7 +129,7 @@
  The following example implements the <xref:System.IFormattable.ToString%2A?displayProperty=nameWithType> method to return either the `Name` of the student or a string that lists the student's courses.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ContentControl/ContentStringFormat/Window1.xaml.cs" id="Snippettabcontroltostring":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentStringSnippets/visualbasic/window1.xaml.vb" id="Snippettabcontroltostring":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/GroupStyle/HeaderStringFormat/window1.xaml.vb" id="Snippettabcontroltostring":::
 
  ]]></format>
         </remarks>
@@ -341,8 +341,8 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TabControl/ContentTemplateSelector/Data.cs" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Person.vb" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Person.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -718,7 +718,7 @@
  The following example uses the <xref:System.Windows.Controls.TabControl.SelectedContent%2A> property to get the `Person` in the currently selected <xref:System.Windows.Controls.TabItem>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TabControlContentTemplateSelector/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TabControl/ContentTemplateSelector/Window1.xaml.vb" id="Snippet4":::
 
  The following example creates a <xref:System.Windows.Controls.ControlTemplate> for the <xref:System.Windows.Controls.TabControl>. Setting the <xref:System.Windows.Controls.ContentPresenter.ContentSource%2A> property to "SelectedContent" creates aliases to the <xref:System.Windows.Controls.TabControl.SelectedContent%2A>, <xref:System.Windows.Controls.TabControl.SelectedContentTemplate%2A>, and <xref:System.Windows.Controls.TabControl.SelectedContentTemplateSelector%2A> properties.
 
diff --git a/xml/System.Windows.Controls/TabItem.xml b/xml/System.Windows.Controls/TabItem.xml
index e0f87f572d5..fc03ff5d595 100644
--- a/xml/System.Windows.Controls/TabItem.xml
+++ b/xml/System.Windows.Controls/TabItem.xml
@@ -508,7 +508,7 @@
  The following example shows how to retrieve <xref:System.Windows.Controls.TabItem.TabStripPlacement%2A> information about a <xref:System.Windows.Controls.TabItem>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TabItem/TabStripPlacement/Pane1.xaml.cs" id="Snippettabitemplacement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TabItem_snip/visualbasic/pane1.xaml.vb" id="Snippettabitemplacement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TabItem/TabStripPlacement/pane1.xaml.vb" id="Snippettabitemplacement":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/TextBlock.xml b/xml/System.Windows.Controls/TextBlock.xml
index 9c4b6951676..d8cadb3af16 100644
--- a/xml/System.Windows.Controls/TextBlock.xml
+++ b/xml/System.Windows.Controls/TextBlock.xml
@@ -70,7 +70,7 @@
  The following example shows how to achieve similar results programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblocksimple":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblocksimple":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblocksimple":::
 
  ]]></format>
     </remarks>
@@ -148,7 +148,7 @@
  The following example demonstrates the use of this constructor.  In this case, the <xref:System.Windows.Controls.TextBlock> contains a text <xref:System.Windows.Documents.Run>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockconstructorsimple":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockconstructorsimple":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockconstructorsimple":::
 
  ]]></format>
         </remarks>
@@ -246,7 +246,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.Background%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -579,7 +579,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.FontFamily%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -700,7 +700,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.FontSize%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -784,7 +784,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.FontStretch%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -868,7 +868,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.FontStyle%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -954,7 +954,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.FontWeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -1040,7 +1040,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.Foreground%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -1871,7 +1871,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.LineHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -2293,7 +2293,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.Padding%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -3120,7 +3120,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.Text%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_textblock_text":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblock_text":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_textblock_text":::
 
  ]]></format>
         </remarks>
@@ -3175,7 +3175,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.TextAlignment%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -3272,7 +3272,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.TextDecorations%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_textblock_textdec":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblock_textdec":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_textblock_textdec":::
 
  ]]></format>
         </remarks>
@@ -3350,7 +3350,7 @@
  The following example shows how to create a simple text effect and apply it to a text of a <xref:System.Windows.Controls.TextBlock>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textblock_texteffects":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblock_texteffects":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textblock_texteffects":::
 
  ]]></format>
         </remarks>
@@ -3527,7 +3527,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.TextWrapping%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
@@ -3601,7 +3601,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TextBlock.Typography%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_textblockprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_textblockprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_textblockprops":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/TextBox.xml b/xml/System.Windows.Controls/TextBox.xml
index 57149d02384..62afd4aaf99 100644
--- a/xml/System.Windows.Controls/TextBox.xml
+++ b/xml/System.Windows.Controls/TextBox.xml
@@ -223,7 +223,7 @@ tbSettingText.Text = "Initial text contents of the TextBox."
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/charactercasingexample.xaml" id="Snippetcharactercasingexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/CharacterCasingExample.cs" id="Snippetcharactercasingcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/charactercasingexample.vb" id="Snippetcharactercasingcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/charactercasingexample.vb" id="Snippetcharactercasingcodeexamplewholepage":::
 
  ]]></format>
         </remarks>
@@ -924,7 +924,7 @@ tbSettingText.Text = "Initial text contents of the TextBox."
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/textboxexample.xaml" id="Snippettextboxexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/TextBoxExample.cs" id="Snippettextboxcodeexampleinline1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/textboxexample.vb" id="Snippettextboxcodeexampleinline1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/textboxexample.vb" id="Snippettextboxcodeexampleinline1":::
 
  ]]></format>
         </remarks>
@@ -1015,7 +1015,7 @@ tbSettingText.Text = "Initial text contents of the TextBox."
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/textboxexample.xaml" id="Snippettextboxexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/TextBoxExample.cs" id="Snippettextboxcodeexampleinline1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/textboxexample.vb" id="Snippettextboxcodeexampleinline1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/textboxexample.vb" id="Snippettextboxcodeexampleinline1":::
 
  ]]></format>
         </remarks>
@@ -1146,7 +1146,7 @@ tbSettingText.Text = "Initial text contents of the TextBox."
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/textboxexample.xaml" id="Snippettextboxexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/TextBoxExample.cs" id="Snippettextboxcodeexampleinline1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/textboxexample.vb" id="Snippettextboxcodeexampleinline1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/textboxexample.vb" id="Snippettextboxcodeexampleinline1":::
 
  ]]></format>
         </remarks>
@@ -1738,7 +1738,7 @@ tbSettingText.Text = "Initial text contents of the TextBox."
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/textboxexample.xaml" id="Snippettextboxexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/TextBoxExample.cs" id="Snippettextboxcodeexampleinline1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_procedural_snip/visualbasic/textboxexample.vb" id="Snippettextboxcodeexampleinline1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/CharacterCasing/Overview/textboxexample.vb" id="Snippettextboxcodeexampleinline1":::
 
  ]]></format>
         </remarks>
@@ -1834,7 +1834,7 @@ tbSettingText.Text = "Initial text contents of the TextBox."
  The following example shows how to set the <xref:System.Windows.Documents.Inline.TextDecorations%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_textdec":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_textdec":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_textdec":::
 
  ]]></format>
         </remarks>
@@ -1946,7 +1946,7 @@ tbSettingText.Text = "Initial text contents of the TextBox."
  The following example demonstrates how to set the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase12":::
 
  ]]></format>
         </remarks>
@@ -2035,7 +2035,7 @@ tbSettingText.Text = "Initial text contents of the TextBox."
  The following example shows how to set the <xref:System.Windows.Controls.TextBox.Typography%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_typog":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_typog":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_typog":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/TextChangedEventArgs.xml b/xml/System.Windows.Controls/TextChangedEventArgs.xml
index cc041fd6823..54f453180d8 100644
--- a/xml/System.Windows.Controls/TextChangedEventArgs.xml
+++ b/xml/System.Windows.Controls/TextChangedEventArgs.xml
@@ -33,7 +33,7 @@
  Below is the code behind for the example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/CharacterCasing/Overview/detectchangedtextexample.xaml.cs" id="Snippetdetectchangedtextcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxMiscSnippets_snip/visualbasic/detectchangedtextexample.xaml.vb" id="Snippetdetectchangedtextcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextChangedEventArgs/Overview/detectchangedtextexample.xaml.vb" id="Snippetdetectchangedtextcodeexamplewholepage":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/ToolBar.xml b/xml/System.Windows.Controls/ToolBar.xml
index 347580b15a0..8b993c7604a 100644
--- a/xml/System.Windows.Controls/ToolBar.xml
+++ b/xml/System.Windows.Controls/ToolBar.xml
@@ -981,7 +981,7 @@
  The following example shows how to determine whether a <xref:System.Windows.Controls.ToolBar> is vertical.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolBar/Orientation/Pane1.xaml.cs" id="Snippettoolbarorientation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/pane1.xaml.vb" id="Snippettoolbarorientation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/pane1.xaml.vb" id="Snippettoolbarorientation":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ToolBarTray.xml b/xml/System.Windows.Controls/ToolBarTray.xml
index b0d547dec6e..0ccc18e0e0a 100644
--- a/xml/System.Windows.Controls/ToolBarTray.xml
+++ b/xml/System.Windows.Controls/ToolBarTray.xml
@@ -675,7 +675,7 @@
  The following example shows how to use the <xref:System.Windows.Controls.ToolBarTray.ToolBars%2A> property to add a <xref:System.Windows.Controls.ToolBar> to a <xref:System.Windows.Controls.ToolBarTray>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolBar/Orientation/Pane1.xaml.cs" id="Snippettoolbartraytoolbars":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolBarOrient_snip/visualbasic/pane1.xaml.vb" id="Snippettoolbartraytoolbars":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolBar/Orientation/pane1.xaml.vb" id="Snippettoolbartraytoolbars":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ToolTip.xml b/xml/System.Windows.Controls/ToolTip.xml
index dce92b97687..0e45d398bff 100644
--- a/xml/System.Windows.Controls/ToolTip.xml
+++ b/xml/System.Windows.Controls/ToolTip.xml
@@ -68,7 +68,7 @@
  The following example uses code to generate a <xref:System.Windows.Controls.ToolTip> object. The example creates a <xref:System.Windows.Controls.ToolTip> (`tt`) and associates it with a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Overview/Pane1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipSimple/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Overview/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -153,10 +153,10 @@
  The following example shows how to set an event handler for the <xref:System.Windows.Controls.ToolTip.Opened> and <xref:System.Windows.Controls.ToolTip.Closed> events.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipeventhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipeventhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipeventhandlers":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipopenandclosehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipopenandclosehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipopenandclosehandler":::
 
  ]]></format>
         </remarks>
@@ -246,10 +246,10 @@
  The following example shows how to set the <xref:System.Windows.Controls.ToolTip.CustomPopupPlacementCallback%2A> property and create the corresponding delegate. The same technique is used to by the <xref:System.Windows.Controls.Primitives.Popup>, which is demonstrated in the [Popup Placement Sample](https://github.com/dotnet/dotnet-api-docs/tree/main/snippets/csharp/System.Windows.Controls/ContextMenu/CustomPopupPlacementCallback).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/Pane1.xaml.cs" id="Snippetcustompopupplacementcallback":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/pane1.xaml.vb" id="Snippetcustompopupplacementcallback":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/pane1.xaml.vb" id="Snippetcustompopupplacementcallback":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/Pane1.xaml.cs" id="Snippetdelegateinstance":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipCustom/visualbasic/pane1.xaml.vb" id="Snippetdelegateinstance":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/CustomPopupPlacementCallback/pane1.xaml.vb" id="Snippetdelegateinstance":::
 
  ]]></format>
         </remarks>
@@ -423,7 +423,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml" id="Snippettooltip":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipcode":::
 
  ]]></format>
         </remarks>
@@ -755,10 +755,10 @@
  The following example shows how to set an event handler for the <xref:System.Windows.Controls.ToolTip.Opened> and <xref:System.Windows.Controls.ToolTip.Closed> events.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipeventhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipeventhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipeventhandlers":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipopenandclosehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipopenandclosehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipopenandclosehandler":::
 
  ]]></format>
         </remarks>
@@ -850,7 +850,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml" id="Snippettooltip":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipcode":::
 
  ]]></format>
         </remarks>
@@ -944,7 +944,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml" id="Snippettooltip":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipcode":::
 
  ]]></format>
         </remarks>
@@ -1047,7 +1047,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml" id="Snippettooltip":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipcode":::
 
  ]]></format>
         </remarks>
@@ -1288,7 +1288,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml" id="Snippettooltip":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipcode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ToolTipService.xml b/xml/System.Windows.Controls/ToolTipService.xml
index 867639580fd..a5cb7a37b14 100644
--- a/xml/System.Windows.Controls/ToolTipService.xml
+++ b/xml/System.Windows.Controls/ToolTipService.xml
@@ -236,7 +236,7 @@
  The following example shows how to get the value for the `ToolTipService.BetweenShowDelay` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetbetweenshowdelay":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetbetweenshowdelay":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetbetweenshowdelay":::
 
  ]]></format>
         </remarks>
@@ -286,7 +286,7 @@
  The following example shows how to get the value for the `ToolTipService.HasDropShadow` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgethasdropshadow":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgethasdropshadow":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgethasdropshadow":::
 
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
  The following example shows how to get the value for the `ToolTipService.HorizontalOffset` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgethorizontaloffset":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgethorizontaloffset":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgethorizontaloffset":::
 
  ]]></format>
         </remarks>
@@ -390,7 +390,7 @@
  The following example shows how to get the value for the `ToolTipService.InitialShowDelay` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetinitialshowdelay":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetinitialshowdelay":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetinitialshowdelay":::
 
  ]]></format>
         </remarks>
@@ -440,7 +440,7 @@
  The following example shows how to get the value for the `ToolTipService.IsEnabled` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetisenabled":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetisenabled":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetisenabled":::
 
  ]]></format>
         </remarks>
@@ -490,7 +490,7 @@
  The following example shows how to get the value for the `ToolTipService.IsOpen` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetisopen":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetisopen":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetisopen":::
 
  ]]></format>
         </remarks>
@@ -539,7 +539,7 @@
  The following example shows how to get the value for the `ToolTipService.Placement` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetplacement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetplacement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetplacement":::
 
  ]]></format>
         </remarks>
@@ -589,7 +589,7 @@
  The following example shows how to get the value for the `ToolTipService.PlacementRectangle` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetplacementrectangle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetplacementrectangle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetplacementrectangle":::
 
  ]]></format>
         </remarks>
@@ -639,7 +639,7 @@
  The following example shows how to get the value for the `ToolTipService.PlacementTarget` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetplacementtarget":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetplacementtarget":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetplacementtarget":::
 
  ]]></format>
         </remarks>
@@ -689,7 +689,7 @@
  The following example shows how to get the value for the `ToolTipService.ShowDuration` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetshowduration":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetshowduration":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetshowduration":::
 
  ]]></format>
         </remarks>
@@ -739,7 +739,7 @@
  The following example shows how to get the value for the `ToolTipService.ShowOnDisabledProperty` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetshowondisabled":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetshowondisabled":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetshowondisabled":::
 
  ]]></format>
         </remarks>
@@ -819,7 +819,7 @@
  The following example shows how to get the value for the `ToolTipService.ToolTipProperty` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgettooltip":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgettooltip":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgettooltip":::
 
  ]]></format>
         </remarks>
@@ -873,7 +873,7 @@
  The following example shows how to get the value for the `ToolTipService.VerticalOffset` attached property. The <xref:System.Windows.FrameworkElement.FindName%2A> method finds the object called `ellipse2`, which is an <xref:System.Windows.Shapes.Ellipse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetgetverticaloffset":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetgetverticaloffset":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetgetverticaloffset":::
 
  ]]></format>
         </remarks>
@@ -1182,7 +1182,7 @@
  :::code language="xml" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml" id="Snippetnotooltip":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetisenabled":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetisenabled":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetisenabled":::
 
  ]]></format>
         </remarks>
@@ -1598,7 +1598,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.BetweenShowDelay` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetbetweenshowdelay":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetbetweenshowdelay":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetbetweenshowdelay":::
 
  ]]></format>
         </remarks>
@@ -1643,7 +1643,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.HasDropShadow` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsethasdropshadow":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsethasdropshadow":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsethasdropshadow":::
 
  ]]></format>
         </remarks>
@@ -1688,7 +1688,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.HorizontalOffset` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsethorizontaloffset":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsethorizontaloffset":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsethorizontaloffset":::
 
  ]]></format>
         </remarks>
@@ -1733,7 +1733,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.InitialShowDelay` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetinitialshowdelay":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetinitialshowdelay":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetinitialshowdelay":::
 
  ]]></format>
         </remarks>
@@ -1778,7 +1778,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.IsEnabled` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetisenabled":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetisenabled":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetisenabled":::
 
  ]]></format>
         </remarks>
@@ -1823,7 +1823,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.Placement` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetplacement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetplacement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetplacement":::
 
  ]]></format>
         </remarks>
@@ -1868,7 +1868,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.PlacementRectangle` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetplacementrectangle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetplacementrectangle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetplacementrectangle":::
 
  ]]></format>
         </remarks>
@@ -1913,7 +1913,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.PlacementTarget` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTipService/SetPlacementTarget/Pane1.xaml.cs" id="Snippetsetplacementtarget":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipAssign/visualbasic/pane1.xaml.vb" id="Snippetsetplacementtarget":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTipService/SetPlacementTarget/pane1.xaml.vb" id="Snippetsetplacementtarget":::
 
  ]]></format>
         </remarks>
@@ -1958,7 +1958,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.ShowDuration` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetshowduration":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetshowduration":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetshowduration":::
 
  ]]></format>
         </remarks>
@@ -2003,7 +2003,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.ShowOnDisabled` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetshowondisabled":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetshowondisabled":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetshowondisabled":::
 
  ]]></format>
         </remarks>
@@ -2084,7 +2084,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.ToolTip` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsettooltip2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsettooltip2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsettooltip2":::
 
  ]]></format>
         </remarks>
@@ -2129,7 +2129,7 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set the value for the `ToolTipService.VerticalOffset` attached property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetverticaloffset":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetverticaloffset":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetverticaloffset":::
 
  ]]></format>
         </remarks>
@@ -2181,7 +2181,7 @@ This is an attached property. For information about how to get the value of this
  :::code language="xml" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml" id="Snippetnotooltip":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippetsetshowduration":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippetsetshowduration":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippetsetshowduration":::
 
  ]]></format>
         </remarks>
@@ -2465,10 +2465,10 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set an event handler for the <xref:System.Windows.Controls.ToolTipService.ToolTipClosing> event. In this case, the event handler is actually for <xref:System.Windows.FrameworkElement.ToolTipClosing?displayProperty=nameWithType>, because the <xref:System.Windows.Shapes.Ellipse> where the handler is attached is a derived class of <xref:System.Windows.FrameworkElement>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipserviceeventhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipserviceeventhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipserviceeventhandlers":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipopenandclosehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipopenandclosehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipopenandclosehandler":::
 
  ]]></format>
         </remarks>
@@ -2543,10 +2543,10 @@ This is an attached property. For information about how to get the value of this
  The following example shows how to set an event handler for the <xref:System.Windows.FrameworkElement.ToolTipOpening?displayProperty=nameWithType> event.  In this case, the event handler is actually for <xref:System.Windows.FrameworkElement.ToolTipOpening?displayProperty=nameWithType>, because the <xref:System.Windows.Shapes.Ellipse> where the handler is attached is a derived class of <xref:System.Windows.FrameworkElement>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipserviceeventhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipserviceeventhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipserviceeventhandlers":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/ToolTip/Closed/Pane1.xaml.cs" id="Snippettooltipopenandclosehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ToolTipService/visualbasic/pane1.xaml.vb" id="Snippettooltipopenandclosehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/ToolTip/Closed/pane1.xaml.vb" id="Snippettooltipopenandclosehandler":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/TreeView.xml b/xml/System.Windows.Controls/TreeView.xml
index f71938bb613..b4d0b00a7da 100644
--- a/xml/System.Windows.Controls/TreeView.xml
+++ b/xml/System.Windows.Controls/TreeView.xml
@@ -522,7 +522,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.TreeView.SelectedItem%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetselecteditem":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetselecteditem":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetselecteditem":::
 
  ]]></format>
         </remarks>
@@ -589,7 +589,7 @@
  The following example shows how to define the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetselectedvaluechangedmethod":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetselectedvaluechangedmethod":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetselectedvaluechangedmethod":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/TreeViewItem.xml b/xml/System.Windows.Controls/TreeViewItem.xml
index a705f8b5c66..ef73cf20bdb 100644
--- a/xml/System.Windows.Controls/TreeViewItem.xml
+++ b/xml/System.Windows.Controls/TreeViewItem.xml
@@ -193,7 +193,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml" id="Snippetoncollapsedexpanded":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetoncollapsed":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetoncollapsed":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetoncollapsed":::
 
  ]]></format>
         </remarks>
@@ -288,7 +288,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml" id="Snippetoncollapsedexpanded":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetonexpanded":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetonexpanded":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetonexpanded":::
 
  ]]></format>
         </remarks>
@@ -374,7 +374,7 @@
 > The `GetTreeViewItem` method only works for <xref:System.Windows.Controls.TreeViewItem> controls that are not virtualized.  To learn how to find a <xref:System.Windows.Controls.TreeViewItem> that may be virtualized, see [How to: Find a TreeViewItem in a TreeView](/dotnet/framework/wpf/controls/how-to-find-a-treeviewitem-in-a-treeview).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeViewItem/ExpandSubtree/mainwindow.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/treeviewexpand/visualbasic/mainwindow.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeViewItem/ExpandSubtree/mainwindow.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -457,7 +457,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml" id="Snippetoncollapsedexpanded":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetisexpanded":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetisexpanded":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetisexpanded":::
 
  ]]></format>
         </remarks>
@@ -578,7 +578,7 @@
  The following example shows how to set the <xref:System.Windows.Controls.TreeViewItem.IsSelected%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetisselected":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetisselected":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetisselected":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml" id="Snippetisselected":::
 
  ]]></format>
@@ -680,7 +680,7 @@
  The following example shows how to get the value of the <xref:System.Windows.Controls.TreeViewItem.IsSelectionActive%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetisselectionactive":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetisselectionactive":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetisselectionactive":::
 
  ]]></format>
         </remarks>
@@ -1209,7 +1209,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml" id="Snippetselected":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetchoosewine":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetchoosewine":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetchoosewine":::
 
  ]]></format>
         </remarks>
@@ -1530,7 +1530,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml" id="Snippetselected":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TreeView/SelectedItem/Window1.xaml.cs" id="Snippetchangewinechoice":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TreeViewSnips/visualbasic/window1.xaml.vb" id="Snippetchangewinechoice":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TreeView/SelectedItem/window1.xaml.vb" id="Snippetchangewinechoice":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/UIElementCollection.xml b/xml/System.Windows.Controls/UIElementCollection.xml
index 77962afb42c..fbee404e1e9 100644
--- a/xml/System.Windows.Controls/UIElementCollection.xml
+++ b/xml/System.Windows.Controls/UIElementCollection.xml
@@ -263,7 +263,7 @@
  The following example uses the <xref:System.Windows.Controls.UIElementCollection.Contains%2A> method to determine if a specific <xref:System.Windows.UIElement> exists within a <xref:System.Windows.Controls.UIElementCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/UIElementCollection/Overview/Pane1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollection/VisualBasic/Pane1.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/UIElementCollection/Contains/Pane1.xaml.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -460,7 +460,7 @@
  ...  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/UIElementCollection/IndexOf/Default.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/UIElementCollectionIndexOf/VisualBasic/default.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/UIElementCollection/IndexOf/default.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/UserControl.xml b/xml/System.Windows.Controls/UserControl.xml
index 30ea75e1836..8f596bc10c1 100644
--- a/xml/System.Windows.Controls/UserControl.xml
+++ b/xml/System.Windows.Controls/UserControl.xml
@@ -45,7 +45,7 @@
  The following shows the logic of this <xref:System.Windows.Controls.UserControl>:  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/UserControl/Overview/NumericUpDown.xaml.cs" id="Snippetcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/UserControlNumericUpDown/visualbasic/numericupdown.xaml.vb" id="Snippetcodebehind":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/UserControl/Overview/numericupdown.xaml.vb" id="Snippetcodebehind":::  
   
  For more information, see [Control Authoring Overview](/dotnet/framework/wpf/controls/control-authoring-overview).  
   
diff --git a/xml/System.Windows.Controls/ValidationRule.xml b/xml/System.Windows.Controls/ValidationRule.xml
index ba79eddd9f6..a81d874824a 100644
--- a/xml/System.Windows.Controls/ValidationRule.xml
+++ b/xml/System.Windows.Controls/ValidationRule.xml
@@ -308,7 +308,7 @@
  The following example shows the <xref:System.Windows.Controls.ValidationRule> that is used in the previous example and the event handler for the <xref:System.Windows.Controls.Validation.Error> event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window3.xaml.cs" id="Snippetvalueisnotnull":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml.vb" id="Snippetvalueisnotnull":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml.vb" id="Snippetvalueisnotnull":::  
   
  ]]></format>
         </remarks>
@@ -360,7 +360,7 @@
  The following example shows the <xref:System.Windows.Controls.ValidationRule> `ValidateDateAndPrice`. In the `Validate` method override, the `Price` property is of type <xref:System.Double> and the `OfferExpires` property is of type <xref:System.DateTime> because the strings have been converted to their respective types by the time the <xref:System.Windows.Controls.ValidationRule> runs.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Data.cs" id="Snippetvalidateobject":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/data.vb" id="Snippetvalidateobject":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/data.vb" id="Snippetvalidateobject":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/ValidationStep.xml b/xml/System.Windows.Controls/ValidationStep.xml
index 81490d28776..5317a8dfc26 100644
--- a/xml/System.Windows.Controls/ValidationStep.xml
+++ b/xml/System.Windows.Controls/ValidationStep.xml
@@ -34,7 +34,7 @@
  The following example shows the `ValidateDateAndPrice` validation rule. In the <xref:System.Windows.Controls.ValidationRule.Validate%2A?displayProperty=nameWithType> method, the `Price` property is of type <xref:System.Double>, and the `OfferExpires` property is of type <xref:System.DateTime>. The strings have been converted to their respective types by the time the `ValidationRule` runs.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Data.cs" id="Snippetvalidateobject":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/data.vb" id="Snippetvalidateobject":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/data.vb" id="Snippetvalidateobject":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/Viewport3D.xml b/xml/System.Windows.Controls/Viewport3D.xml
index a9a0c37ebd6..1c2ce475d12 100644
--- a/xml/System.Windows.Controls/Viewport3D.xml
+++ b/xml/System.Windows.Controls/Viewport3D.xml
@@ -80,7 +80,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/Basic3DShapeExample.cs" id="Snippetbasic3dshapecodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/basic3dshapeexample.vb" id="Snippetbasic3dshapecodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/basic3dshapeexample.vb" id="Snippetbasic3dshapecodeexamplewholepage":::
 
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
  The following example shows setting the <xref:System.Windows.Controls.Viewport3D.Camera%2A> property of a <xref:System.Windows.Controls.Viewport3D> using code. To see the entirety of the code from which this excerpt was taken, see [How to: Create a 3-D Scene](/dotnet/framework/wpf/graphics-multimedia/how-to-create-a-3-d-scene).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/Basic3DShapeExample.cs" id="Snippetbasic3dshapecodeexampleinline1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/basic3dshapeexample.vb" id="Snippetbasic3dshapecodeexampleinline1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/basic3dshapeexample.vb" id="Snippetbasic3dshapecodeexampleinline1":::
 
  The following example shows setting the <xref:System.Windows.Controls.Viewport3D.Camera%2A> property of a <xref:System.Windows.Controls.Viewport3D> using Extensible Application Markup Language (XAML). To see the entirety of the code from which this excerpt was taken, see [How to: Create a 3-D Scene](/dotnet/framework/wpf/graphics-multimedia/how-to-create-a-3-d-scene).
 
diff --git a/xml/System.Windows.Controls/VirtualizationMode.xml b/xml/System.Windows.Controls/VirtualizationMode.xml
index 1aca7b3476a..1126b372ed6 100644
--- a/xml/System.Windows.Controls/VirtualizationMode.xml
+++ b/xml/System.Windows.Controls/VirtualizationMode.xml
@@ -43,7 +43,7 @@
  The following example shows the data used in the previous example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/Window1.xaml.cs" id="Snippetlistboxdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml.vb" id="Snippetlistboxdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml.vb" id="Snippetlistboxdata":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Controls/VirtualizingPanel.xml b/xml/System.Windows.Controls/VirtualizingPanel.xml
index 32dc703ed65..d843213deef 100644
--- a/xml/System.Windows.Controls/VirtualizingPanel.xml
+++ b/xml/System.Windows.Controls/VirtualizingPanel.xml
@@ -1423,7 +1423,7 @@ The following example shows how to bind to an XML data source and virtualize the
  The following example shows the data used in the previous example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/Window1.xaml.cs" id="Snippetlistboxdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml.vb" id="Snippetlistboxdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml.vb" id="Snippetlistboxdata":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Controls/VirtualizingStackPanel.xml b/xml/System.Windows.Controls/VirtualizingStackPanel.xml
index da64e20af34..5886d88c81c 100644
--- a/xml/System.Windows.Controls/VirtualizingStackPanel.xml
+++ b/xml/System.Windows.Controls/VirtualizingStackPanel.xml
@@ -53,7 +53,7 @@
  The following example shows the data used in the previous example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/Window1.xaml.cs" id="Snippetlistboxdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml.vb" id="Snippetlistboxdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml.vb" id="Snippetlistboxdata":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Data/Binding.xml b/xml/System.Windows.Data/Binding.xml
index 779b9c1d418..a5689a2bf9b 100644
--- a/xml/System.Windows.Data/Binding.xml
+++ b/xml/System.Windows.Data/Binding.xml
@@ -1569,7 +1569,7 @@
  The following examples uses <xref:System.ComponentModel.IDataErrorInfo> and <xref:System.Windows.Data.Binding.ValidatesOnDataErrors%2A> to validate user input in a <xref:System.Windows.Controls.TextBox>. The first example creates a data type that implements <xref:System.ComponentModel.IDataErrorInfo> to report validation errors.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/Binding/ValidatesOnDataErrors/data.cs" id="Snippetidataerrorinfodata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/window1.xaml.vb" id="Snippetidataerrorinfodata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/window1.xaml.vb" id="Snippetidataerrorinfodata":::
 
  The following example binds the `Age` property to the <xref:System.Windows.Controls.TextBox> and sets <xref:System.Windows.Data.Binding.ValidatesOnDataErrors%2A> to `true` on the <xref:System.Windows.Data.Binding>.  When the user enters an invalid value, a red border appears in the <xref:System.Windows.Controls.TextBox> and the <xref:System.Windows.Controls.ToolTip> reports the error message.
 
@@ -1626,7 +1626,7 @@
  The following examples use <xref:System.Windows.Data.Binding.ValidatesOnExceptions%2A> to validate user input in a <xref:System.Windows.Controls.TextBox>. The first example creates a data type that throws an exception when the `Age` property is set to an invalid property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/Binding/ValidatesOnDataErrors/data.cs" id="Snippetthrowexceptiondata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/bindingvalidationattributessnippets/visualbasic/window1.xaml.vb" id="Snippetthrowexceptiondata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/Binding/ValidatesOnDataErrors/window1.xaml.vb" id="Snippetthrowexceptiondata":::
 
  The following example binds the `Age` property to the <xref:System.Windows.Controls.TextBox> and sets <xref:System.Windows.Data.Binding.ValidatesOnExceptions%2A> to `true` on the <xref:System.Windows.Data.Binding>. When the user enters an invalid value, a red border appears in the <xref:System.Windows.Controls.TextBox> and the <xref:System.Windows.Controls.ToolTip> reports the error message.
 
diff --git a/xml/System.Windows.Data/BindingBase.xml b/xml/System.Windows.Data/BindingBase.xml
index 96bc488be94..e02a40e938e 100644
--- a/xml/System.Windows.Data/BindingBase.xml
+++ b/xml/System.Windows.Data/BindingBase.xml
@@ -107,7 +107,7 @@
  The following example shows the <xref:System.Windows.Controls.ValidationRule> that the previous example uses.  In the <xref:System.Windows.Controls.ValidationRule.Validate%2A> method, the example gets each source object from the <xref:System.Windows.Data.BindingGroup> and checks whether the properties of the objects are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window3.xaml.cs" id="Snippetbindinggroupnamevalidationrule":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml.vb" id="Snippetbindinggroupnamevalidationrule":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml.vb" id="Snippetbindinggroupnamevalidationrule":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Data/BindingExpression.xml b/xml/System.Windows.Data/BindingExpression.xml
index a5784849f58..96a737157ef 100644
--- a/xml/System.Windows.Data/BindingExpression.xml
+++ b/xml/System.Windows.Data/BindingExpression.xml
@@ -79,7 +79,7 @@
  The <xref:System.Windows.Controls.TextBlock> `SavingsText` is the binding target object, and its <xref:System.Windows.Controls.TextBlock.Text%2A> property is the binding target property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingExpression/DataItem/Page1.xaml.cs" id="Snippetonrentraise":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/DirectionalBinding.vb" id="Snippetonrentraise":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/DirectionalBinding.vb" id="Snippetonrentraise":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Data/BindingExpressionBase.xml b/xml/System.Windows.Data/BindingExpressionBase.xml
index aaf270931a7..347cdd1730e 100644
--- a/xml/System.Windows.Data/BindingExpressionBase.xml
+++ b/xml/System.Windows.Data/BindingExpressionBase.xml
@@ -456,12 +456,12 @@
  The following example shows the logic for the user interface.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/window1.xaml.cs" id="Snippetwindowlogic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/window1.xaml.vb" id="Snippetwindowlogic":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/window1.xaml.vb" id="Snippetwindowlogic":::  
   
  The following example shows the data object and <xref:System.Windows.Controls.ValidationRule> for the application.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/data.cs" id="Snippetdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/bindingexpressionbasevalidatewithoutupdating/visualbasic/data.vb" id="Snippetdata":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingExpressionBase/ValidateWithoutUpdate/data.vb" id="Snippetdata":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Data/BindingGroup.xml b/xml/System.Windows.Data/BindingGroup.xml
index 9ef8d25c4e3..0a738010ed4 100644
--- a/xml/System.Windows.Data/BindingGroup.xml
+++ b/xml/System.Windows.Data/BindingGroup.xml
@@ -60,12 +60,12 @@
  The following example shows the event handlers for the application. When the user clicks the Submit button, the application calls <xref:System.Windows.Data.BindingGroup.CommitEdit%2A> to run each <xref:System.Windows.Controls.ValidationRule> that is associated with the <xref:System.Windows.Data.BindingGroup>. If each <xref:System.Windows.Controls.ValidationRule> succeeds, <xref:System.Windows.Data.BindingGroup.CommitEdit%2A> saves the values to the object and ends the edit transaction. If <xref:System.Windows.Data.BindingGroup.CommitEdit%2A> is successful, the application begins another edit transaction. When a <xref:System.Windows.Controls.ValidationRule> fails, the <xref:System.Windows.Controls.Validation.Error?displayProperty=nameWithType> event occurs because the application set <xref:System.Windows.Data.BindingGroup.NotifyOnValidationError%2A> to `true` on the <xref:System.Windows.Data.BindingGroup> (in the previous example). `ItemError` handles the <xref:System.Windows.Controls.Validation.Error?displayProperty=nameWithType> event and displays information about the validation error to the user. The example also handles the <xref:System.Windows.FrameworkElement.Loaded> event for the <xref:System.Windows.Controls.StackPanel> and the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> event for the **Cancel** button.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window1.xaml.cs" id="Snippetwindowlogic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml.vb" id="Snippetwindowlogic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml.vb" id="Snippetwindowlogic":::
 
  The following example shows the custom <xref:System.Windows.Controls.ValidationRule> `ValidateDateAndPrice`, which was added to the <xref:System.Windows.Data.BindingGroup> in the first example. The <xref:System.Windows.Controls.ValidationRule> uses the <xref:System.Windows.Data.BindingGroup> in its <xref:System.Windows.Controls.ValidationRule.Validate%2A> method to get the values the user entered into the form, and checks that if an item is over 100 dollars, it will be available for at least seven days.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Data.cs" id="Snippetvalidateobject":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/data.vb" id="Snippetvalidateobject":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/data.vb" id="Snippetvalidateobject":::
 
  ]]></format>
     </remarks>
@@ -134,7 +134,7 @@
  The following example calls <xref:System.Windows.Data.BindingGroup.BeginEdit%2A> when a window loads to begin the edit transaction.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window1.xaml.cs" id="Snippetbeginedit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml.vb" id="Snippetbeginedit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml.vb" id="Snippetbeginedit":::
 
  ]]></format>
         </remarks>
@@ -226,7 +226,7 @@
  The following example calls <xref:System.Windows.Data.BindingGroup.CancelEdit%2A> to discard the pending changes and then calls <xref:System.Windows.Data.BindingGroup.BeginEdit%2A> to prepare the source to be re-edited.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window1.xaml.cs" id="Snippetcanceledit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml.vb" id="Snippetcanceledit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml.vb" id="Snippetcanceledit":::
 
  ]]></format>
         </remarks>
@@ -309,7 +309,7 @@
  The following example calls <xref:System.Windows.Data.BindingGroup.CommitEdit%2A> to save the pending changes and then calls <xref:System.Windows.Data.BindingGroup.BeginEdit%2A> to prepare the source to be re-edited.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window1.xaml.cs" id="Snippetbeginedit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml.vb" id="Snippetbeginedit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml.vb" id="Snippetbeginedit":::
 
  ]]></format>
         </remarks>
@@ -358,7 +358,7 @@
  The following example is part of an application that prompts the user to enter multiple customers and assign a sales representative to each customer. The application checks that the sales representative and the customer belong to the same region. The example shows the <xref:System.Windows.Controls.ValidationRule.Validate%2A> method, which uses the <xref:System.Windows.Data.BindingGroup.GetValue%28System.Object%2CSystem.String%29> method to get values that the customer entered.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window2.xaml.cs" id="Snippetitembindgroupvalidationrule":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window2.xaml.vb" id="Snippetitembindgroupvalidationrule":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window2.xaml.vb" id="Snippetitembindgroupvalidationrule":::
 
  ]]></format>
         </remarks>
@@ -466,7 +466,7 @@
  The following example shows the <xref:System.Windows.Controls.ValidationRule> that the previous example uses. In the <xref:System.Windows.Controls.ValidationRule.Validate%2A> method, the example gets each source object from the <xref:System.Windows.Data.BindingGroup> and checks whether the properties of the objects are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window3.xaml.cs" id="Snippetbindinggroupnamevalidationrule":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml.vb" id="Snippetbindinggroupnamevalidationrule":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml.vb" id="Snippetbindinggroupnamevalidationrule":::
 
  ]]></format>
         </remarks>
@@ -528,7 +528,7 @@
  The following example shows the <xref:System.Windows.Controls.ValidationRule> that the previous example uses. In the <xref:System.Windows.Controls.ValidationRule.Validate%2A> method, the example gets each source object from the <xref:System.Windows.Data.BindingGroup> and checks whether the properties of the objects are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window3.xaml.cs" id="Snippetbindinggroupnamevalidationrule":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml.vb" id="Snippetbindinggroupnamevalidationrule":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml.vb" id="Snippetbindinggroupnamevalidationrule":::
 
  ]]></format>
         </remarks>
@@ -586,7 +586,7 @@
  The following example handles the <xref:System.Windows.Controls.Validation.Error?displayProperty=nameWithType> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window1.xaml.cs" id="Snippeterrorhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window1.xaml.vb" id="Snippeterrorhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window1.xaml.vb" id="Snippeterrorhandler":::
 
  ]]></format>
         </remarks>
@@ -710,7 +710,7 @@
  The following example creates a custom <xref:System.Windows.Controls.ValidationRule> named `ValidateDateAndPrice`. In the <xref:System.Windows.Controls.ValidationRule.Validate%2A> method, the example uses the <xref:System.Windows.Data.BindingGroup.TryGetValue%2A> method and the <xref:System.Windows.Data.BindingGroup.Items%2A> property to get the values the user entered into the form. Then the example checks that if an item is over 100 dollars, it will be available for at least seven days. This example is part of a larger example on the <xref:System.Windows.Data.BindingGroup> class
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Data.cs" id="Snippetvalidateobject":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/data.vb" id="Snippetvalidateobject":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/data.vb" id="Snippetvalidateobject":::
 
  ]]></format>
         </remarks>
@@ -761,7 +761,7 @@
  The following example is part of an application that prompts the user to enter multiple customers and assign a sales representative to each customer. The application checks that the sales representative and the customer belong to the same region. The example calls <xref:System.Windows.Data.BindingGroup.UpdateSources%2A> to validate the bindings and save the values to the source if all the validation rules succeed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window2.xaml.cs" id="Snippetupdatesources":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window2.xaml.vb" id="Snippetupdatesources":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window2.xaml.vb" id="Snippetupdatesources":::
 
  ]]></format>
         </remarks>
@@ -919,7 +919,7 @@
  The following example shows the `ValidateDateAndPrice` class. The <xref:System.Windows.Controls.ValidationRule.Validate%2A> method uses the <xref:System.Windows.Data.BindingGroup> to get the values the user entered into the form, and checks that if an item is over 100 dollars, it will be available for at least seven days.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Data.cs" id="Snippetvalidateobject":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/data.vb" id="Snippetvalidateobject":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/data.vb" id="Snippetvalidateobject":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Data/BindingListCollectionView.xml b/xml/System.Windows.Data/BindingListCollectionView.xml
index 36f8d033a47..7344015603d 100644
--- a/xml/System.Windows.Data/BindingListCollectionView.xml
+++ b/xml/System.Windows.Data/BindingListCollectionView.xml
@@ -1015,7 +1015,7 @@
  The following example shows how to use this property:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet6":::
 
  For the complete example, see [Data Binding Demo](https://go.microsoft.com/fwlink/?LinkID=163703).
 
diff --git a/xml/System.Windows.Data/BindingOperations.xml b/xml/System.Windows.Data/BindingOperations.xml
index 749d487d87e..04d84841a5e 100644
--- a/xml/System.Windows.Data/BindingOperations.xml
+++ b/xml/System.Windows.Data/BindingOperations.xml
@@ -615,7 +615,7 @@ The net effect is that you can change the collection on any thread, and those ch
  The <xref:System.Windows.Controls.TextBlock> `SavingsText` is the binding target object and <xref:System.Windows.Controls.TextBlock.Text%2A> is the binding target property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingExpression/DataItem/Page1.xaml.cs" id="Snippetonrentraise":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DirectionalBinding/VisualBasic/DirectionalBinding.vb" id="Snippetonrentraise":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingExpression/DataItem/DirectionalBinding.vb" id="Snippetonrentraise":::
 
  ]]></format>
         </remarks>
@@ -982,7 +982,7 @@ The net effect is that you can change the collection on any thread, and those ch
  The following example shows how to use this method to set a binding. In this example, `myNewBindDef` is a <xref:System.Windows.Data.Binding> object that describes the binding. The binding target is `myDateText`, an instance of the <xref:System.Windows.Controls.TextBlock> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingOperations/SetBinding/Window1.xaml.cs" id="Snippetbosetbinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml.vb" id="Snippetbosetbinding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml.vb" id="Snippetbosetbinding":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Data/CollectionView.xml b/xml/System.Windows.Data/CollectionView.xml
index 56d81465dd4..675ec7207d8 100644
--- a/xml/System.Windows.Data/CollectionView.xml
+++ b/xml/System.Windows.Data/CollectionView.xml
@@ -1239,7 +1239,7 @@
  The following example demonstrates the use of this method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/CollectionView/MoveCurrentTo/Colors.xaml.cs" id="Snippetnewcolor":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Colors/visualbasic/colors.xaml.vb" id="Snippetnewcolor":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/CollectionView/MoveCurrentTo/colors.xaml.vb" id="Snippetnewcolor":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Data/CollectionViewSource.xml b/xml/System.Windows.Data/CollectionViewSource.xml
index 97e207546af..eaf2f428c9d 100644
--- a/xml/System.Windows.Data/CollectionViewSource.xml
+++ b/xml/System.Windows.Data/CollectionViewSource.xml
@@ -506,12 +506,12 @@
  The following example shows how to set an event handler for the <xref:System.Windows.Data.CollectionViewSource.Filter> event. In this example, `listingDataView` is an instance of <xref:System.Windows.Data.CollectionViewSource>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet10":::
 
  The following shows the implementation of the example `ShowOnlyBargainsFilter` filter event handler. This event handler uses the <xref:System.Windows.Data.FilterEventArgs.Accepted%2A> property to filter out `AuctionItem` objects that have a `CurrentPrice` of $25 or greater.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet5":::
 
  For the complete example, see [Data Binding Demo](https://go.microsoft.com/fwlink/?LinkID=163703).
 
diff --git a/xml/System.Windows.Data/FilterEventArgs.xml b/xml/System.Windows.Data/FilterEventArgs.xml
index ac2a9251739..1f75458e81c 100644
--- a/xml/System.Windows.Data/FilterEventArgs.xml
+++ b/xml/System.Windows.Data/FilterEventArgs.xml
@@ -29,12 +29,12 @@
  The following example shows how to set an event handler for the <xref:System.Windows.Data.CollectionViewSource.Filter?displayProperty=nameWithType> event. In this example, `listingDataView` is an instance of <xref:System.Windows.Data.CollectionViewSource>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet10":::  
   
  The following example shows the implementation of the example `ShowOnlyBargainsFilter` filter event handler. This event handler uses the <xref:System.Windows.Data.FilterEventArgs.Accepted%2A?displayProperty=nameWithType> property to filter out `AuctionItem` objects that have a `CurrentPrice` of $25.00 or greater.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet5":::  
   
  For the complete example, see [Data Binding Demo](https://go.microsoft.com/fwlink/?LinkID=163703).  
   
@@ -86,12 +86,12 @@
  The following example shows how to set an event handler for the <xref:System.Windows.Data.CollectionViewSource.Filter?displayProperty=nameWithType> event. In this example, `listingDataView` is an instance of <xref:System.Windows.Data.CollectionViewSource>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet10":::  
   
  The following example shows the implementation of the example `ShowOnlyBargainsFilter` filter event handler. This event handler uses the <xref:System.Windows.Data.FilterEventArgs.Accepted%2A?displayProperty=nameWithType> property to filter out `AuctionItem` objects that have a `CurrentPrice` of $25.00 or greater.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet5":::  
   
  For the complete example, see [Data Binding Demo](https://go.microsoft.com/fwlink/?LinkID=163703).  
   
@@ -138,12 +138,12 @@
  The following example shows how to set an event handler for the <xref:System.Windows.Data.CollectionViewSource.Filter?displayProperty=nameWithType> event. In this example, `listingDataView` is an instance of <xref:System.Windows.Data.CollectionViewSource>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet10":::  
   
  The following example shows the implementation of the example `ShowOnlyBargainsFilter` filter event handler. This event handler uses the <xref:System.Windows.Data.FilterEventArgs.Accepted%2A?displayProperty=nameWithType> property to filter out `AuctionItem` objects that have a `CurrentPrice` of $25.00 or greater.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet5":::  
   
  For the complete example, see [Data Binding Demo](https://go.microsoft.com/fwlink/?LinkID=163703).  
   
diff --git a/xml/System.Windows.Data/FilterEventHandler.xml b/xml/System.Windows.Data/FilterEventHandler.xml
index ca2941db101..adf4ee60f15 100644
--- a/xml/System.Windows.Data/FilterEventHandler.xml
+++ b/xml/System.Windows.Data/FilterEventHandler.xml
@@ -37,12 +37,12 @@
  The following example shows how to set an event handler for the <xref:System.Windows.Data.CollectionViewSource.Filter?displayProperty=nameWithType> event. In this example, `listingDataView` is an instance of <xref:System.Windows.Data.CollectionViewSource>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet10":::  
   
  The following example shows the implementation of the example `ShowOnlyBargainsFilter` filter event handler. This event handler uses the <xref:System.Windows.Data.FilterEventArgs.Accepted%2A?displayProperty=nameWithType> property to filter out `AuctionItem` objects that have a `CurrentPrice` of $25.00 or greater.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet5":::  
   
  For the complete example, see [Data Binding Demo](https://go.microsoft.com/fwlink/?LinkID=163703).  
   
diff --git a/xml/System.Windows.Data/ListCollectionView.xml b/xml/System.Windows.Data/ListCollectionView.xml
index 379812fe1cc..5a2fb3e5bdf 100644
--- a/xml/System.Windows.Data/ListCollectionView.xml
+++ b/xml/System.Windows.Data/ListCollectionView.xml
@@ -1186,7 +1186,7 @@
  The following example shows how to use this property:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet6":::
 
  For the complete example, see [Data Binding Demo](https://go.microsoft.com/fwlink/?LinkID=163703).
 
diff --git a/xml/System.Windows.Data/ObjectDataProvider.xml b/xml/System.Windows.Data/ObjectDataProvider.xml
index 84fe28a460a..30fb2b26ad3 100644
--- a/xml/System.Windows.Data/ObjectDataProvider.xml
+++ b/xml/System.Windows.Data/ObjectDataProvider.xml
@@ -167,7 +167,7 @@
 ## Examples
 The highlighted lines in the following example use an <xref:System.Windows.Data.ObjectDataProvider> as a wrapper for a `Person` object. The `<ObjectDataProvider.ConstructorParameters>` element shows how to pass a <xref:System.String> argument to its constructor.
 
- :::code language="xaml" source="~/snippets/visualbasic/VS_Snippets_Wpf/SimpleBinding/VisualBasic/Page1.xaml?highlight=10-14":::
+ :::code language="xaml" source="~/snippets/visualbasic/System.Windows.Data/ObjectDataProvider/ConstructorParameters/Page1.xaml?highlight=10-14":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Data/PropertyGroupDescription.xml b/xml/System.Windows.Data/PropertyGroupDescription.xml
index 592b7acced8..b22c216e8d2 100644
--- a/xml/System.Windows.Data/PropertyGroupDescription.xml
+++ b/xml/System.Windows.Data/PropertyGroupDescription.xml
@@ -73,7 +73,7 @@
  The following example shows how to use this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DataTemplate/Triggers/MainWindow.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DataBindingLab/VisualBasic/MainWindow.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingListCollectionView/GroupDescriptions/MainWindow.xaml.vb" id="Snippet6":::  
   
  For the complete example see [Data Binding Demo](https://go.microsoft.com/fwlink/?LinkID=163703).  
   
diff --git a/xml/System.Windows.Data/RelativeSource.xml b/xml/System.Windows.Data/RelativeSource.xml
index 12569221c39..931dccb6392 100644
--- a/xml/System.Windows.Data/RelativeSource.xml
+++ b/xml/System.Windows.Data/RelativeSource.xml
@@ -52,7 +52,7 @@
  The following returns the second <xref:System.Windows.Controls.ItemsControl> encountered on the upward path starting at the target element of the binding.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingOperations/SetBinding/Window1.xaml.cs" id="Snippetrelativesource":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml.vb" id="Snippetrelativesource":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml.vb" id="Snippetrelativesource":::
 
  ]]></format>
     </remarks>
@@ -160,7 +160,7 @@
  The following returns the second <xref:System.Windows.Controls.ItemsControl> encountered on the upward path starting at the target element of the binding.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingOperations/SetBinding/Window1.xaml.cs" id="Snippetrelativesource":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml.vb" id="Snippetrelativesource":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml.vb" id="Snippetrelativesource":::
 
  ]]></format>
         </remarks>
@@ -213,7 +213,7 @@ For XAML information, see [RelativeSource MarkupExtension](/dotnet/framework/wpf
  The following returns the second <xref:System.Windows.Controls.ItemsControl> encountered on the upward path starting at the target element of the binding.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingOperations/SetBinding/Window1.xaml.cs" id="Snippetrelativesource":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml.vb" id="Snippetrelativesource":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml.vb" id="Snippetrelativesource":::
 
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@ For XAML information, see [RelativeSource MarkupExtension](/dotnet/framework/wpf
  The following returns the second <xref:System.Windows.Controls.ItemsControl> encountered on the upward path starting at the target element of the binding.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Data/BindingOperations/SetBinding/Window1.xaml.cs" id="Snippetrelativesource":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindConversion/visualbasic/window1.xaml.vb" id="Snippetrelativesource":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Data/BindingOperations/SetBinding/window1.xaml.vb" id="Snippetrelativesource":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents.Serialization/SerializerWriter.xml b/xml/System.Windows.Documents.Serialization/SerializerWriter.xml
index 0e6d78b130d..ffcce6fea2d 100644
--- a/xml/System.Windows.Documents.Serialization/SerializerWriter.xml
+++ b/xml/System.Windows.Documents.Serialization/SerializerWriter.xml
@@ -124,7 +124,7 @@
  The following example shows the use of the <xref:System.Windows.Documents.Serialization.SerializerWriter.CreateVisualsCollator%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetcreateandwritetovisualscollator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
   
  ]]></format>
         </remarks>
@@ -163,7 +163,7 @@
  The following example shows the use of the <xref:System.Windows.Documents.Serialization.SerializerWriter.CreateVisualsCollator%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetcreateandwritetovisualscollator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
   
  ]]></format>
         </remarks>
@@ -224,7 +224,7 @@
  The following example shows the use of the <xref:System.Windows.Documents.Serialization.SerializerWriter.CreateVisualsCollator%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetcreateandwritetovisualscollator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/AnchoredBlock.xml b/xml/System.Windows.Documents/AnchoredBlock.xml
index 9a14853e2f1..4b01bcd3ee0 100644
--- a/xml/System.Windows.Documents/AnchoredBlock.xml
+++ b/xml/System.Windows.Documents/AnchoredBlock.xml
@@ -154,7 +154,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.BorderBrush%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_borders":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_borders":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_borders":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.BorderThickness%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_borders":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_borders":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_borders":::
 
  ]]></format>
         </remarks>
@@ -414,7 +414,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.AnchoredBlock.LineHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_lineheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_lineheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_lineheight":::
 
  ]]></format>
         </remarks>
@@ -622,7 +622,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.AnchoredBlock.Margin%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_marginpadding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_marginpadding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_marginpadding":::
 
  ]]></format>
         </remarks>
@@ -749,7 +749,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.AnchoredBlock.Padding%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_marginpadding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_marginpadding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_marginpadding":::
 
  ]]></format>
         </remarks>
@@ -884,7 +884,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.AnchoredBlock.TextAlignment%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_textalignment":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_textalignment":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_textalignment":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Block.xml b/xml/System.Windows.Documents/Block.xml
index 8de83dd2de6..6fadd20c5a4 100644
--- a/xml/System.Windows.Documents/Block.xml
+++ b/xml/System.Windows.Documents/Block.xml
@@ -122,7 +122,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.BorderBrush%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_borders":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_borders":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_borders":::
 
  ]]></format>
         </remarks>
@@ -247,7 +247,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.BorderThickness%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_borders":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_borders":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_borders":::
 
  ]]></format>
         </remarks>
@@ -547,7 +547,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.FlowDirection%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_flowdirection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_flowdirection":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_flowdirection":::
 
  ]]></format>
         </remarks>
@@ -784,7 +784,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.IsHyphenationEnabled%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_hyphenate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_hyphenate":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_hyphenate":::
 
  ]]></format>
         </remarks>
@@ -916,7 +916,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.LineHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_lineheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_lineheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_lineheight":::
 
  ]]></format>
         </remarks>
@@ -1124,7 +1124,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.Margin%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_marginpadding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_marginpadding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_marginpadding":::
 
  ]]></format>
         </remarks>
@@ -1280,7 +1280,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.Padding%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_marginpadding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_marginpadding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_marginpadding":::
 
  ]]></format>
         </remarks>
@@ -1593,7 +1593,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Block.TextAlignment%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_textalignment":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_textalignment":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_textalignment":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/BlockUIContainer.xml b/xml/System.Windows.Documents/BlockUIContainer.xml
index 70f7289c9c6..72076db6982 100644
--- a/xml/System.Windows.Documents/BlockUIContainer.xml
+++ b/xml/System.Windows.Documents/BlockUIContainer.xml
@@ -123,7 +123,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_blockui_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_blockui_const1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_blockui_const1":::  
   
  ]]></format>
         </remarks>
@@ -176,7 +176,7 @@
  The following example shows how to use the <xref:System.Windows.Documents.BlockUIContainer.Child%2A> property programmatically.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_blockui_child":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_blockui_child":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_blockui_child":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Bold.xml b/xml/System.Windows.Documents/Bold.xml
index bc6b4f9b45f..b1f0389cba2 100644
--- a/xml/System.Windows.Documents/Bold.xml
+++ b/xml/System.Windows.Documents/Bold.xml
@@ -112,7 +112,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_bold_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_bold_const1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_bold_const1":::  
   
  ]]></format>
         </remarks>
@@ -158,7 +158,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_bold_const2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_bold_const2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_bold_const2":::  
   
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_bold_const3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_bold_const3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_bold_const3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/DocumentPaginator.xml b/xml/System.Windows.Documents/DocumentPaginator.xml
index f77fca5ab8f..8b4ce54d07f 100644
--- a/xml/System.Windows.Documents/DocumentPaginator.xml
+++ b/xml/System.Windows.Documents/DocumentPaginator.xml
@@ -673,7 +673,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.DocumentPaginator.PageSize%2A>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetcreatefixeddocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetcreatefixeddocument":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetcreatefixeddocument":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/EditingCommands.xml b/xml/System.Windows.Documents/EditingCommands.xml
index 0dad6005772..b38d85717fd 100644
--- a/xml/System.Windows.Documents/EditingCommands.xml
+++ b/xml/System.Windows.Documents/EditingCommands.xml
@@ -103,7 +103,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
     </remarks>
@@ -173,7 +173,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -248,7 +248,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -315,7 +315,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -382,7 +382,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -447,7 +447,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -550,7 +550,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -612,7 +612,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -673,7 +673,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -733,7 +733,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -798,7 +798,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -863,7 +863,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -927,7 +927,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1031,7 +1031,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1093,7 +1093,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1152,7 +1152,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1214,7 +1214,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1280,7 +1280,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1342,7 +1342,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1405,7 +1405,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1466,7 +1466,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1529,7 +1529,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1592,7 +1592,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1654,7 +1654,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1714,7 +1714,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1774,7 +1774,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1834,7 +1834,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1896,7 +1896,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -1962,7 +1962,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2024,7 +2024,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2086,7 +2086,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2150,7 +2150,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2212,7 +2212,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2277,7 +2277,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2338,7 +2338,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2403,7 +2403,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2466,7 +2466,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2528,7 +2528,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2588,7 +2588,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2648,7 +2648,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2708,7 +2708,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2770,7 +2770,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -2834,7 +2834,7 @@
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -3040,7 +3040,7 @@ EditingCommands.ToggleInsert.Execute(Nothing, rTB)
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -3102,7 +3102,7 @@ EditingCommands.ToggleInsert.Execute(Nothing, rTB)
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -3161,7 +3161,7 @@ EditingCommands.ToggleInsert.Execute(Nothing, rTB)
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -3223,7 +3223,7 @@ EditingCommands.ToggleInsert.Execute(Nothing, rTB)
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -3285,7 +3285,7 @@ EditingCommands.ToggleInsert.Execute(Nothing, rTB)
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -3342,7 +3342,7 @@ EditingCommands.ToggleInsert.Execute(Nothing, rTB)
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -3399,7 +3399,7 @@ EditingCommands.ToggleInsert.Execute(Nothing, rTB)
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
@@ -3460,7 +3460,7 @@ EditingCommands.ToggleInsert.Execute(Nothing, rTB)
  The second argument specifies the object to which the command will be routed.  This object must implement the <xref:System.Windows.IInputElement> interface, and should include a handler for the specified command.  Generally, a command is ignored when invoked on an object that does not handle the command.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/RichTextBox/Overview/Window1.xaml.cs" id="Snippet_editingcommands_invoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RichTextBoxSnippets/visualbasic/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/RichTextBox/.ctor/window1.xaml.vb" id="Snippet_editingcommands_invoke":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Figure.xml b/xml/System.Windows.Documents/Figure.xml
index d6a73019a27..19c3771abc6 100644
--- a/xml/System.Windows.Documents/Figure.xml
+++ b/xml/System.Windows.Documents/Figure.xml
@@ -143,7 +143,7 @@
  The following example demonstrates the use of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureconst1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureconst1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureconst1":::
 
  ]]></format>
         </remarks>
@@ -189,7 +189,7 @@
  The following example demonstrates the use of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureconst2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureconst2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureconst2":::
 
  ]]></format>
         </remarks>
@@ -315,7 +315,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.Height%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::
 
  ]]></format>
         </remarks>
@@ -398,7 +398,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.HorizontalAnchor%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::
 
  ]]></format>
         </remarks>
@@ -514,7 +514,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.HorizontalOffset%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::
 
  ]]></format>
         </remarks>
@@ -597,7 +597,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.VerticalAnchor%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::
 
  ]]></format>
         </remarks>
@@ -713,7 +713,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.VerticalOffset%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::
 
  ]]></format>
         </remarks>
@@ -796,7 +796,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.Width%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::
 
  ]]></format>
         </remarks>
@@ -879,7 +879,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.WrapDirection%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/FixedDocument.xml b/xml/System.Windows.Documents/FixedDocument.xml
index 23106fabcfd..56978492e37 100644
--- a/xml/System.Windows.Documents/FixedDocument.xml
+++ b/xml/System.Windows.Documents/FixedDocument.xml
@@ -88,7 +88,7 @@
  The following example shows use of the **FixedDocument** constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetcreatefixeddocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetcreatefixeddocument":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetcreatefixeddocument":::
 
  ]]></format>
         </remarks>
@@ -140,12 +140,12 @@
  The following example shows how to create a <xref:System.Windows.Documents.FixedDocument> that has a paginator configured for a particular page size.
 
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/WpfContent.cs" id="Snippetcreatefixeddocumentwithconfiguredpaginator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/wpfcontent.vb" id="Snippetcreatefixeddocumentwithconfiguredpaginator":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/wpfcontent.vb" id="Snippetcreatefixeddocumentwithconfiguredpaginator":::
 
  The following example also shows use of the <xref:System.Windows.Documents.FixedDocument.DocumentPaginator%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetcreatefixeddocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetcreatefixeddocument":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetcreatefixeddocument":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/FixedDocumentSequence.xml b/xml/System.Windows.Documents/FixedDocumentSequence.xml
index e4c4a63124e..f18f53712d4 100644
--- a/xml/System.Windows.Documents/FixedDocumentSequence.xml
+++ b/xml/System.Windows.Documents/FixedDocumentSequence.xml
@@ -59,7 +59,7 @@
  The following example show how to obtain the <xref:System.Windows.Documents.FixedDocumentSequence> of an <xref:System.Windows.Xps.Packaging.XpsDocument> by use of the <xref:System.Windows.Xps.Packaging.XpsDocument.GetFixedDocumentSequence%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/Window1.xaml.cs" id="Snippetxpssaveloadfixedcontent":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/window1.xaml.vb" id="Snippetxpssaveloadfixedcontent":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/window1.xaml.vb" id="Snippetxpssaveloadfixedcontent":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Documents/FixedPage.xml b/xml/System.Windows.Documents/FixedPage.xml
index 012da05ceed..1a386e19a5d 100644
--- a/xml/System.Windows.Documents/FixedPage.xml
+++ b/xml/System.Windows.Documents/FixedPage.xml
@@ -50,7 +50,7 @@
  The following example shows use of the <xref:System.Windows.Documents.FixedPage> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetxpssavecreatefixedpage5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
 
  ]]></format>
     </remarks>
@@ -84,7 +84,7 @@
  The following example shows use of the <xref:System.Windows.Documents.FixedPage> constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetxpssavecreatefixedpage5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
 
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
  The following example shows use of the <xref:System.Windows.Documents.FixedPage.Background%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetxpssavecreatefixedpage1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetxpssavecreatefixedpage1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetxpssavecreatefixedpage1":::
 
  ]]></format>
         </remarks>
@@ -1352,7 +1352,7 @@
  The following example shows use of the <xref:System.Windows.Documents.FixedPage.SetLeft%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetxpssavecreatefixedpage5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
 
  ]]></format>
         </remarks>
@@ -1495,7 +1495,7 @@
  The following example shows use of the <xref:System.Windows.Documents.FixedPage.SetTop%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetxpssavecreatefixedpage5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Floater.xml b/xml/System.Windows.Documents/Floater.xml
index 41b0273174a..3941e2197d7 100644
--- a/xml/System.Windows.Documents/Floater.xml
+++ b/xml/System.Windows.Documents/Floater.xml
@@ -142,7 +142,7 @@
  The following example demonstrates how to use this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_floaterconst1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_floaterconst1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_floaterconst1":::
 
  ]]></format>
         </remarks>
@@ -188,7 +188,7 @@
  The following example demonstrates how to use this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_floaterconst2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_floaterconst2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_floaterconst2":::
 
  ]]></format>
         </remarks>
@@ -240,7 +240,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml" id="Snippet_floaterpropsxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_floaterprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_floaterprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_floaterprops":::
 
  ]]></format>
         </remarks>
@@ -357,7 +357,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml" id="Snippet_floaterpropsxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_floaterprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_floaterprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_floaterprops":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/FlowDocument.xml b/xml/System.Windows.Documents/FlowDocument.xml
index 4a2d77f8d9f..b6af507a56a 100644
--- a/xml/System.Windows.Documents/FlowDocument.xml
+++ b/xml/System.Windows.Documents/FlowDocument.xml
@@ -136,12 +136,12 @@
  The following example demonstrates the use of this constructor.  In this case, the <xref:System.Windows.Documents.FlowDocument> contains a flow element block structure consisting of a text run nested in a paragraph.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentconstructorsimple":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentconstructorsimple":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentconstructorsimple":::
 
  The following example programmatically constructs a simple 2 x 2 table and then uses the <xref:System.Windows.Documents.FlowDocument> constructor to create a new <xref:System.Windows.Documents.FlowDocument> containing the table.  Though a somewhat more complicated flow element block structure is used, use of the constructor is the same as in the preceding example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentconstructortable":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentconstructortable":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentconstructortable":::
 
  ]]></format>
         </remarks>
@@ -198,7 +198,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.Background%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentbackground":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentbackground":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentbackground":::
 
  ]]></format>
         </remarks>
@@ -379,7 +379,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.ColumnGap%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentcolumngap":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentcolumngap":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentcolumngap":::
 
  ]]></format>
         </remarks>
@@ -465,7 +465,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.ColumnRuleBrush%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentcolumnrule":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentcolumnrule":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentcolumnrule":::
 
  ]]></format>
         </remarks>
@@ -586,7 +586,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.ColumnRuleWidth%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentcolumnrule":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentcolumnrule":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentcolumnrule":::
 
  ]]></format>
         </remarks>
@@ -714,7 +714,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.ColumnWidth%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentcolumnwidth":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentcolumnwidth":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentcolumnwidth":::
 
  ]]></format>
         </remarks>
@@ -786,7 +786,7 @@
  The following example uses the <xref:System.Windows.Documents.FlowDocument.ContentEnd%2A> property to append content to a <xref:System.Windows.Documents.FlowDocument>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentcontentend":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentcontentend":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentcontentend":::
 
  ]]></format>
         </remarks>
@@ -832,7 +832,7 @@
  The following example uses the <xref:System.Windows.Documents.FlowDocument.ContentStart%2A> property to insert content at the beginning of a <xref:System.Windows.Documents.FlowDocument>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentcontentstart":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentcontentstart":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentcontentstart":::
 
  ]]></format>
         </remarks>
@@ -893,7 +893,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.FlowDirection%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentflowdirection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentflowdirection":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentflowdirection":::
 
  ]]></format>
         </remarks>
@@ -1012,7 +1012,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.FontFamily%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentfontstuff":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
 
  ]]></format>
         </remarks>
@@ -1131,7 +1131,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.FontSize%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentfontstuff":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
 
  ]]></format>
         </remarks>
@@ -1213,7 +1213,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.FontStretch%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentfontstuff":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
 
  ]]></format>
         </remarks>
@@ -1295,7 +1295,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.FontStyle%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentfontstuff":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
 
  ]]></format>
         </remarks>
@@ -1377,7 +1377,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.FontWeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentfontstuff":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentfontstuff":::
 
  ]]></format>
         </remarks>
@@ -1461,7 +1461,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.Foreground%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentbackground":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentbackground":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentbackground":::
 
  ]]></format>
         </remarks>
@@ -1548,7 +1548,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.IsColumnWidthFlexible%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentcolumnflex":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentcolumnflex":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentcolumnflex":::
 
  ]]></format>
         </remarks>
@@ -1667,7 +1667,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.IsHyphenationEnabled%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumenthyphenate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumenthyphenate":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumenthyphenate":::
 
  ]]></format>
         </remarks>
@@ -1758,7 +1758,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.IsOptimalParagraphEnabled%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumenthyphenate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumenthyphenate":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumenthyphenate":::
 
  ]]></format>
         </remarks>
@@ -1888,7 +1888,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.LineHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentlineheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentlineheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentlineheight":::
 
  ]]></format>
         </remarks>
@@ -2115,7 +2115,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.MaxPageHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpagewidthheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
 
  ]]></format>
         </remarks>
@@ -2232,7 +2232,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.MaxPageWidth%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpagewidthheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
 
  ]]></format>
         </remarks>
@@ -2349,7 +2349,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.MinPageHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpagewidthheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
 
  ]]></format>
         </remarks>
@@ -2466,7 +2466,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.MinPageWidth%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpagewidthheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
 
  ]]></format>
         </remarks>
@@ -2661,7 +2661,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.PageHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpagewidthheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
 
  ]]></format>
         </remarks>
@@ -2784,7 +2784,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.PagePadding%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpadding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpadding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpadding":::
 
  ]]></format>
         </remarks>
@@ -2904,7 +2904,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.PageWidth%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumentpagewidthheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumentpagewidthheight":::
 
  ]]></format>
         </remarks>
@@ -3172,7 +3172,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.FlowDocument.TextAlignment%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumenttextalignment":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumenttextalignment":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumenttextalignment":::
 
  ]]></format>
         </remarks>
@@ -3315,7 +3315,7 @@
  The following example shows how to set various aspects of the <xref:System.Windows.Documents.FlowDocument.Typography%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextAlignment/Overview/Window1.xaml.cs" id="Snippet_flowdocumenttypography":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FlowDocumentSnippets/visualbasic/window1.xaml.vb" id="Snippet_flowdocumenttypography":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/FlowDocumentPageViewer/MaxZoom/window1.xaml.vb" id="Snippet_flowdocumenttypography":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Hyperlink.xml b/xml/System.Windows.Documents/Hyperlink.xml
index 500d1d8d833..9982c89cdb1 100644
--- a/xml/System.Windows.Documents/Hyperlink.xml
+++ b/xml/System.Windows.Documents/Hyperlink.xml
@@ -54,7 +54,7 @@
  The following example shows how to create a <xref:System.Windows.Documents.Hyperlink> programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Hyperlink/Overview/Window1.xaml.cs" id="Snippet_hyperlink_navuri":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml.vb" id="Snippet_hyperlink_navuri":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml.vb" id="Snippet_hyperlink_navuri":::
 
  ]]></format>
     </remarks>
@@ -125,7 +125,7 @@
  The following example demonstrates usage of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Hyperlink/Overview/Window1.xaml.cs" id="Snippet_hyperlink_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml.vb" id="Snippet_hyperlink_const1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml.vb" id="Snippet_hyperlink_const1":::
 
  ]]></format>
         </remarks>
@@ -165,7 +165,7 @@
  The following example demonstrates usage of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Hyperlink/Overview/Window1.xaml.cs" id="Snippet_hyperlink_const2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml.vb" id="Snippet_hyperlink_const2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml.vb" id="Snippet_hyperlink_const2":::
 
  ]]></format>
         </remarks>
@@ -210,7 +210,7 @@
  The following example demonstrates usage of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Hyperlink/Overview/Window1.xaml.cs" id="Snippet_hyperlink_const3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml.vb" id="Snippet_hyperlink_const3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml.vb" id="Snippet_hyperlink_const3":::
 
  ]]></format>
         </remarks>
@@ -711,7 +711,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Hyperlink.NavigateUri%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Hyperlink/Overview/Window1.xaml.cs" id="Snippet_hyperlink_navuri":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HyperlinkSnippets/visualbasic/window1.xaml.vb" id="Snippet_hyperlink_navuri":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Hyperlink/Overview/window1.xaml.vb" id="Snippet_hyperlink_navuri":::
 
  The following example shows how to use a **mailto:** uniform resource identifier (URI) to open a new mail window that contains an email address, an email address and a subject, and an email address, subject, and body.
 
diff --git a/xml/System.Windows.Documents/IDocumentPaginatorSource.xml b/xml/System.Windows.Documents/IDocumentPaginatorSource.xml
index 4d84d17ab68..345ce9d76ad 100644
--- a/xml/System.Windows.Documents/IDocumentPaginatorSource.xml
+++ b/xml/System.Windows.Documents/IDocumentPaginatorSource.xml
@@ -27,7 +27,7 @@
  The following example shows use of the <xref:System.Windows.Documents.IDocumentPaginatorSource> interface.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/Window1.xaml.cs" id="Snippetxpssaveloadfixedcontent":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/window1.xaml.vb" id="Snippetxpssaveloadfixedcontent":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/window1.xaml.vb" id="Snippetxpssaveloadfixedcontent":::  
   
  ]]></format>
     </remarks>
@@ -65,7 +65,7 @@
  The following example shows use of the <xref:System.Windows.Documents.IDocumentPaginatorSource.DocumentPaginator%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetcreatefixeddocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetcreatefixeddocument":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetcreatefixeddocument":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Inline.xml b/xml/System.Windows.Documents/Inline.xml
index 7d345b3b089..230f9e40b0c 100644
--- a/xml/System.Windows.Documents/Inline.xml
+++ b/xml/System.Windows.Documents/Inline.xml
@@ -188,7 +188,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Inline.FlowDirection%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_flowdirection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_flowdirection":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_flowdirection":::
 
  ]]></format>
         </remarks>
@@ -255,10 +255,10 @@
  The following example shows how to use the <xref:System.Windows.Documents.Inline.NextInline%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_siblingbase":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_siblingbase":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_siblingbase":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_nextsibling":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_nextsibling":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_nextsibling":::
 
  ]]></format>
         </remarks>
@@ -300,10 +300,10 @@
  The following example shows how to use the <xref:System.Windows.Documents.Inline.NextInline%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_siblingbase":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_siblingbase":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_siblingbase":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_previoussibling":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_previoussibling":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_previoussibling":::
 
  ]]></format>
         </remarks>
@@ -350,10 +350,10 @@
  The following example shows how to use the <xref:System.Windows.Documents.Inline.SiblingInlines%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_siblingbase":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_siblingbase":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_siblingbase":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_siblings":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_siblings":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_siblings":::
 
  ]]></format>
         </remarks>
@@ -424,7 +424,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Inline.TextDecorations%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_inline_textdec":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_inline_textdec":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_inline_textdec":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/InlineUIContainer.xml b/xml/System.Windows.Documents/InlineUIContainer.xml
index 582607c5365..13057b71398 100644
--- a/xml/System.Windows.Documents/InlineUIContainer.xml
+++ b/xml/System.Windows.Documents/InlineUIContainer.xml
@@ -133,7 +133,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_inlineui_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_inlineui_const1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_inlineui_const1":::  
   
  ]]></format>
         </remarks>
@@ -173,7 +173,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_inlineui_const2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_inlineui_const2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_inlineui_const2":::  
   
  ]]></format>
         </remarks>
@@ -226,7 +226,7 @@
  The following example shows how to use the <xref:System.Windows.Documents.InlineUIContainer.Child%2A> property programmatically.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_inlineui_child":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_inlineui_child":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_inlineui_child":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Italic.xml b/xml/System.Windows.Documents/Italic.xml
index edeca09926c..fe6a2e63495 100644
--- a/xml/System.Windows.Documents/Italic.xml
+++ b/xml/System.Windows.Documents/Italic.xml
@@ -112,7 +112,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_italic_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_italic_const1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_italic_const1":::  
   
  ]]></format>
         </remarks>
@@ -158,7 +158,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_italic_const2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_italic_const2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_italic_const2":::  
   
  ]]></format>
         </remarks>
@@ -204,7 +204,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_italic_const3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_italic_const3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_italic_const3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/List.xml b/xml/System.Windows.Documents/List.xml
index 71b005d37dc..8670744aa83 100644
--- a/xml/System.Windows.Documents/List.xml
+++ b/xml/System.Windows.Documents/List.xml
@@ -49,7 +49,7 @@
  The following example shows how to create and populate a <xref:System.Windows.Documents.List> programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/List/Overview/Window1.xaml.cs" id="Snippet_list_props":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml.vb" id="Snippet_list_props":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml.vb" id="Snippet_list_props":::
 
  The following figure shows how this example renders.
 
@@ -139,7 +139,7 @@
  The following example demonstrates usage of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/List/Overview/Window1.xaml.cs" id="Snippet_list_const":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml.vb" id="Snippet_list_const":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml.vb" id="Snippet_list_const":::
 
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@
  The following examples show how to perform common operations on a <xref:System.Windows.Documents.List> using the <xref:System.Windows.Documents.List.ListItems%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/List/Overview/Window1.xaml.cs" id="Snippet_list_listitems":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml.vb" id="Snippet_list_listitems":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml.vb" id="Snippet_list_listitems":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/ListItem.xml b/xml/System.Windows.Documents/ListItem.xml
index 933bfba6883..66310fb87f5 100644
--- a/xml/System.Windows.Documents/ListItem.xml
+++ b/xml/System.Windows.Documents/ListItem.xml
@@ -46,7 +46,7 @@
  The following example shows how to create and populate a <xref:System.Windows.Documents.List> programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/List/Overview/Window1.xaml.cs" id="Snippet_list_props":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml.vb" id="Snippet_list_props":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml.vb" id="Snippet_list_props":::
 
  The following figure shows how this example renders.
 
@@ -135,7 +135,7 @@
  The following example demonstrates usage of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/List/Overview/Window1.xaml.cs" id="Snippet_list_const":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListSnippets/visualbasic/window1.xaml.vb" id="Snippet_list_const":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/List/Overview/window1.xaml.vb" id="Snippet_list_const":::
 
  ]]></format>
         </remarks>
@@ -239,7 +239,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.BorderBrush%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_borders":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_borders":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_borders":::
 
  ]]></format>
         </remarks>
@@ -364,7 +364,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.BorderThickness%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_borders":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_borders":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_borders":::
 
  ]]></format>
         </remarks>
@@ -452,7 +452,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.FlowDirection%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_flowdirection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_flowdirection":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_flowdirection":::
 
  ]]></format>
         </remarks>
@@ -580,7 +580,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.LineHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_lineheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_lineheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_lineheight":::
 
  ]]></format>
         </remarks>
@@ -813,7 +813,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.Margin%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_marginpadding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_marginpadding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_marginpadding":::
 
  ]]></format>
         </remarks>
@@ -969,7 +969,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.Padding%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_marginpadding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_marginpadding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_marginpadding":::
 
  ]]></format>
         </remarks>
@@ -1171,7 +1171,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.TextAlignment%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_textalignment":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_textalignment":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_textalignment":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/PageContent.xml b/xml/System.Windows.Documents/PageContent.xml
index a5441050336..77d85d74d98 100644
--- a/xml/System.Windows.Documents/PageContent.xml
+++ b/xml/System.Windows.Documents/PageContent.xml
@@ -53,7 +53,7 @@
  The following example shows the process of adding <xref:System.Windows.Documents.PageContent> to a <xref:System.Windows.Documents.FixedDocument>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetxpssavecreatefixeddocpages":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetxpssavecreatefixeddocpages":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetxpssavecreatefixeddocpages":::
 
  ]]></format>
     </remarks>
@@ -87,7 +87,7 @@
  The following example shows use of the <xref:System.Windows.Documents.PageContent.%23ctor%2A> constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpfContent.cs" id="Snippetxpssavecreatefixedpage5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpfcontent.vb" id="Snippetxpssavecreatefixedpage5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Paragraph.xml b/xml/System.Windows.Documents/Paragraph.xml
index ec4fc06684e..107ab24298a 100644
--- a/xml/System.Windows.Documents/Paragraph.xml
+++ b/xml/System.Windows.Documents/Paragraph.xml
@@ -134,7 +134,7 @@
  The following example demonstrates usage of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_paragraph_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_paragraph_const1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_paragraph_const1":::
 
  ]]></format>
         </remarks>
@@ -576,7 +576,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml" id="Snippet_paragraph_textdecxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextDecorations/Window1.xaml.cs" id="Snippet_paragraph_textdec":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InlineSnippets/visualbasic/window1.xaml.vb" id="Snippet_paragraph_textdec":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextDecorations/window1.xaml.vb" id="Snippet_paragraph_textdec":::
 
  The following figure shows how this example renders.
 
diff --git a/xml/System.Windows.Documents/Run.xml b/xml/System.Windows.Documents/Run.xml
index 9e197c98228..f6fbc2ca420 100644
--- a/xml/System.Windows.Documents/Run.xml
+++ b/xml/System.Windows.Documents/Run.xml
@@ -125,7 +125,7 @@
  The following example demonstrates the use of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Run/.ctor/Window1.xaml.cs" id="Snippet_run_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/window1.xaml.vb" id="Snippet_run_const1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Run/.ctor/window1.xaml.vb" id="Snippet_run_const1":::
 
  ]]></format>
         </remarks>
@@ -165,7 +165,7 @@
  The following example demonstrates the use of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Run/.ctor/Window1.xaml.cs" id="Snippet_run_const2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RunSnippets/visualbasic/window1.xaml.vb" id="Snippet_run_const2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Run/.ctor/window1.xaml.vb" id="Snippet_run_const2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Section.xml b/xml/System.Windows.Documents/Section.xml
index 310dce14e84..cb89983a6f1 100644
--- a/xml/System.Windows.Documents/Section.xml
+++ b/xml/System.Windows.Documents/Section.xml
@@ -123,7 +123,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_section_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_section_const1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_section_const1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Span.xml b/xml/System.Windows.Documents/Span.xml
index 2f993e50e61..8465c21662c 100644
--- a/xml/System.Windows.Documents/Span.xml
+++ b/xml/System.Windows.Documents/Span.xml
@@ -139,7 +139,7 @@
  The following example shows how to use this constructor to create a new Span that contains a <xref:System.Windows.Documents.Run>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_span_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_span_const1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_span_const1":::  
   
  ]]></format>
         </remarks>
@@ -179,7 +179,7 @@
  The following example shows how to use this constructor to create a new <xref:System.Windows.Documents.Span> that contains a <xref:System.Windows.Documents.Run> inserted at the start of a <xref:System.Windows.Documents.Paragraph>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_span_const2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_span_const2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_span_const2":::  
   
  ]]></format>
         </remarks>
@@ -224,7 +224,7 @@
  The following example shows how to use this constructor to create a new <xref:System.Windows.Documents.Span> that is applied to a range of content. The range of content is determined by the start and end <xref:System.Windows.Documents.TextPointer> objects specified by the constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_span_const3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_span_const3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_span_const3":::  
   
  The following figure shows how this example renders in a <xref:System.Windows.Documents.FlowDocument>.  
   
diff --git a/xml/System.Windows.Documents/TableCell.xml b/xml/System.Windows.Documents/TableCell.xml
index 48671366ffd..e1846a26ee9 100644
--- a/xml/System.Windows.Documents/TableCell.xml
+++ b/xml/System.Windows.Documents/TableCell.xml
@@ -120,7 +120,7 @@
  The following example demonstrates usage of this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/ToolTip/Window1.xaml.cs" id="Snippet_tablecell_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/window1.xaml.vb" id="Snippet_tablecell_const1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/window1.xaml.vb" id="Snippet_tablecell_const1":::
 
  ]]></format>
         </remarks>
@@ -228,7 +228,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.BorderBrush%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_borders":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_borders":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_borders":::
 
  ]]></format>
         </remarks>
@@ -355,7 +355,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.BorderThickness%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_borders":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_borders":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_borders":::
 
  ]]></format>
         </remarks>
@@ -515,7 +515,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.ListItem.FlowDirection%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_flowdirection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_flowdirection":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_flowdirection":::
 
  ]]></format>
         </remarks>
@@ -649,7 +649,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TableCell.LineHeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_lineheight":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_lineheight":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_lineheight":::
 
  ]]></format>
         </remarks>
@@ -892,7 +892,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TableCell.Padding%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_marginpadding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_marginpadding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_marginpadding":::
 
  ]]></format>
         </remarks>
@@ -1059,7 +1059,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TableCell.TextAlignment%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_textalignment":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_textalignment":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_textalignment":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/TableRowGroup.xml b/xml/System.Windows.Documents/TableRowGroup.xml
index 11ac68cb7d0..2522391a24b 100644
--- a/xml/System.Windows.Documents/TableRowGroup.xml
+++ b/xml/System.Windows.Documents/TableRowGroup.xml
@@ -117,7 +117,7 @@
  The following examples show how to use this property to perform common operations on a <xref:System.Windows.Documents.TableRowGroup>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/ToolTip/Window1.xaml.cs" id="Snippet_tablerowgroup_rows":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/window1.xaml.vb" id="Snippet_tablerowgroup_rows":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/window1.xaml.vb" id="Snippet_tablerowgroup_rows":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/TextElement.xml b/xml/System.Windows.Documents/TextElement.xml
index cd98d96fede..aff782893ac 100644
--- a/xml/System.Windows.Documents/TextElement.xml
+++ b/xml/System.Windows.Documents/TextElement.xml
@@ -81,7 +81,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TextElement.Background%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_background":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_background":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_background":::
 
  ]]></format>
         </remarks>
@@ -359,7 +359,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TextElement.FontFamily%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_fontprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_fontprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_fontprops":::
 
  ]]></format>
         </remarks>
@@ -480,7 +480,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TextElement.FontSize%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_fontprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_fontprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_fontprops":::
 
  ]]></format>
         </remarks>
@@ -566,7 +566,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TextElement.FontStretch%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_fontprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_fontprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_fontprops":::
 
  ]]></format>
         </remarks>
@@ -650,7 +650,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TextElement.FontStyle%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_fontprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_fontprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_fontprops":::
 
  ]]></format>
         </remarks>
@@ -734,7 +734,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TextElement.FontWeight%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_fontprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_fontprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_fontprops":::
 
  ]]></format>
         </remarks>
@@ -820,7 +820,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TextElement.Foreground%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_background":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_background":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_background":::
 
  ]]></format>
         </remarks>
@@ -1463,7 +1463,7 @@
  The following example shows how to create a simple text effect and apply it to a text <xref:System.Windows.Documents.Run> through the <xref:System.Windows.Documents.TextElement.TextEffects%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_texteffects":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_texteffects":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_texteffects":::
 
  ]]></format>
         </remarks>
@@ -1543,7 +1543,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.TextElement.Typography%2A> property programmatically.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/TextEffects/Window1.xaml.cs" id="Snippet_textelement_typog":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextElementSnippets/visualbasic/window1.xaml.vb" id="Snippet_textelement_typog":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/TextEffects/window1.xaml.vb" id="Snippet_textelement_typog":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/TextPointer.xml b/xml/System.Windows.Documents/TextPointer.xml
index 59fa75838cd..09da0e492b5 100644
--- a/xml/System.Windows.Documents/TextPointer.xml
+++ b/xml/System.Windows.Documents/TextPointer.xml
@@ -88,12 +88,12 @@
  The following example demonstrates how to use a <xref:System.Windows.Documents.TextPointer> to find a position just inside of the first <xref:System.Windows.Documents.Run> element in a specified text container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_textpointer1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_textpointer1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_textpointer1":::
 
  The following example implements a simplistic find algorithm using <xref:System.Windows.Documents.TextPointer> facilities.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_textpointer2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_textpointer2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_textpointer2":::
 
  ]]></format>
     </remarks>
@@ -143,7 +143,7 @@
  The following example demonstrates a use for this method.  In the example, the <xref:System.Windows.Documents.TextPointer.CompareTo%2A> method is used in conjunction with the <xref:System.Windows.Documents.TextPointer.GetInsertionPosition%2A> method to test whether a specified <xref:System.Windows.Documents.TextElement> is empty.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_getinsertionposition":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_getinsertionposition":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_getinsertionposition":::
 
  ]]></format>
         </remarks>
@@ -401,7 +401,7 @@
  This example shows how to use the <xref:System.Windows.Documents.TextPointer.GetInsertionPosition%2A> method to check whether a specified <xref:System.Windows.Documents.TextElement> is empty of printable content.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_getinsertionposition":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_getinsertionposition":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_getinsertionposition":::
 
  ]]></format>
         </remarks>
@@ -552,7 +552,7 @@
  While the example can be used to extract a XAML structure for the contents of a given <xref:System.Windows.Documents.TextElement>, it is intended for illustrative purposes only, and should not be used in production code.  See the <xref:System.Xml> namespace for a rich set of types designed for working with and processing XML.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_getnextcontextposition":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_getnextcontextposition":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_getnextcontextposition":::
 
  ]]></format>
         </remarks>
@@ -599,7 +599,7 @@
  The following example demonstrates a use for this method. The example uses the <xref:System.Windows.Documents.TextPointer.GetNextInsertionPosition%2A> method to traverse content element boundaries in order to count the number of <xref:System.Windows.Documents.Paragraph> elements present between two specified <xref:System.Windows.Documents.TextPointer> instances.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_getnextinsertionposition":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_getnextinsertionposition":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_getnextinsertionposition":::
 
  ]]></format>
         </remarks>
@@ -653,7 +653,7 @@
  The following example demonstrates a use for this method. The example uses the <xref:System.Windows.Documents.TextPointer.GetOffsetToPosition%2A> method to find the offsets for two <xref:System.Windows.Documents.TextPointer> instances, and then uses this information to save and restore the selection in a <xref:System.Windows.Controls.RichTextBox>.  The example assumes that the contents of the <xref:System.Windows.Controls.RichTextBox> have not changed between a selection save and a selection restore.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_getoffsettoposition":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_getoffsettoposition":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_getoffsettoposition":::
 
  ]]></format>
         </remarks>
@@ -699,7 +699,7 @@
  The following example demonstrates a use for this method. The example uses the <xref:System.Windows.Documents.TextPointer.GetPointerContext%2A> method to implement an algorithm for calculating the balance of opening and closing element tags between two specified <xref:System.Windows.Documents.TextPointer> positions.  Each opening element tag is counted as +1, and each closing element tag is counted as -1.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_getoffsettoposition2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_getoffsettoposition2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_getoffsettoposition2":::
 
  ]]></format>
         </remarks>
@@ -761,7 +761,7 @@
  The following example demonstrates a use for this method. The example uses the <xref:System.Windows.Documents.TextPointer.GetPositionAtOffset%2A> method to implement a pair of methods, one to calculate the offset to a specified position relative to any hosting paragraph, and the other to return a <xref:System.Windows.Documents.TextPointer> to a specified offset in a specified paragraph.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_getpositionatoffset":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_getpositionatoffset":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_getpositionatoffset":::
 
  ]]></format>
         </remarks>
@@ -868,7 +868,7 @@
  While the example can be used to extract any text between two <xref:System.Windows.Documents.TextPointer> instances, it is intended for illustrative purposes only, and should not be used in production code.  Use the <xref:System.Windows.Documents.TextRange.Text%2A?displayProperty=nameWithType> property instead.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_gettextinrun":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_gettextinrun":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_gettextinrun":::
 
  ]]></format>
         </remarks>
@@ -1236,7 +1236,7 @@
  The following example demonstrates a use for this method.  The example uses the <xref:System.Windows.Documents.TextPointer.IsInSameDocument%2A> method to check whether a specified <xref:System.Windows.Documents.TextPointer> is positioned between two other specified <xref:System.Windows.Documents.TextPointer> instances in a situation when there is no guarantee that all three positions belong to the same text container.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_isinsamedocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_isinsamedocument":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_isinsamedocument":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/TextPointerContext.xml b/xml/System.Windows.Documents/TextPointerContext.xml
index 2000b63166f..eff4bbf1dcd 100644
--- a/xml/System.Windows.Documents/TextPointerContext.xml
+++ b/xml/System.Windows.Documents/TextPointerContext.xml
@@ -26,7 +26,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textpointer_getnextcontextposition":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textpointer_getnextcontextposition":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textpointer_getnextcontextposition":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Documents/TextRange.xml b/xml/System.Windows.Documents/TextRange.xml
index d43cda8bae9..4921a5f62d2 100644
--- a/xml/System.Windows.Documents/TextRange.xml
+++ b/xml/System.Windows.Documents/TextRange.xml
@@ -44,7 +44,7 @@
  The following example demonstrates using the <xref:System.Windows.Documents.TextRange.Text%2A> property of a <xref:System.Windows.Documents.TextRange> to return the plain text representation of a specified <xref:System.Windows.Documents.FlowDocument>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_text":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_text":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_text":::  
   
  ]]></format>
     </remarks>
@@ -98,7 +98,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange> constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_text":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_text":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_text":::  
   
  ]]></format>
         </remarks>
@@ -154,7 +154,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.ApplyPropertyValue%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_loadsave":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
   
  ]]></format>
         </remarks>
@@ -206,7 +206,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.CanLoad%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_loadsave":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
   
  ]]></format>
         </remarks>
@@ -256,7 +256,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.CanSave%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_loadsave":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
   
  ]]></format>
         </remarks>
@@ -370,7 +370,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.Contains%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_startend":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_startend":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_startend":::  
   
  ]]></format>
         </remarks>
@@ -409,7 +409,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.End%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_startend":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_startend":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_startend":::  
   
  ]]></format>
         </remarks>
@@ -497,7 +497,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.IsEmpty%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_loadsave":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
   
  ]]></format>
         </remarks>
@@ -553,7 +553,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.Load%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_loadsave":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
   
  ]]></format>
         </remarks>
@@ -617,7 +617,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.Save%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_loadsave":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_loadsave":::  
   
  ]]></format>
         </remarks>
@@ -756,7 +756,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.Start%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_startend":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_startend":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_startend":::  
   
  ]]></format>
         </remarks>
@@ -802,7 +802,7 @@
  The following example demonstrates the use of the <xref:System.Windows.Documents.TextRange.Text%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippet_textrange_text":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippet_textrange_text":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippet_textrange_text":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Documents/Typography.xml b/xml/System.Windows.Documents/Typography.xml
index 6e131f3fe79..15e29177f09 100644
--- a/xml/System.Windows.Documents/Typography.xml
+++ b/xml/System.Windows.Documents/Typography.xml
@@ -41,7 +41,7 @@ Text using OpenType capitals
  The following code example accomplishes the same task as the previous markup example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Typography/Overview/Page1.xaml.cs" id="Snippettypographycodesnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/page1.xaml.vb" id="Snippettypographycodesnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Typography/Overview/page1.xaml.vb" id="Snippettypographycodesnippet1":::
 
 ## Typography Properties
  The following table lists the properties, values, and default value of the <xref:System.Windows.Documents.Typography> object.
@@ -235,7 +235,7 @@ Example of capitals
  The following code example accomplishes the same task as the previous markup example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/Typography/Overview/Page1.xaml.cs" id="Snippettypographycodesnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TypographyCodeSnippets/visualbasic/page1.xaml.vb" id="Snippettypographycodesnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/Typography/Overview/page1.xaml.vb" id="Snippettypographycodesnippet1":::
 
 <a name="xamlAttributeUsage_Capitals"></a>
 ## XAML Attribute Usage
diff --git a/xml/System.Windows.Documents/Underline.xml b/xml/System.Windows.Documents/Underline.xml
index 6b5b9f2fb59..ada39441105 100644
--- a/xml/System.Windows.Documents/Underline.xml
+++ b/xml/System.Windows.Documents/Underline.xml
@@ -103,7 +103,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_underline_const1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_underline_const1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_underline_const1":::  
   
  ]]></format>
         </remarks>
@@ -149,7 +149,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_underline_const2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_underline_const2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_underline_const2":::  
   
  ]]></format>
         </remarks>
@@ -200,7 +200,7 @@
  The following example demonstrates usage of this constructor.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/TextBlock/Text/Window1.xaml.cs" id="Snippet_underline_const3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/SpanSnippets/visualbasic/window1.xaml.vb" id="Snippet_underline_const3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/TextBlock/Text/window1.xaml.vb" id="Snippet_underline_const3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Forms.Integration/PropertyMap.xml b/xml/System.Windows.Forms.Integration/PropertyMap.xml
index da7a46c75be..6a668174ab1 100644
--- a/xml/System.Windows.Forms.Integration/PropertyMap.xml
+++ b/xml/System.Windows.Forms.Integration/PropertyMap.xml
@@ -47,7 +47,7 @@
  The following code example shows how to replace the default mapping for the <xref:System.Windows.FrameworkElement.FlowDirection%2A> property on a <xref:System.Windows.Forms.Integration.WindowsFormsHost> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.vb" id="Snippet12":::
 
  ]]></format>
     </remarks>
@@ -201,7 +201,7 @@
  The following code example shows how to add a mapping for the <xref:System.Windows.UIElement.Clip%2A> property to a <xref:System.Windows.Forms.Integration.WindowsFormsHost> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -438,7 +438,7 @@
  The following code example shows how to retrieve the <xref:System.Windows.Forms.Integration.PropertyTranslator> delegate for the <xref:System.Windows.Controls.Control.Background%2A> property of a <xref:System.Windows.Forms.Integration.WindowsFormsHost> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -574,7 +574,7 @@
  The following code example shows how to add a mapping for the <xref:System.Windows.FrameworkElement.Cursor%2A> property to a <xref:System.Windows.Forms.Integration.WindowsFormsHost> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Forms.Integration/WindowsFormsHost.xml b/xml/System.Windows.Forms.Integration/WindowsFormsHost.xml
index 53ff966d913..da6c7522c1e 100644
--- a/xml/System.Windows.Forms.Integration/WindowsFormsHost.xml
+++ b/xml/System.Windows.Forms.Integration/WindowsFormsHost.xml
@@ -309,7 +309,7 @@ The following code example demonstrates how to use a <xref:System.Windows.Forms.
  The following code example demonstrates how to use the <xref:System.Windows.Forms.Integration.WindowsFormsHost.Child%2A> property to add the hosted control to the <xref:System.Windows.Forms.Integration.WindowsFormsHost> element. For more information, see [Walkthrough: Hosting an ActiveX Control in WPF](/dotnet/desktop/wpf/advanced/walkthrough-hosting-an-activex-control-in-wpf).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms.Integration/WindowsFormsHost/Child/window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HostingAxInWpf/VisualBasic/HostingAxInWpf/window1.xaml.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms.Integration/WindowsFormsHost/Child/window1.xaml.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -1188,7 +1188,7 @@ The following code example demonstrates how to use a <xref:System.Windows.Forms.
  The following code example shows how to add a mapping for the <xref:System.Windows.FrameworkElement.FlowDirection%2A> property to a <xref:System.Windows.Forms.Integration.WindowsFormsHost> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertyMappingWithWfhSample/VisualBasic/PropertyMappingWithWfh/Window1.xaml.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Forms.Integration/PropertyMap/Overview/Window1.xaml.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/DrawingAttributeIds.xml b/xml/System.Windows.Ink/DrawingAttributeIds.xml
index cf8bfe2ac92..2288c011f84 100644
--- a/xml/System.Windows.Ink/DrawingAttributeIds.xml
+++ b/xml/System.Windows.Ink/DrawingAttributeIds.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Ink.DrawingAttributeIds> class to detect the property that changed within a <xref:System.Windows.Ink.DrawingAttributes.PropertyDataChanged> event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet6":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Ink/DrawingAttributes.xml b/xml/System.Windows.Ink/DrawingAttributes.xml
index 75b13ff13fa..b4ed9bc049f 100644
--- a/xml/System.Windows.Ink/DrawingAttributes.xml
+++ b/xml/System.Windows.Ink/DrawingAttributes.xml
@@ -46,7 +46,7 @@
  The following example demonstrates how to use two <xref:System.Windows.Ink.DrawingAttributes> objects to simulate using a pen and a highlighter on the same <xref:System.Windows.Controls.InkCanvas>. The example assumes the root element in the XAML file is a <xref:System.Windows.Controls.DockPanel> called `root`. It also assumes that there is a <xref:System.Windows.Controls.Button> called `switchHighlighter` and that the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> event is connected to the event handler defined in this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@
  The following example demonstrates how to add and retrieve a custom property from the <xref:System.Windows.Ink.DrawingAttributes> object. The example adds a property that indicates whether the <xref:System.Windows.Ink.DrawingAttributes> object is a pen or a highlighter. The code in the `ChangeColors_Click` event handler renders a new color for strokes on the <xref:System.Windows.Controls.InkCanvas> that use the <xref:System.Windows.Ink.DrawingAttributes> object, `inkDA`. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> named `inkCanvas1`, and that there are two <xref:System.Windows.Ink.DrawingAttributes> objects named `inkDA`, and `highlighterDA`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -182,7 +182,7 @@
  The following example handles the <xref:System.Windows.Ink.DrawingAttributes.AttributeChanged> event. This example assumes that there is a <xref:System.Windows.Ink.DrawingAttributes> object called `inkDA` and that the <xref:System.Windows.Ink.DrawingAttributes.AttributeChanged> event is connected to the event handler defined in this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -226,7 +226,7 @@
  The following example demonstrates how to copy a <xref:System.Windows.Ink.DrawingAttributes> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -273,7 +273,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Ink.DrawingAttributes.Color%2A> property. The example assumes that your application has an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`, and two <xref:System.Windows.Ink.DrawingAttributes> objects called `inkDA` and `highlighterDA`. For the complete example, see the <xref:System.Windows.Ink.DrawingAttributes> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -316,7 +316,7 @@
  The following example demonstrates how to add and retrieve a custom property from the <xref:System.Windows.Ink.DrawingAttributes> object. The example adds a property that indicates whether the <xref:System.Windows.Ink.DrawingAttributes> object is a pen or a highlighter. The `ChangeColors_Click` event handler changes all the strokes that were put on the <xref:System.Windows.Controls.InkCanvas> with a <xref:System.Windows.Ink.DrawingAttributes> called `inkDA` to a new color. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> named `inkCanvas1`, and that there are two <xref:System.Windows.Ink.DrawingAttributes> objects named `inkDA`, and `highlighterDA`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -383,9 +383,9 @@
  The following example compares two <xref:System.Windows.Ink.DrawingAttributes> objects for equality. Because the <xref:System.Windows.Ink.DrawingAttributes.Color%2A>, <xref:System.Windows.Ink.DrawingAttributes.StylusTip%2A>, <xref:System.Windows.Ink.DrawingAttributes.Height%2A>, and <xref:System.Windows.Ink.DrawingAttributes.Width%2A> properties on `attributes1` and `attributes2` are set to the same values, the "The DrawingAttributes are equal" message appears.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet10":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet12":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet12":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Ink.DrawingAttributes.FitToCurve%2A> property. The example assumes that your application has an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`, and two <xref:System.Windows.Ink.DrawingAttributes> objects called `inkDA` and `highlighterDA`. For the complete example, see the <xref:System.Windows.Ink.DrawingAttributes> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -516,7 +516,7 @@
  The following example demonstrates how to add and retrieve a custom property from the <xref:System.Windows.Ink.DrawingAttributes> object. The example adds a property that indicates whether the <xref:System.Windows.Ink.DrawingAttributes> object is a pen or a highlighter. The code in the `ChangeColors_Click` event handler renders a new color for strokes on the <xref:System.Windows.Controls.InkCanvas> that use the <xref:System.Windows.Ink.DrawingAttributes> object, `inkDA`. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> named `inkCanvas1`, and that there are two <xref:System.Windows.Ink.DrawingAttributes> objects named `inkDA`, and `highlighterDA`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -563,7 +563,7 @@
  The following example demonstrates how to get the property data identifiers from the <xref:System.Windows.Ink.DrawingAttributes> object. This example assumes that a <xref:System.Windows.Ink.DrawingAttributes> called `inkDA` has been declared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -617,7 +617,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Ink.DrawingAttributes.Height%2A> property. The example assumes that your application has an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`, and two <xref:System.Windows.Ink.DrawingAttributes> objects called `inkDA` and `highlighterDA`. For the complete example, see the <xref:System.Windows.Ink.DrawingAttributes> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -665,7 +665,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Ink.DrawingAttributes.IgnorePressure%2A> property. The example assumes that your application has an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`, and two <xref:System.Windows.Ink.DrawingAttributes> objects called `inkDA` and `highlighterDA`. For the complete example, see the <xref:System.Windows.Ink.DrawingAttributes> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -713,7 +713,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Ink.DrawingAttributes.IsHighlighter%2A> property. The example assumes that your application has an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`, and two <xref:System.Windows.Ink.DrawingAttributes> objects called `inkDA` and `highlighterDA`. For the complete example, see the <xref:System.Windows.Ink.DrawingAttributes> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -755,7 +755,7 @@
  The following example ensures the <xref:System.Windows.Ink.DrawingAttributes.Height%2A> property of the <xref:System.Windows.Ink.DrawingAttributes> is set to a legal value. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -797,7 +797,7 @@
  The following example ensures the <xref:System.Windows.Ink.DrawingAttributes.Width%2A> property of the <xref:System.Windows.Ink.DrawingAttributes> is set to a legal value. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -839,7 +839,7 @@
  The following example ensures the <xref:System.Windows.Ink.DrawingAttributes.Height%2A> property of the <xref:System.Windows.Ink.DrawingAttributes> is set to a legal value. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -881,7 +881,7 @@
  The following example ensures the <xref:System.Windows.Ink.DrawingAttributes.Width%2A> property of the <xref:System.Windows.Ink.DrawingAttributes> is set to a legal value. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1071,9 +1071,9 @@
  The following example compares two <xref:System.Windows.Ink.DrawingAttributes> objects for equality. Because the <xref:System.Windows.Ink.DrawingAttributes.Color%2A>, <xref:System.Windows.Ink.DrawingAttributes.StylusTip%2A>, <xref:System.Windows.Ink.DrawingAttributes.Height%2A>, and <xref:System.Windows.Ink.DrawingAttributes.Width%2A> properties on `attributes1` and `attributes2` are set to the same values, the "The DrawingAttributes are equal" message appears.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet10":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet11":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet11":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -1142,9 +1142,9 @@
  The following example compares two <xref:System.Windows.Ink.DrawingAttributes> objects for inequality. Because the <xref:System.Windows.Ink.DrawingAttributes.Color%2A>, <xref:System.Windows.Ink.DrawingAttributes.StylusTip%2A>, <xref:System.Windows.Ink.DrawingAttributes.Height%2A>, and <xref:System.Windows.Ink.DrawingAttributes.Width%2A> properties on `attributes1` and `attributes2` are set to the same values, the "The DrawingAttributes are equal" message appears.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet10":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet13":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet13":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -1182,7 +1182,7 @@
  The following example is part of a custom stroke that can draw a three-dimensional effect. The stroke defines and stores a custom property called `Shadowed`, which belongs to <xref:System.Windows.Ink.Stroke.DrawingAttributes%2A>. When the `Shadowed` property changes, the <xref:System.Windows.Ink.DrawingAttributes.PropertyDataChanged> event handler calls the <xref:System.Windows.Ink.Stroke.OnInvalidated%2A> method, which causes the stroke to be redrawn.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/CustomRenderedStroke.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionShadow/VisualBasic/CustomRenderedStroke.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/DrawingAttributes/PropertyDataChanged/CustomRenderedStroke.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1223,7 +1223,7 @@
  The following example demonstrates how to remove a custom property from a <xref:System.Windows.Ink.DrawingAttributes> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -1272,7 +1272,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Ink.DrawingAttributes.StylusTip%2A> property. The example assumes that your application has an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`, and two <xref:System.Windows.Ink.DrawingAttributes> objects called `inkDA` and `highlighterDA`. For the complete example, see the <xref:System.Windows.Ink.DrawingAttributes> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1319,7 +1319,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Ink.DrawingAttributes.StylusTipTransform%2A> property. The example assumes that your application has an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`, and two <xref:System.Windows.Ink.DrawingAttributes> objects called `inkDA` and `highlighterDA`. For the complete example, see the <xref:System.Windows.Ink.DrawingAttributes> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1406,7 +1406,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Ink.DrawingAttributes.Width%2A> property. The example assumes that your application has an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`, and two <xref:System.Windows.Ink.DrawingAttributes> objects called `inkDA` and `highlighterDA`. For the complete example, see the <xref:System.Windows.Ink.DrawingAttributes> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/EllipseStylusShape.xml b/xml/System.Windows.Ink/EllipseStylusShape.xml
index d20b49d061f..517c80e5b96 100644
--- a/xml/System.Windows.Ink/EllipseStylusShape.xml
+++ b/xml/System.Windows.Ink/EllipseStylusShape.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to create an <xref:System.Windows.Ink.EllipseStylusShape> and pass it to the <xref:System.Windows.Ink.StrokeCollection.GetIncrementalStrokeHitTester%2A> method to erase a portion of a <xref:System.Windows.Ink.Stroke>. This example assumes that there is a <xref:System.Windows.Ink.IncrementalStrokeHitTester> called `eraseTester` and that its <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event has been connected to the event handler defined in this example. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -49,7 +49,7 @@
  The following example demonstrates how to create an <xref:System.Windows.Ink.EllipseStylusShape> and pass it to the <xref:System.Windows.Ink.StrokeCollection.GetIncrementalStrokeHitTester%2A> method to erase a portion of a <xref:System.Windows.Ink.Stroke>. This example assumes that there is a <xref:System.Windows.Ink.IncrementalStrokeHitTester> called `eraseTester` and that its <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event has been connected to the event handler defined in this example. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -95,7 +95,7 @@
  The following example demonstrates how to create an <xref:System.Windows.Ink.EllipseStylusShape> and pass it to the <xref:System.Windows.Ink.StrokeCollection.GetIncrementalStrokeHitTester%2A> method to erase a portion of a <xref:System.Windows.Ink.Stroke>. This example assumes that there is a <xref:System.Windows.Ink.IncrementalStrokeHitTester> called `eraseTester` and that its <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event has been connected to the event handler defined in this example. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -137,7 +137,7 @@
  The following example demonstrates how to create an <xref:System.Windows.Ink.EllipseStylusShape> and pass it to the <xref:System.Windows.Ink.StrokeCollection.GetIncrementalStrokeHitTester%2A> method to erase a portion of a <xref:System.Windows.Ink.Stroke>. This example assumes that there is a <xref:System.Windows.Ink.IncrementalStrokeHitTester> called `eraseTester` and that its <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event has been connected to the event handler defined in this example. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/IncrementalHitTester.xml b/xml/System.Windows.Ink/IncrementalHitTester.xml
index 88a991124dd..5fd3fbf98fe 100644
--- a/xml/System.Windows.Ink/IncrementalHitTester.xml
+++ b/xml/System.Windows.Ink/IncrementalHitTester.xml
@@ -52,7 +52,7 @@
  The following example demonstrates how to add points to the <xref:System.Windows.Ink.IncrementalHitTester> when the user inputs data with the stylus. The example includes a <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event handler that erases the part of the <xref:System.Windows.Ink.Stroke> that the user intersects. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet6":::
 
  ]]></format>
     </remarks>
@@ -93,9 +93,9 @@
  The following example demonstrates how to add points to the <xref:System.Windows.Ink.IncrementalHitTester> when the user inputs data with the mouse. The example includes a <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event handler that erases the part of the <xref:System.Windows.Ink.Stroke> that the user intersects. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet11":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -145,7 +145,7 @@
  The following example demonstrates how to add points to the <xref:System.Windows.Ink.IncrementalHitTester> when the user inputs data with the stylus. The example includes a <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event handler that erases the part of the <xref:System.Windows.Ink.Stroke> that the user intersects. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -186,7 +186,7 @@
  The following example demonstrates how to add points to the <xref:System.Windows.Ink.IncrementalStrokeHitTester> when the user inputs data with the stylus. The example includes a <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event handler that erases the part of the <xref:System.Windows.Ink.Stroke> that the user intersects. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -260,7 +260,7 @@
  The following example demonstrates how to call <xref:System.Windows.Ink.IncrementalHitTester.EndHitTesting%2A> after using an <xref:System.Windows.Ink.IncrementalHitTester>. This example assumes that there is an <xref:System.Windows.Ink.IncrementalHitTester> called `eraseTester`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -310,7 +310,7 @@
  The following example demonstrates how to check whether the <xref:System.Windows.Ink.IncrementalHitTester> is valid before adding points to it. This example assumes that there is an <xref:System.Windows.Ink.IncrementalHitTester> called `eraseTester`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/IncrementalLassoHitTester.xml b/xml/System.Windows.Ink/IncrementalLassoHitTester.xml
index eb4b535304b..80531927289 100644
--- a/xml/System.Windows.Ink/IncrementalLassoHitTester.xml
+++ b/xml/System.Windows.Ink/IncrementalLassoHitTester.xml
@@ -34,7 +34,7 @@
  The following example demonstrates how to dynamically select strokes in a custom control. For the entire sample, see [How to: Select Ink from a Custom Control](/dotnet/framework/wpf/advanced/how-to-select-ink-from-a-custom-control)  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/InkSelector.vb" id="Snippet18":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.vb" id="Snippet18":::  
   
  ]]></format>
     </remarks>
@@ -134,7 +134,7 @@
  The following example demonstrates how to dynamically select strokes in a custom control. For the entire sample, see [How to: Select Ink from a Custom Control](/dotnet/framework/wpf/advanced/how-to-select-ink-from-a-custom-control)  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/InkSelector.vb" id="Snippet18":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.vb" id="Snippet18":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/IncrementalStrokeHitTester.xml b/xml/System.Windows.Ink/IncrementalStrokeHitTester.xml
index d42a86b76eb..e7aa22f1a13 100644
--- a/xml/System.Windows.Ink/IncrementalStrokeHitTester.xml
+++ b/xml/System.Windows.Ink/IncrementalStrokeHitTester.xml
@@ -34,7 +34,7 @@
  The following example demonstrates how to dynamically erase a portion of a <xref:System.Windows.Ink.Stroke>. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -135,7 +135,7 @@
  The following example demonstrates how to dynamically erase a portion of a <xref:System.Windows.Ink.Stroke>. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/RectangleStylusShape.xml b/xml/System.Windows.Ink/RectangleStylusShape.xml
index c5b9c9c3dd9..29d82732f02 100644
--- a/xml/System.Windows.Ink/RectangleStylusShape.xml
+++ b/xml/System.Windows.Ink/RectangleStylusShape.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to use a <xref:System.Windows.Ink.RectangleStylusShape> to perform hit testing on a <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet37":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet37":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet37":::  
   
  ]]></format>
     </remarks>
@@ -84,7 +84,7 @@
  The following example demonstrates how to use a <xref:System.Windows.Ink.RectangleStylusShape> to perform hit testing on a <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet37":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet37":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet37":::  
   
  ]]></format>
         </remarks>
@@ -126,7 +126,7 @@
  The following example demonstrates how to use a <xref:System.Windows.Ink.RectangleStylusShape> to perform hit testing on a <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet37":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet37":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet37":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/Stroke.xml b/xml/System.Windows.Ink/Stroke.xml
index e7fbf520619..90be0584b45 100644
--- a/xml/System.Windows.Ink/Stroke.xml
+++ b/xml/System.Windows.Ink/Stroke.xml
@@ -78,7 +78,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Ink.Stroke> from a <xref:System.Windows.Input.StylusPointCollection> and <xref:System.Windows.Ink.DrawingAttributes> object. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `myInkPresenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -128,7 +128,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Ink.Stroke> from a <xref:System.Windows.Input.StylusPointCollection> and <xref:System.Windows.Ink.DrawingAttributes> object.  This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `myInkPresenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@
  The following example demonstrates how to add a custom property to a <xref:System.Windows.Ink.Stroke> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -232,7 +232,7 @@
  The following example demonstrates how to get a copy of the current <xref:System.Windows.Ink.Stroke> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -274,7 +274,7 @@
  The following example demonstrates how to determine whether a <xref:System.Windows.Ink.Stroke> object has a custom property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -418,7 +418,7 @@
  The following example demonstrates how to draw a circle at each <xref:System.Windows.Input.StylusPoint> of a <xref:System.Windows.Ink.Stroke>. If the <xref:System.Windows.Ink.DrawingAttributes.FitToCurve%2A> property is set to `true`, the <xref:System.Windows.Ink.Stroke.GetBezierStylusPoints%2A> is used to get the stylus points. Otherwise, the <xref:System.Windows.Ink.Stroke.StylusPoints%2A> property is used.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyStroke.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyStroke.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyStroke.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -469,7 +469,7 @@
  The following example sets the <xref:System.Windows.Ink.Stroke.DrawingAttributes%2A> to make a stroke green.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -514,7 +514,7 @@
  The following example demonstrates how to add a handler for this event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -555,7 +555,7 @@
  The following example demonstrates how to add a handler for this event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -601,7 +601,7 @@
  The following example demonstrates how to draw a circle at each <xref:System.Windows.Input.StylusPoint> of a <xref:System.Windows.Ink.Stroke>. If the <xref:System.Windows.Ink.DrawingAttributes.FitToCurve%2A> property is set to `true`, the <xref:System.Windows.Ink.Stroke.GetBezierStylusPoints%2A> is used to get the stylus points. Otherwise, the <xref:System.Windows.Ink.Stroke.StylusPoints%2A> property is used.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyStroke.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyStroke.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyStroke.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -640,7 +640,7 @@
  The following example demonstrates how to get the boundary rectangle for a <xref:System.Windows.Ink.Stroke> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -991,7 +991,7 @@
  The following example demonstrates how to draw a circle at each <xref:System.Windows.Input.StylusPoint> of a <xref:System.Windows.Ink.Stroke>. If the <xref:System.Windows.Ink.DrawingAttributes.FitToCurve%2A> property is set to `true`, the <xref:System.Windows.Ink.Stroke.GetBezierStylusPoints%2A> is used to get the stylus points. Otherwise, the <xref:System.Windows.Ink.Stroke.StylusPoints%2A> property is used.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyStroke.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyStroke.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyStroke.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -1033,7 +1033,7 @@
  The following example demonstrates how to retrieve a custom property on a <xref:System.Windows.Ink.Stroke> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1508,9 +1508,9 @@
  The following example draws a <xref:System.Windows.Ink.Stroke> either as a solid stroke or as a series of <xref:System.Windows.Input.StylusPoint> objects, depending on the `Mode` property. The example calls the <xref:System.Windows.Ink.Stroke.OnInvalidated%2A> method, which in turn calls the <xref:System.Windows.Ink.Stroke.DrawCore%2A> where the stroke is drawn.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/CustomRenderedStroke.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/CustomRenderedStroke.vb" id="Snippet24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/CustomRenderedStroke.vb" id="Snippet24":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/CustomRenderedStroke.cs" id="Snippet25":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/CustomRenderedStroke.vb" id="Snippet25":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/CustomRenderedStroke.vb" id="Snippet25":::
 
  ]]></format>
         </remarks>
@@ -1679,7 +1679,7 @@
  The following example demonstrates how to add a handler for this event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet20":::
 
  ]]></format>
         </remarks>
@@ -1723,7 +1723,7 @@
  The following example demonstrates how to delete a custom property from a <xref:System.Windows.Ink.Stroke> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet30":::
 
  ]]></format>
         </remarks>
@@ -1778,7 +1778,7 @@
  The following example is part of an overridden <xref:System.Windows.Ink.Stroke> that draws a circle at each <xref:System.Windows.Input.StylusPoint>. If the <xref:System.Windows.Ink.DrawingAttributes.FitToCurve%2A> property is set to `true`, the <xref:System.Windows.Ink.Stroke.GetBezierStylusPoints%2A> is used to get the stylus points. Otherwise, the <xref:System.Windows.Ink.Stroke.StylusPoints%2A> property is used.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyStroke.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyStroke.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyStroke.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -1816,7 +1816,7 @@
  The following example demonstrates how to handle the <xref:System.Windows.Ink.Stroke.StylusPointsChanged> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
@@ -1854,7 +1854,7 @@
  The following example demonstrates how to handle the <xref:System.Windows.Ink.Stroke.StylusPointsReplaced> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet29":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/StrokeCollection.xml b/xml/System.Windows.Ink/StrokeCollection.xml
index b615f6a8246..79e039e0360 100644
--- a/xml/System.Windows.Ink/StrokeCollection.xml
+++ b/xml/System.Windows.Ink/StrokeCollection.xml
@@ -84,7 +84,7 @@
 - The <xref:System.Windows.Controls.Primitives.ButtonBase.Click> event has been connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet21":::
 
  ]]></format>
     </remarks>
@@ -189,9 +189,9 @@
  The following example demonstrates how to save and load a <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet10":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet11":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet11":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -241,7 +241,7 @@
 - The <xref:System.Windows.Controls.Primitives.ButtonBase.Click> event has been connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -292,7 +292,7 @@
  The following example demonstrates how to add and get custom property data. The `AddTimeStamp_Click` method uses the <xref:System.Windows.Ink.StrokeCollection.AddPropertyData%2A> method to add the current time to the <xref:System.Windows.Ink.StrokeCollection>. The `GetTimeStap_Click` method uses the <xref:System.Windows.Ink.StrokeCollection.GetPropertyData%2A> method to retrieve the timestamp from the <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@
  The following example demonstrates how to clip the strokes in a <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -429,7 +429,7 @@
  The following example demonstrates how to erase the ink that is outside the bounds of a <xref:System.Windows.Rect>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet35":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet35":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -477,7 +477,7 @@
 - The <xref:System.Windows.Controls.Primitives.ButtonBase.Click> event has been connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -520,7 +520,7 @@
  The following example demonstrates how to check for custom property in a <xref:System.Windows.Ink.StrokeCollection>. If a custom property has been associated with `timestamp`, the example gets that custom property and shows when the <xref:System.Windows.Ink.StrokeCollection> was saved. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -561,7 +561,7 @@
  The following example creates a custom element that displays a thumbnail view of an <xref:System.Windows.Controls.InkCanvas>. The custom element keeps a reference to an <xref:System.Windows.Controls.InkCanvas> and redraws itself when the <xref:System.Windows.Controls.InkCanvas.StrokeCollected> event occurs.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window3.xaml.cs" id="Snippet33":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window3.xaml.vb" id="Snippet33":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window3.xaml.vb" id="Snippet33":::
 
  ]]></format>
         </remarks>
@@ -620,7 +620,7 @@
  The following example demonstrates how to erase strokes in a <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -668,7 +668,7 @@
  The following example demonstrates how to erase the ink within the <xref:System.Windows.Rect>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -718,7 +718,7 @@
  The following example demonstrates how to erase ink along a specific path. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -762,7 +762,7 @@
  The following example demonstrates how to get the bounds of the <xref:System.Windows.Ink.StrokeCollection> and draw them on the control. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet20":::
 
  ]]></format>
         </remarks>
@@ -809,7 +809,7 @@
  The following example demonstrates how to get an <xref:System.Windows.Ink.IncrementalLassoHitTester> that enables a user to select strokes with a lasso tool. To create a control that enables a user to select ink, see [How to: Select Ink from a Custom Control](/dotnet/framework/wpf/advanced/how-to-select-ink-from-a-custom-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/InkSelector.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/InkSelector.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -856,7 +856,7 @@
  The following example demonstrates how to get an <xref:System.Windows.Ink.IncrementalStrokeHitTester> that can be used to erase part of a <xref:System.Windows.Ink.Stroke>. To create a control that enables a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -903,7 +903,7 @@
  The following example demonstrates how to add and get custom property data. The `AddTimeStamp_Click` method uses the <xref:System.Windows.Ink.StrokeCollection.AddPropertyData%2A> method to add the current time to the <xref:System.Windows.Ink.StrokeCollection>. The `GetTimeStap_Click` method uses the <xref:System.Windows.Ink.StrokeCollection.GetPropertyData%2A> method to retrieve the timestamp from the <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -944,7 +944,7 @@
  The following example demonstrates how to get the custom property identifiers from the <xref:System.Windows.Ink.StrokeCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet27":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet27":::
 
  ]]></format>
         </remarks>
@@ -995,7 +995,7 @@
  The following example demonstrates how to get the strokes that intersect the specified <xref:System.Windows.Point>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1039,7 +1039,7 @@
  The following example demonstrates how to remove all strokes that are at least 80 percent within the specified lasso from a <xref:System.Windows.Ink.StrokeCollection>. This is useful when a custom control enables the user to select ink with a lasso. To create a control that enables a user to select ink with a lasso, see [How to: Select Ink from a Custom Control](/dotnet/framework/wpf/advanced/how-to-select-ink-from-a-custom-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -1093,7 +1093,7 @@
  The following example changes the color of all the strokes that intersect the path that is created by the <xref:System.Windows.Point> array.  This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet37":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet37":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet37":::
 
  ]]></format>
         </remarks>
@@ -1137,7 +1137,7 @@
  The following example demonstrates how to get the strokes that intersect the specified <xref:System.Windows.Point>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1181,7 +1181,7 @@
  The following example erases the strokes that are at least 50% within the bounds of the <xref:System.Windows.Rect>. This example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet36":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet36":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet36":::
 
  ]]></format>
         </remarks>
@@ -1262,7 +1262,7 @@
  The following example demonstrates how to copy a <xref:System.Windows.Ink.StrokeCollection> to the Clipboard. The example specifies that the <xref:System.Windows.Ink.StrokeCollection> is in Ink Serialized Format (ISF), so that other programs, such as Microsoft Office Word can accept the copied data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1438,7 +1438,7 @@
  The following example demonstrates how to handle the <xref:System.Windows.Ink.StrokeCollection.PropertyDataChanged> event. This example assumes that there is a <xref:System.Guid> called `dateTimeGuid` and the <xref:System.Windows.Ink.StrokeCollection.PropertyDataChanged> event is connected to the event handler defined in this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet29":::
 
  ]]></format>
         </remarks>
@@ -1484,7 +1484,7 @@
  The following example demonstrates how to remove all strokes that are at least 80 percent within the specified lasso from a <xref:System.Windows.Ink.StrokeCollection>. This is useful when a custom control enables the user to select ink with a lasso. To create a control that enables a user to select ink with a lasso, see [How to: Select Ink from a Custom Control](/dotnet/framework/wpf/advanced/how-to-select-ink-from-a-custom-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -1556,7 +1556,7 @@
  The following example demonstrates how to remove a custom property from the <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1` and a <xref:System.Guid> called `timestamp`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
@@ -1613,7 +1613,7 @@
  The following example demonstrates how to replace the selected strokes on an <xref:System.Windows.Controls.InkCanvas> with another <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1671,7 +1671,7 @@
  The following example demonstrates how to replace the selected strokes on an <xref:System.Windows.Controls.InkCanvas> with another <xref:System.Windows.Ink.StrokeCollection>. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1746,7 +1746,7 @@
  The following example demonstrates how to save a <xref:System.Windows.Ink.StrokeCollection> to a file by using the <xref:System.Windows.Ink.StrokeCollection.Save%28System.IO.Stream%2CSystem.Boolean%29> method. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1795,7 +1795,7 @@
  The following example demonstrates how to save a <xref:System.Windows.Ink.StrokeCollection> to a file by using the <xref:System.Windows.Ink.StrokeCollection.Save%28System.IO.Stream%2CSystem.Boolean%29> method. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1866,7 +1866,7 @@
  The following example adds the current time as a custom property to each new stroke in the <xref:System.Windows.Ink.StrokeCollection.StrokesChanged> event handler. The example assumes that the <xref:System.Windows.Ink.StrokeCollection.StrokesChanged> event is connected to the event handler defined in this example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1973,7 +1973,7 @@
  The following example demonstrates how to move all the strokes on an <xref:System.Windows.Controls.InkCanvas>. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/Window2.xaml.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/Window2.xaml.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Ink/StylusShape.xml b/xml/System.Windows.Ink/StylusShape.xml
index e6b4112c822..6c80084aa55 100644
--- a/xml/System.Windows.Ink/StylusShape.xml
+++ b/xml/System.Windows.Ink/StylusShape.xml
@@ -38,7 +38,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Ink.StylusShape> and pass it to the <xref:System.Windows.Ink.StrokeCollection.GetIncrementalStrokeHitTester%2A> method to erase a portion of a <xref:System.Windows.Ink.Stroke>. This example assumes that there is a <xref:System.Windows.Ink.IncrementalStrokeHitTester> called `eraseTester` and that its <xref:System.Windows.Ink.IncrementalStrokeHitTester.StrokeHit> event has been connected to the event handler defined in this example. To create a control that allows a user to erase ink, see [How to: Erase Ink on a Custom Control](/dotnet/framework/wpf/advanced/how-to-erase-ink-on-a-custom-control).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Ink/StylusTip.xml b/xml/System.Windows.Ink/StylusTip.xml
index 4366850d87b..b33dd12dac8 100644
--- a/xml/System.Windows.Ink/StylusTip.xml
+++ b/xml/System.Windows.Ink/StylusTip.xml
@@ -39,7 +39,7 @@
  The example assumes the root element in the "XAML" file is a <xref:System.Windows.Controls.DockPanel> called `root`. It also assumes that there is a <xref:System.Windows.Controls.Button> called `btnToggleHighlighter` and that the <xref:System.Windows.Controls.Primitives.ButtonBase.Click> event has been connected to the event handler.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingAttributes/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkCanvas/Overview/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input.StylusPlugIns/DynamicRenderer.xml b/xml/System.Windows.Input.StylusPlugIns/DynamicRenderer.xml
index fe87425bf9a..2d81e8b5bd4 100644
--- a/xml/System.Windows.Input.StylusPlugIns/DynamicRenderer.xml
+++ b/xml/System.Windows.Input.StylusPlugIns/DynamicRenderer.xml
@@ -43,7 +43,7 @@
  The following example demonstrates how to attach a <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer> to an <xref:System.Windows.Controls.InkPresenter>. To create a control that dynamically renders ink, see [Creating an Ink Input Control](/dotnet/framework/wpf/advanced/creating-an-ink-input-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/StylusControl.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
@@ -119,7 +119,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Ink.DrawingAttributes> object for a <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer>. In this example, the dynamically rendered ink matches the properties specified by `inkDA`. To create a control that dynamically renders ink, see [Creating an Ink Input Control](/dotnet/framework/wpf/advanced/creating-an-ink-input-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/StylusControl.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -158,7 +158,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer.GetDispatcher%2A> method to perform some work on the rendering thread.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet19":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet19":::
 
  ]]></format>
         </remarks>
@@ -236,7 +236,7 @@
  The following example demonstrates how to override the <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer.OnDraw%2A> method to dynamically render digital ink with a <xref:System.Windows.Media.LinearGradientBrush>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -277,7 +277,7 @@
  The following example overrides the <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer.OnDrawingAttributesReplaced%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -732,7 +732,7 @@
  The following example changes the color of the current stroke as it is being drawn.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/StylusControl.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -779,7 +779,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer> and add the <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer.RootVisual%2A> to the <xref:System.Windows.Controls.InkPresenter>. To create a control that dynamically renders ink, see [Creating an Ink Input Control](/dotnet/framework/wpf/advanced/creating-an-ink-input-control).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/StylusControl.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input.StylusPlugIns/RawStylusInput.xml b/xml/System.Windows.Input.StylusPlugIns/RawStylusInput.xml
index 948cd05b749..be4d3e60e31 100644
--- a/xml/System.Windows.Input.StylusPlugIns/RawStylusInput.xml
+++ b/xml/System.Windows.Input.StylusPlugIns/RawStylusInput.xml
@@ -34,7 +34,7 @@
  The following example creates a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that checks for the <xref:System.Windows.Ink.ApplicationGesture.Down> gesture. The <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> calls <xref:System.Windows.Input.StylusPlugIns.RawStylusInput.NotifyWhenProcessed%2A> in <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUp%2A> to subscribe to the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUpProcessed%2A> method, which is called from the application thread.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb" id="Snippet12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb" id="Snippet12":::  
   
  ]]></format>
     </remarks>
@@ -73,7 +73,7 @@
  The following example demonstrates how to change the stylus points in the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusDown%2A> method. To create a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that restricts ink to a certain area, see the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/FilterPlugin.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/FilterPlugin.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/FilterPlugin.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -125,7 +125,7 @@
  The following example creates a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that checks for the <xref:System.Windows.Ink.ApplicationGesture.Down> gesture. The <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> calls <xref:System.Windows.Input.StylusPlugIns.RawStylusInput.NotifyWhenProcessed%2A> in <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUp%2A> to subscribe to the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUpProcessed%2A> method, which is called from the application thread.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb" id="Snippet12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb" id="Snippet12":::  
   
  ]]></format>
         </remarks>
@@ -177,7 +177,7 @@
  The following example demonstrates how to change the stylus points in the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusDown%2A> method. To create a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that restricts ink to a certain area, see the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/FilterPlugin.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/FilterPlugin.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/FilterPlugin.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -215,7 +215,7 @@
  The following example ensures that the stylus points collected are from the same <xref:System.Windows.Input.StylusDevice>. This example is part of the bigger example in the <xref:System.Windows.Input.StylusPlugIns.RawStylusInput> class overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb" id="Snippet15":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb" id="Snippet15":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input.StylusPlugIns/StylusPlugIn.xml b/xml/System.Windows.Input.StylusPlugIns/StylusPlugIn.xml
index 1d17021a17f..23181d51dc7 100644
--- a/xml/System.Windows.Input.StylusPlugIns/StylusPlugIn.xml
+++ b/xml/System.Windows.Input.StylusPlugIns/StylusPlugIn.xml
@@ -55,7 +55,7 @@
  The following example creates a custom <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that constrains the ink to a certain area on the control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/FilterPlugin.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/FilterPlugin.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/FilterPlugin.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -117,7 +117,7 @@
  The following example shows the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.Element%2A> of the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> when it is added to the <xref:System.Windows.UIElement.StylusPlugIns%2A> collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
@@ -160,7 +160,7 @@
  The following example demonstrates how a <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer>, which inherits from <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn>, uses an <xref:System.Windows.Media.ImageBrush> to render a stroke.  This brush partially draws the image file specified by `imageFile`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/ImageRenderer.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/ImageRenderer.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/ImageRenderer.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -207,7 +207,7 @@
  The following example checks the value of the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.Enabled%2A> property in the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnEnabledChanged%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -261,7 +261,7 @@
  The following example demonstrates how to override the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnIsActiveForInputChanged%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -299,7 +299,7 @@
  The following example shows the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.Element%2A> of the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> when it is added to the <xref:System.Windows.UIElement.StylusPlugIns%2A> collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
  The following example checks the value of the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.Enabled%2A> property in the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnEnabledChanged%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -380,7 +380,7 @@
  The following example demonstrates how to override the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnIsActiveForInputChanged%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/CustomDynamicRenderer.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/CustomDynamicRenderer.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@
  The following example demonstrates how to override the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusDown%2A> method. To create a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that restricts ink to a certain area, see the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/FilterPlugin.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/FilterPlugin.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/FilterPlugin.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -503,7 +503,7 @@
  The following example creates a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that checks for the <xref:System.Windows.Ink.ApplicationGesture.Down> gesture. The <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> calls <xref:System.Windows.Input.StylusPlugIns.RawStylusInput.NotifyWhenProcessed%2A> in <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUp%2A> to subscribe to the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUpProcessed%2A> method, which is called from the application UI thread. The relationship between <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusDown%2A> and on <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusDownProcessed%2A> is identical.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -593,9 +593,9 @@
  The following example resets the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> when the cursor leaves the bounds of the element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb" id="Snippet20":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.cs" id="Snippet14":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb" id="Snippet14":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -641,7 +641,7 @@
  The following example demonstrates how to override the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusMove%2A> method. To create a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that restricts ink to a certain area, see the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/FilterPlugin.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/FilterPlugin.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/FilterPlugin.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -690,7 +690,7 @@
  The following example creates a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that checks for the <xref:System.Windows.Ink.ApplicationGesture.Down> gesture. The <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> calls <xref:System.Windows.Input.StylusPlugIns.RawStylusInput.NotifyWhenProcessed%2A> in <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUp%2A> to subscribe to the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUpProcessed%2A> method, which is called from the application UI thread. The relationship between <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusMove%2A> and on <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusMoveProcessed%2A> is identical.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -736,7 +736,7 @@
  The following example demonstrates how to override the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUp%2A> method. To create a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that restricts ink to a certain area, see the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/FilterPlugin.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/FilterPlugin.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/FilterPlugin.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -785,7 +785,7 @@
  The following example creates a <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> that checks for the <xref:System.Windows.Ink.ApplicationGesture.Down> gesture. The <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn> checks for the gesture in the <xref:System.Windows.Input.StylusPlugIns.StylusPlugIn.OnStylusUpProcessed%2A> method, which is called from the application UI thread.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/RecognizerPlugin.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/RecognizerPlugin.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input.StylusPlugIns/StylusPlugInCollection.xml b/xml/System.Windows.Input.StylusPlugIns/StylusPlugInCollection.xml
index 26dc4dd08cd..cf6fb9b26de 100644
--- a/xml/System.Windows.Input.StylusPlugIns/StylusPlugInCollection.xml
+++ b/xml/System.Windows.Input.StylusPlugIns/StylusPlugInCollection.xml
@@ -37,7 +37,7 @@
  The following example demonstrates how to add a <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer> to a custom control. To create a control that collects ink, see [Creating an Ink Input Control](/dotnet/framework/wpf/advanced/creating-an-ink-input-control).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/StylusControl.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/CanExecuteRoutedEventArgs.xml b/xml/System.Windows.Input/CanExecuteRoutedEventArgs.xml
index 84e7101c364..f6d4fa5c201 100644
--- a/xml/System.Windows.Input/CanExecuteRoutedEventArgs.xml
+++ b/xml/System.Windows.Input/CanExecuteRoutedEventArgs.xml
@@ -36,7 +36,7 @@
  The follow example creates a <xref:System.Windows.Input.CanExecuteRoutedEventHandler> that returns `true` only if the command target is a control.  First, <xref:System.Windows.RoutedEventArgs.Source%2A> is cast to a <xref:System.Windows.Controls.Control>.  If <xref:System.Windows.RoutedEventArgs.Source%2A> is a <xref:System.Windows.Controls.Control>, <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> is set to `true`; otherwise, it is set to `false`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcanexecute":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcanexecute":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcanexecute":::  
   
  ]]></format>
     </remarks>
@@ -93,7 +93,7 @@
  The follow example creates a <xref:System.Windows.Input.CanExecuteRoutedEventHandler> that only returns true if the command target is a control.  First the <xref:System.Windows.RoutedEventArgs.Source%2A> event data is cast to a <xref:System.Windows.Controls.Control>.  If it is a <xref:System.Windows.Controls.Control>, <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> is set to `true`; otherwise, it is set to `false`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcanexecute":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcanexecute":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcanexecute":::  
   
  ]]></format>
         </remarks>
@@ -145,7 +145,7 @@
  The following example creates a <xref:System.Windows.Input.CanExecuteRoutedEventHandler> which handles multiple commands.  If the <xref:System.Windows.Input.CanExecuteRoutedEventArgs.Command%2A> property is equal to the <xref:System.Windows.Input.MediaCommands.Play%2A> command and the method `IsPlaying` returns `false`, <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> is set to `true`; otherwise, <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> is set to `false`.  If the <xref:System.Windows.Input.CanExecuteRoutedEventArgs.Command%2A> property is equal to the <xref:System.Windows.Input.MediaCommands.Stop%2A> command and the method `IsPlaying` returns `true`, <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> is set to `true`; otherwise, <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> is set to `false`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewmultiplecanexecute":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewmultiplecanexecute":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewmultiplecanexecute":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/CanExecuteRoutedEventHandler.xml b/xml/System.Windows.Input/CanExecuteRoutedEventHandler.xml
index 650d8844131..13cf9a741c8 100644
--- a/xml/System.Windows.Input/CanExecuteRoutedEventHandler.xml
+++ b/xml/System.Windows.Input/CanExecuteRoutedEventHandler.xml
@@ -44,7 +44,7 @@
  The following example shows a <xref:System.Windows.Input.CanExecuteRoutedEventHandler> that sets <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml.cs" id="Snippetcommandhandlercanexecutehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml.vb" id="Snippetcommandhandlercanexecutehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml.vb" id="Snippetcommandhandlercanexecutehandler":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/CommandBinding.xml b/xml/System.Windows.Input/CommandBinding.xml
index 16b0b2cc825..1be5565dcd4 100644
--- a/xml/System.Windows.Input/CommandBinding.xml
+++ b/xml/System.Windows.Input/CommandBinding.xml
@@ -233,12 +233,12 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml" id="Snippetcommandhandlercommandbinding":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window1.xaml.cs" id="Snippetcommandhandlerbindinginit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml.vb" id="Snippetcommandhandlerbindinginit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml.vb" id="Snippetcommandhandlerbindinginit":::
 
  The following shows the <xref:System.Windows.Input.CanExecuteRoutedEventHandler> which sets <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml.cs" id="Snippetcommandhandlercanexecutehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml.vb" id="Snippetcommandhandlercanexecutehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml.vb" id="Snippetcommandhandlercanexecutehandler":::
 
  ]]></format>
         </remarks>
@@ -291,17 +291,17 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml" id="Snippetcommandhandlercommandbinding":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window1.xaml.cs" id="Snippetcommandhandlerbindinginit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml.vb" id="Snippetcommandhandlerbindinginit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml.vb" id="Snippetcommandhandlerbindinginit":::
 
  The following shows the <xref:System.Windows.Input.CanExecuteRoutedEventHandler> which sets <xref:System.Windows.Input.CanExecuteRoutedEventArgs.CanExecute%2A> to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml.cs" id="Snippetcommandhandlercanexecutehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml.vb" id="Snippetcommandhandlercanexecutehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml.vb" id="Snippetcommandhandlercanexecutehandler":::
 
  The following shows the <xref:System.Windows.Input.ExecutedRoutedEventHandler> which creates a <xref:System.Windows.MessageBox> when the command is executed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml.cs" id="Snippetcommandhandlerexecutedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml.vb" id="Snippetcommandhandlerexecutedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml.vb" id="Snippetcommandhandlerexecutedhandler":::
 
  ]]></format>
         </remarks>
@@ -360,12 +360,12 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml" id="Snippetcommandhandlercommandbinding":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window1.xaml.cs" id="Snippetcommandhandlerbindinginit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml.vb" id="Snippetcommandhandlerbindinginit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml.vb" id="Snippetcommandhandlerbindinginit":::
 
  The following shows the <xref:System.Windows.Input.ExecutedRoutedEventHandler> which creates a <xref:System.Windows.MessageBox> when the command is executed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml.cs" id="Snippetcommandhandlerexecutedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml.vb" id="Snippetcommandhandlerexecutedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml.vb" id="Snippetcommandhandlerexecutedhandler":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/CommandBindingCollection.xml b/xml/System.Windows.Input/CommandBindingCollection.xml
index d80906dd9c5..d69a77c35f1 100644
--- a/xml/System.Windows.Input/CommandBindingCollection.xml
+++ b/xml/System.Windows.Input/CommandBindingCollection.xml
@@ -49,7 +49,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml" id="Snippetcommandingoverviewwindowcommandbindingxaml":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcustomcommandbindingcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcustomcommandbindingcodebehind":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcustomcommandbindingcodebehind":::  
   
  ]]></format>
     </remarks>
@@ -178,7 +178,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml" id="Snippetcommandingoverviewwindowcommandbindingxaml":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcustomcommandbindingcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcustomcommandbindingcodebehind":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcustomcommandbindingcodebehind":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/CommandManager.xml b/xml/System.Windows.Input/CommandManager.xml
index 23d5853d477..e2f4a927c66 100644
--- a/xml/System.Windows.Input/CommandManager.xml
+++ b/xml/System.Windows.Input/CommandManager.xml
@@ -85,15 +85,15 @@
  Next, the <xref:System.Windows.Input.CanExecuteRoutedEventHandler> and the <xref:System.Windows.Input.ExecutedRoutedEventHandler> are created.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
 
  And finally, the handlers are attached to the <xref:System.Windows.Controls.Button> using the <xref:System.Windows.Input.CommandManager.AddCanExecuteHandler%2A> and <xref:System.Windows.Input.CommandManager.AddExecutedHandler%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
 
  ]]></format>
         </remarks>
@@ -146,15 +146,15 @@
  Next, the <xref:System.Windows.Input.CanExecuteRoutedEventHandler> and the <xref:System.Windows.Input.ExecutedRoutedEventHandler> are created.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
 
  And finally, the handlers are attached to the <xref:System.Windows.Controls.Button> using the <xref:System.Windows.Input.CommandManager.AddCanExecuteHandler%2A> and <xref:System.Windows.Input.CommandManager.AddExecutedHandler%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
 
  ]]></format>
         </remarks>
@@ -207,15 +207,15 @@
  Next, the <xref:System.Windows.Input.CanExecuteRoutedEventHandler> and the <xref:System.Windows.Input.ExecutedRoutedEventHandler> are created.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
 
  Finally, the handlers are attached to the <xref:System.Windows.Controls.Button> using the <xref:System.Windows.Input.CommandManager.AddCanExecuteHandler%2A> and <xref:System.Windows.Input.CommandManager.AddExecutedHandler%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
 
  ]]></format>
         </remarks>
@@ -268,15 +268,15 @@
  Next, the <xref:System.Windows.Input.CanExecuteRoutedEventHandler> and the <xref:System.Windows.Input.ExecutedRoutedEventHandler> are created.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerexecutedhandler":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagercanexecutehandler":::
 
  Finally, the handlers are attached to the <xref:System.Windows.Controls.Button> using the <xref:System.Windows.Input.CommandManager.AddCanExecuteHandler%2A> and <xref:System.Windows.Input.CommandManager.AddExecutedHandler%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanageraddhandlers":::
 
  ]]></format>
         </remarks>
@@ -455,7 +455,7 @@
  The following example uses a <xref:System.Windows.Threading.DispatcherTimer> to periodically call <xref:System.Windows.Input.CommandManager.InvalidateRequerySuggested%2A> to force the <xref:System.Windows.Input.CommandManager> to raise the <xref:System.Windows.Input.CommandManager.RequerySuggested> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/CanExecuteRoutedEventArgs/Parameter/Window1.xaml.cs" id="Snippetinvalidatesampledispatchertimer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimer":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimer":::
 
  ]]></format>
         </remarks>
@@ -714,7 +714,7 @@
  The following example detaches a <xref:System.Windows.Input.CanExecuteRoutedEventHandler> and an <xref:System.Windows.Input.ExecutedRoutedEventHandler> which had previously been attached to a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
 
  ]]></format>
         </remarks>
@@ -761,7 +761,7 @@
  The following example detaches a <xref:System.Windows.Input.CanExecuteRoutedEventHandler> and an <xref:System.Windows.Input.ExecutedRoutedEventHandler> which had previously been attached to a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
 
  ]]></format>
         </remarks>
@@ -808,7 +808,7 @@
  The following example detaches a <xref:System.Windows.Input.CanExecuteRoutedEventHandler> and an <xref:System.Windows.Input.ExecutedRoutedEventHandler> which had previously been attached to a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
 
  ]]></format>
         </remarks>
@@ -855,7 +855,7 @@
  The following example detaches a <xref:System.Windows.Input.CanExecuteRoutedEventHandler> and an <xref:System.Windows.Input.ExecutedRoutedEventHandler> which had previously been attached to a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewcmdmanagerremovehandlers":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/ExecutedRoutedEventArgs.xml b/xml/System.Windows.Input/ExecutedRoutedEventArgs.xml
index 99c3c23cac6..d015dab2d33 100644
--- a/xml/System.Windows.Input/ExecutedRoutedEventArgs.xml
+++ b/xml/System.Windows.Input/ExecutedRoutedEventArgs.xml
@@ -38,7 +38,7 @@
  The following example creates an <xref:System.Windows.Input.ExecutedRoutedEventHandler> that opens a <xref:System.Windows.MessageBox> when the command is executed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml.cs" id="Snippetcommandhandlerexecutedhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/commandWithHandler/VisualBasic/Window1.xaml.vb" id="Snippetcommandhandlerexecutedhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventHandler/Overview/Window1.xaml.vb" id="Snippetcommandhandlerexecutedhandler":::
 
  ]]></format>
     </remarks>
@@ -90,7 +90,7 @@
  The following example creates an <xref:System.Windows.Input.ExecutedRoutedEventHandler> that handles multiple commands. The handler checks the <xref:System.Windows.Input.ExecutedRoutedEventArgs.Command%2A> property on the <xref:System.Windows.Input.ExecutedRoutedEventArgs> to determine which method to call.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewmultiplecmdhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewmultiplecmdhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewmultiplecmdhandler":::
 
  ]]></format>
         </remarks>
@@ -178,7 +178,7 @@
  The following example creates an <xref:System.Windows.Input.ExecutedRoutedEventHandler> for a custom <xref:System.Windows.Input.RoutedCommand>.  The handler updates a <xref:System.Windows.Controls.TextBox> with the current time and the <xref:System.Windows.Controls.Primitives.RangeBase.Value%2A> property of a <xref:System.Windows.Controls.Slider> control that is passed to the handler through the <xref:System.Windows.Input.ExecutedRoutedEventArgs.Parameter%2A?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/CanExecuteRoutedEventArgs/Parameter/Window1.xaml.cs" id="Snippetinvalidatesampleexecuted":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb" id="Snippetinvalidatesampleexecuted":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb" id="Snippetinvalidatesampleexecuted":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/ExecutedRoutedEventHandler.xml b/xml/System.Windows.Input/ExecutedRoutedEventHandler.xml
index 22e28dfc9a6..80281409768 100644
--- a/xml/System.Windows.Input/ExecutedRoutedEventHandler.xml
+++ b/xml/System.Windows.Input/ExecutedRoutedEventHandler.xml
@@ -58,7 +58,7 @@
  This example creates an <xref:System.Windows.Input.ExecutedRoutedEventHandler> that sets a visual property on the target when the command is executed. The example also includes the <xref:System.Windows.Input.CanExecuteRoutedEventHandler> for the same command.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ExecutedRoutedEventHandler/Overview/Window1.xaml.cs" id="Snippetcustom_routedcommandhandlers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Custom_RoutedCommand/visualbasic/window1.xaml.vb" id="Snippetcustom_routedcommandhandlers":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ExecutedRoutedEventHandler/Overview/window1.xaml.vb" id="Snippetcustom_routedcommandhandlers":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/FocusManager.xml b/xml/System.Windows.Input/FocusManager.xml
index 872b9d2fc55..7168ccabf25 100644
--- a/xml/System.Windows.Input/FocusManager.xml
+++ b/xml/System.Windows.Input/FocusManager.xml
@@ -245,7 +245,7 @@ This object may or may not have keyboard focus. Keyboard focus refers to the ele
  The following example sets the element with logical focus by using the <xref:System.Windows.Input.FocusManager.SetFocusedElement%2A> and it gets the element with logical focus by using the <xref:System.Windows.Input.FocusManager.GetFocusedElement%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/FocusManager/GetFocusedElement/Window1.xaml.cs" id="Snippetfocusgetsetfocusedelement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/window1.xaml.vb" id="Snippetfocusgetsetfocusedelement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/window1.xaml.vb" id="Snippetfocusgetsetfocusedelement":::
 
  ]]></format>
         </remarks>
@@ -633,7 +633,7 @@ This object may or may not have keyboard focus. Keyboard focus refers to the ele
  The following example sets the element with logical focus by using the <xref:System.Windows.Input.FocusManager.SetFocusedElement%2A> and it gets the element with logical focus by using the <xref:System.Windows.Input.FocusManager.GetFocusedElement%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/FocusManager/GetFocusedElement/Window1.xaml.cs" id="Snippetfocusgetsetfocusedelement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/window1.xaml.vb" id="Snippetfocusgetsetfocusedelement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/window1.xaml.vb" id="Snippetfocusgetsetfocusedelement":::
 
  ]]></format>
         </remarks>
@@ -684,7 +684,7 @@ This object may or may not have keyboard focus. Keyboard focus refers to the ele
  The follow example makes an element a focus scope by using <xref:System.Windows.Input.FocusManager.SetIsFocusScope%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/FocusManager/GetFocusedElement/Window1.xaml.cs" id="Snippetfocussetisfocusscope":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSnippets/visualbasic/window1.xaml.vb" id="Snippetfocussetisfocusscope":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/FocusManager/GetFocusedElement/window1.xaml.vb" id="Snippetfocussetisfocusscope":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/ImeSentenceModeValues.xml b/xml/System.Windows.Input/ImeSentenceModeValues.xml
index 6b28cde4185..9f713d0fdf4 100644
--- a/xml/System.Windows.Input/ImeSentenceModeValues.xml
+++ b/xml/System.Windows.Input/ImeSentenceModeValues.xml
@@ -34,7 +34,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.InputMethod.ImeSentenceMode%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/InertiaExpansionBehavior.xml b/xml/System.Windows.Input/InertiaExpansionBehavior.xml
index a35e30eeb9d..02f4aeb5a94 100644
--- a/xml/System.Windows.Input/InertiaExpansionBehavior.xml
+++ b/xml/System.Windows.Input/InertiaExpansionBehavior.xml
@@ -43,7 +43,7 @@
  The following example shows the <xref:System.Windows.UIElement.ManipulationInertiaStarting> event handler and sets the desired deceleration for translation, expansion, and rotation that is used during inertia. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationinertiastarting":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/InertiaRotationBehavior.xml b/xml/System.Windows.Input/InertiaRotationBehavior.xml
index 52ff4e68ab0..2e55522ebc6 100644
--- a/xml/System.Windows.Input/InertiaRotationBehavior.xml
+++ b/xml/System.Windows.Input/InertiaRotationBehavior.xml
@@ -43,7 +43,7 @@
  The following example shows the <xref:System.Windows.UIElement.ManipulationInertiaStarting> event handler and sets the desired deceleration for translation, expansion, and rotation that is used during inertia. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationinertiastarting":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/InertiaTranslationBehavior.xml b/xml/System.Windows.Input/InertiaTranslationBehavior.xml
index 84ac2ba1366..3b9fed02fb8 100644
--- a/xml/System.Windows.Input/InertiaTranslationBehavior.xml
+++ b/xml/System.Windows.Input/InertiaTranslationBehavior.xml
@@ -43,7 +43,7 @@
  The following example shows the <xref:System.Windows.UIElement.ManipulationInertiaStarting> event handler and sets the desired deceleration for translation, expansion, and rotation that is used during inertia. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationinertiastarting":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/InputBinding.xml b/xml/System.Windows.Input/InputBinding.xml
index c831099eb40..99d4f0326fa 100644
--- a/xml/System.Windows.Input/InputBinding.xml
+++ b/xml/System.Windows.Input/InputBinding.xml
@@ -71,12 +71,12 @@
  The first example creates a class named `SimpleDelegateCommand`. This class accepts a delegate so that the object creating the command can define the action that occurs when the command executes. `SimpleDelegateCommand` also defines properties that specify what key and mouse input invokes the command. `GestureKey` and `GestureModifier` specify the keyboard input; `MouseGesture` specifies the mouse input.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/Overview/mainwindow.xaml.cs" id="Snippetdelegatecommand":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/mainwindow.xaml.vb" id="Snippetdelegatecommand":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/mainwindow.xaml.vb" id="Snippetdelegatecommand":::
 
  The following example creates and initializes the `ColorChangeCommand`, which is a `SimpleDelegateCommand`. The example also defines the method that executes when the command is invoked and sets the `GestureKey`, `GestureModifier`, and `MouseGesture` properties. An application would call the `InitializeCommand` method when the program begins, such as in the constructor of a <xref:System.Windows.Window>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/Overview/mainwindow.xaml.cs" id="Snippetinitializecommand":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/inputcommandbinding/visualbasic/mainwindow.xaml.vb" id="Snippetinitializecommand":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/Overview/mainwindow.xaml.vb" id="Snippetinitializecommand":::
 
  Finally, the following example creates the user interface. The example adds a <xref:System.Windows.Input.KeyBinding> and a <xref:System.Windows.Input.MouseBinding> to a <xref:System.Windows.Controls.StackPanel> that contains a <xref:System.Windows.Controls.Button> and a <xref:System.Windows.Controls.ListBox>. When the user selects an item in the <xref:System.Windows.Controls.ListBox>, they can change the color of the background to the selected color. In each case, the `CommandParameter` property is bound to the selected item in the <xref:System.Windows.Controls.ListBox>, and the `Command` property is bound to the `ColorChangeCommand`. The <xref:System.Windows.Input.KeyBinding.Key%2A?displayProperty=nameWithType>, <xref:System.Windows.Input.KeyBinding.Modifiers%2A?displayProperty=nameWithType>, and <xref:System.Windows.Input.MouseBinding.MouseAction%2A?displayProperty=nameWithType> properties are bound to the corresponding properties on the `SimpleDelegateCommand` class.
 
@@ -182,7 +182,7 @@
  The following example shows how to use this constructor to associate a <xref:System.Windows.Input.KeyGesture> with a <xref:System.Windows.Input.RoutedCommand>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetinputbindingaddingcommand":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetinputbindingaddingcommand":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetinputbindingaddingcommand":::
 
  ]]></format>
         </remarks>
@@ -332,7 +332,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml" id="Snippetcommandingoverviewxamlkeybinding":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewkeybinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewkeybinding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewkeybinding":::
 
  ]]></format>
         </remarks>
@@ -649,7 +649,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml" id="Snippetkeybindingwithkeyandmodifiersxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetkeybindingwithkeyandmodifiers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetkeybindingwithkeyandmodifiers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetkeybindingwithkeyandmodifiers":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/InputBindingCollection.xml b/xml/System.Windows.Input/InputBindingCollection.xml
index 7c3fc922fab..e65d4437e86 100644
--- a/xml/System.Windows.Input/InputBindingCollection.xml
+++ b/xml/System.Windows.Input/InputBindingCollection.xml
@@ -49,7 +49,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml" id="Snippetcommandingoverviewxamlkeybinding":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewkeybinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewkeybinding":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewkeybinding":::  
   
  ]]></format>
     </remarks>
@@ -188,7 +188,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml" id="Snippetcommandingoverviewxamlkeybinding":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewkeybinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewkeybinding":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewkeybinding":::  
   
  The XAML example does not literally use <xref:System.Windows.Input.InputBindingCollection.Add%2A>, but <xref:System.Windows.Input.InputBindingCollection.Add%2A> is called implicitly by the XAML processing support for collections. For details on XAML and collections, see [XAML Overview (WPF)](/dotnet/framework/wpf/advanced/xaml-overview-wpf).  
   
diff --git a/xml/System.Windows.Input/InputGestureCollection.xml b/xml/System.Windows.Input/InputGestureCollection.xml
index 5b62e932658..e22a4d15e88 100644
--- a/xml/System.Windows.Input/InputGestureCollection.xml
+++ b/xml/System.Windows.Input/InputGestureCollection.xml
@@ -42,7 +42,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml" id="Snippetcommandingoverviewxamlkeybinding":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewkeygestureoncmd":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewkeygestureoncmd":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewkeygestureoncmd":::  
   
  ]]></format>
     </remarks>
@@ -155,7 +155,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml" id="Snippetcommandingoverviewxamlkeybinding":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/InputBindings/Window1.xaml.cs" id="Snippetcommandingoverviewkeygestureoncmd":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandingOverviewSnippets/visualbasic/window1.xaml.vb" id="Snippetcommandingoverviewkeygestureoncmd":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CanExecuteRoutedEventArgs/Overview/window1.xaml.vb" id="Snippetcommandingoverviewkeygestureoncmd":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/InputLanguageManager.xml b/xml/System.Windows.Input/InputLanguageManager.xml
index 4009fc1efaf..ef909ad8385 100644
--- a/xml/System.Windows.Input/InputLanguageManager.xml
+++ b/xml/System.Windows.Input/InputLanguageManager.xml
@@ -36,7 +36,7 @@
  The following example demonstrates how to use an <xref:System.Windows.Input.InputLanguageManager> to set the input language of a <xref:System.Windows.Controls.TextBox> element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
  The following example demonstrates how to use an <xref:System.Windows.Input.InputLanguageManager> to enumerate the available input languages.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -121,7 +121,7 @@
  The following example demonstrates how to use an <xref:System.Windows.Input.InputLanguageManager> to access the language manager associated with the current context.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
  The following example demonstrates how to use an <xref:System.Windows.Input.InputLanguageManager> to get the current input language.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -219,7 +219,7 @@
  The following example demonstrates how to use an <xref:System.Windows.Input.InputLanguageManager> to get the input language of a <xref:System.Windows.Controls.TextBox> element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -602,7 +602,7 @@
  The following example demonstrates how to use an <xref:System.Windows.Input.InputLanguageManager> to set the input language of a <xref:System.Windows.Controls.TextBox> element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/InputMethod.xml b/xml/System.Windows.Input/InputMethod.xml
index df62845da28..b6fce8a1cc4 100644
--- a/xml/System.Windows.Input/InputMethod.xml
+++ b/xml/System.Windows.Input/InputMethod.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to use an <xref:System.Windows.Input.InputMethod> object.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.InputMethod.CanShowConfigurationUI%2A> property to determine if the configuration UI is viewable.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -162,7 +162,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.InputMethod.Current%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -452,7 +452,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.InputMethod.Current%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -545,7 +545,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.InputMethod.ImeSentenceMode%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -1027,7 +1027,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.InputMethod.SetInputScope%2A> method to determine the <xref:System.Windows.Input.InputScope> associated with a <xref:System.Windows.Controls.TextBox> object.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -1477,7 +1477,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.InputMethod.SpeechMode%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/KeyBinding.xml b/xml/System.Windows.Input/KeyBinding.xml
index ff1dc2755c4..d8a6baade45 100644
--- a/xml/System.Windows.Input/KeyBinding.xml
+++ b/xml/System.Windows.Input/KeyBinding.xml
@@ -42,7 +42,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml" id="Snippetcommandhandlerkeybinding":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window1.xaml.cs" id="Snippetcommandhandlerkeybindingcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml.vb" id="Snippetcommandhandlerkeybindingcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml.vb" id="Snippetcommandhandlerkeybindingcodebehind":::
 
  ]]></format>
     </remarks>
@@ -260,7 +260,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml" id="Snippetcommandhandlerkeybinding":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetkeybindingwithkeyandmodifiers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetkeybindingwithkeyandmodifiers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetkeybindingwithkeyandmodifiers":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/KeyEventArgs.xml b/xml/System.Windows.Input/KeyEventArgs.xml
index ec34affd3b1..d470e624980 100644
--- a/xml/System.Windows.Input/KeyEventArgs.xml
+++ b/xml/System.Windows.Input/KeyEventArgs.xml
@@ -289,7 +289,7 @@
  The following example checks whether the key associated with an instance of <xref:System.Windows.Input.KeyEventArgs> is down by obtaining the state of the <xref:System.Windows.Input.KeyEventArgs.IsDown%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargsisdown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargsisdown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargsisdown":::  
   
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
  The following example checks whether the key associated with an instance of <xref:System.Windows.Input.KeyEventArgs> is a repeated key by obtaining the state of the <xref:System.Windows.Input.KeyEventArgs.IsRepeat%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargsisrepeat":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargsisrepeat":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargsisrepeat":::  
   
  ]]></format>
         </remarks>
@@ -384,7 +384,7 @@
  The following example checks whether the key associated with an instance of <xref:System.Windows.Input.KeyEventArgs> is toggled by obtaining the state of the <xref:System.Windows.Input.KeyEventArgs.IsToggled%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargsistoggled":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargsistoggled":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargsistoggled":::  
   
  ]]></format>
         </remarks>
@@ -431,7 +431,7 @@
  The following example checks whether the key associated with an instance of <xref:System.Windows.Input.KeyEventArgs> is up by obtaining the state of the <xref:System.Windows.Input.KeyEventArgs.IsUp%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargsisup":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargsisup":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargsisup":::  
   
  ]]></format>
         </remarks>
@@ -478,7 +478,7 @@
  The following example creates a <xref:System.Windows.Input.KeyEventHandler> and checks whether the key associated with the <xref:System.Windows.Input.KeyEventArgs> is the <xref:System.Windows.Input.Key.Return> key.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/KeyDown/Window1.xaml.cs" id="Snippetkeydownsample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/Window1.xaml.vb" id="Snippetkeydownsample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/Window1.xaml.vb" id="Snippetkeydownsample":::  
   
  ]]></format>
         </remarks>
@@ -524,7 +524,7 @@
  The following example checks whether a key associated with an instance of <xref:System.Windows.Input.KeyEventArgs> is down by performing a bitwise `AND` comparison on the <xref:System.Windows.Input.KeyEventArgs.KeyStates%2A> of the key and the <xref:System.Windows.Input.KeyStates.Down> enumeration value.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargskeystatesdown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargskeystatesdown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargskeystatesdown":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/KeyEventHandler.xml b/xml/System.Windows.Input/KeyEventHandler.xml
index 9d8bbee3a1d..64420114afc 100644
--- a/xml/System.Windows.Input/KeyEventHandler.xml
+++ b/xml/System.Windows.Input/KeyEventHandler.xml
@@ -70,7 +70,7 @@
  The following example checks whether the key associated with the event is the <xref:System.Windows.Input.Key.Return> key.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/KeyDown/Window1.xaml.cs" id="Snippetkeydownsample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/Window1.xaml.vb" id="Snippetkeydownsample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/Window1.xaml.vb" id="Snippetkeydownsample":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/KeyGesture.xml b/xml/System.Windows.Input/KeyGesture.xml
index 623cac548a3..4395431e1ea 100644
--- a/xml/System.Windows.Input/KeyGesture.xml
+++ b/xml/System.Windows.Input/KeyGesture.xml
@@ -72,7 +72,7 @@
  The following example shows how to bind the <xref:System.Windows.Input.ApplicationCommands.Close%2A> command to a <xref:System.Windows.Input.KeyGesture> using a <xref:System.Windows.Input.KeyBinding>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetkeybindingwithkeyandmodifiers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetkeybindingwithkeyandmodifiers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetkeybindingwithkeyandmodifiers":::
 
  The following example shows how to use <xref:System.Windows.Input.KeyGesture> in XAML. Note that the XAML usage does not directly declare a `<KeyGesture>` element. That object element usage is not possible because <xref:System.Windows.Input.KeyGesture> does not expose a public parameterless constructor. Instead, the XAML usage uses the typeconverter behavior to declare an entire <xref:System.Windows.Input.KeyGesture> inline as the `Gesture` attribute value.
 
@@ -141,7 +141,7 @@
  The following example shows how to use this constructor to create a <xref:System.Windows.Input.KeyGesture> and associate it with a <xref:System.Windows.Input.KeyBinding>.  The <xref:System.Windows.Input.KeyBinding> is then added to the <xref:System.Windows.Input.InputBindingCollection> of a <xref:System.Windows.Window>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetkeybindingwithnomodifier":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetkeybindingwithnomodifier":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetkeybindingwithnomodifier":::
 
  ]]></format>
         </remarks>
@@ -191,7 +191,7 @@
  The following example shows how to use this constructor to create a <xref:System.Windows.Input.KeyGesture> and associate it with a <xref:System.Windows.Input.KeyBinding>. The <xref:System.Windows.Input.KeyBinding> is then added to the <xref:System.Windows.Input.InputBindingCollection> of a <xref:System.Windows.Window>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetkeybindingwithkeyandmodifiers":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetkeybindingwithkeyandmodifiers":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetkeybindingwithkeyandmodifiers":::
 
  ]]></format>
         </remarks>
@@ -442,7 +442,7 @@
  The following example shows how to test whether a <xref:System.Windows.Input.KeyGesture> matches the input associated with an instance of an <xref:System.Windows.Input.InputEventArgs>. A <xref:System.Windows.UIElement.KeyDown> event handler is created that compares the event data with the <xref:System.Windows.Input.KeyGesture> by using the <xref:System.Windows.Input.KeyGesture.Matches%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetkeydownhandlerkeygesturematches":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetkeydownhandlerkeygesturematches":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetkeydownhandlerkeygesturematches":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/KeyStates.xml b/xml/System.Windows.Input/KeyStates.xml
index 16b6722188f..3f5da5f31fe 100644
--- a/xml/System.Windows.Input/KeyStates.xml
+++ b/xml/System.Windows.Input/KeyStates.xml
@@ -39,7 +39,7 @@
  The following example changes the color of a <xref:System.Windows.Controls.Button> if the `KeyStates` of the key passed in the <xref:System.Windows.Input.KeyEventArgs> is `Down`. The state of the key is determined by using a bitwise `AND` operation.  The same technique can be used to determine whether a key has multiple states, such as being in the `Toggled` state and the `Down` state.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargskeystatesdown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargskeystatesdown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargskeystatesdown":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/Keyboard.xml b/xml/System.Windows.Input/Keyboard.xml
index ab88362ba1e..62a37fd9242 100644
--- a/xml/System.Windows.Input/Keyboard.xml
+++ b/xml/System.Windows.Input/Keyboard.xml
@@ -44,7 +44,7 @@
  The following example shows how to use the <xref:System.Windows.Input.Keyboard.IsKeyToggled%2A> method to determine if a key is in the toggled state. If the <xref:System.Windows.Input.Key> passed to <xref:System.Windows.Input.Keyboard.IsKeyToggled%2A> is toggled, the background of a button is changed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargskeyboardistoggled":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargskeyboardistoggled":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargskeyboardistoggled":::
 
  ]]></format>
     </remarks>
@@ -558,7 +558,7 @@
  The following example shows a <xref:System.Windows.FrameworkElement.Loaded> event handler that sets keyboard focus on a <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/MoveFocus/Window1.xaml.cs" id="Snippetfocussamplesetfocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml.vb" id="Snippetfocussamplesetfocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml.vb" id="Snippetfocussamplesetfocus":::
 
  ]]></format>
         </remarks>
@@ -603,7 +603,7 @@
  The following example gets the element with keyboard focus and casts it to a <xref:System.Windows.Controls.Control>.  If the element with keyboard focus is a <xref:System.Windows.Controls.Control>, the background of the element is changed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/MoveFocus/Window1.xaml.cs" id="Snippetgetkeyboardfocusedelement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml.vb" id="Snippetgetkeyboardfocusedelement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml.vb" id="Snippetgetkeyboardfocusedelement":::
 
  ]]></format>
         </remarks>
@@ -652,7 +652,7 @@
  The following example shows how to use the <xref:System.Windows.Input.Keyboard.GetKeyStates%2A> method to determine if the <xref:System.Windows.Input.Key.Return> key is in the <xref:System.Windows.Input.KeyStates.Down> state.  A bit AND operation is used to compare the <xref:System.Windows.Input.KeyStates> returned from <xref:System.Windows.Input.Keyboard.GetKeyStates%2A> and the <xref:System.Windows.Input.Key.Down> state. If the key is down, the background of a <xref:System.Windows.Controls.Button> is changed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargskeyboardgetkeystates":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargskeyboardgetkeystates":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargskeyboardgetkeystates":::
 
  ]]></format>
         </remarks>
@@ -709,10 +709,10 @@
  :::code language="xml" source="~/snippets/csharp/System.Windows.Input/Keyboard/GotKeyboardFocus/Window1.xaml" id="Snippetkeyboardsamplexamlhandlerhookup":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/GotKeyboardFocus/Window1.xaml.cs" id="Snippetkeyboardsamplegotfocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/window1.xaml.vb" id="Snippetkeyboardsamplegotfocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/window1.xaml.vb" id="Snippetkeyboardsamplegotfocus":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/GotKeyboardFocus/Window1.xaml.cs" id="Snippetkeyboardsamplelostfocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/window1.xaml.vb" id="Snippetkeyboardsamplelostfocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/window1.xaml.vb" id="Snippetkeyboardsamplelostfocus":::
 
  ]]></format>
         </remarks>
@@ -794,7 +794,7 @@
  The following example shows how to use the <xref:System.Windows.Input.Keyboard.IsKeyDown%2A> method to determine the state of a specific key.  The <xref:System.Windows.Input.Key.Return> key is passed to the <xref:System.Windows.Input.Keyboard.IsKeyDown%2A> method.  If the method returns `true`, the background of a <xref:System.Windows.Controls.Button> is changed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargskeyboardiskeydown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargskeyboardiskeydown":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargskeyboardiskeydown":::
 
  ]]></format>
         </remarks>
@@ -844,7 +844,7 @@
  The following example shows how to use the <xref:System.Windows.Input.Keyboard.IsKeyToggled%2A> method to determine the state of a specific key. The <xref:System.Windows.Input.Key.Return> key is passed to the <xref:System.Windows.Input.Keyboard.IsKeyToggled%2A> method.  If the method returns `true`, then the background of a <xref:System.Windows.Controls.Button> is changed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargskeyboardistoggled":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargskeyboardistoggled":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargskeyboardistoggled":::
 
  ]]></format>
         </remarks>
@@ -894,7 +894,7 @@
  The following example shows how to use the <xref:System.Windows.Input.Keyboard.IsKeyUp%2A> method to determine the state of a specific key.  The <xref:System.Windows.Input.Key.Return> key is passed to the <xref:System.Windows.Input.Keyboard.IsKeyUp%2A> method.  If the method returns `true`, then the background of a <xref:System.Windows.Controls.Button> is changed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyeventargskeyboardiskeyup":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyeventargskeyboardiskeyup":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyeventargskeyboardiskeyup":::
 
  ]]></format>
         </remarks>
@@ -1020,7 +1020,7 @@
  :::code language="xml" source="~/snippets/csharp/System.Windows.Input/Keyboard/KeyDown/Window1.xaml" id="Snippetkeydownui":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/KeyDown/Window1.xaml.cs" id="Snippetkeydownsample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyDown/VisualBasic/Window1.xaml.vb" id="Snippetkeydownsample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/KeyDown/Window1.xaml.vb" id="Snippetkeydownsample":::
 
  ]]></format>
         </remarks>
@@ -1186,10 +1186,10 @@
  :::code language="xml" source="~/snippets/csharp/System.Windows.Input/Keyboard/GotKeyboardFocus/Window1.xaml" id="Snippetkeyboardsamplexamlhandlerhookup":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/GotKeyboardFocus/Window1.xaml.cs" id="Snippetkeyboardsamplegotfocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/window1.xaml.vb" id="Snippetkeyboardsamplegotfocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/window1.xaml.vb" id="Snippetkeyboardsamplegotfocus":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/GotKeyboardFocus/Window1.xaml.cs" id="Snippetkeyboardsamplelostfocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyboardSample/visualbasic/window1.xaml.vb" id="Snippetkeyboardsamplelostfocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/GotKeyboardFocus/window1.xaml.vb" id="Snippetkeyboardsamplelostfocus":::
 
  ]]></format>
         </remarks>
@@ -1266,7 +1266,7 @@
  The following example uses a bit AND comparison to determine if the <xref:System.Windows.Input.ModifierKeys.Control> modifier key is pressed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Keyboard/Overview/Window1.xaml.cs" id="Snippetkeyboardmodifiersbitoperation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/KeyArgsSnippetSample/visualbasic/window1.xaml.vb" id="Snippetkeyboardmodifiersbitoperation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Keyboard/Overview/window1.xaml.vb" id="Snippetkeyboardmodifiersbitoperation":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/KeyboardNavigation.xml b/xml/System.Windows.Input/KeyboardNavigation.xml
index 8067ad73669..ed8b61c6165 100644
--- a/xml/System.Windows.Input/KeyboardNavigation.xml
+++ b/xml/System.Windows.Input/KeyboardNavigation.xml
@@ -40,7 +40,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/FocusManager/FocusedElement/Window1.xaml" id="Snippetmarkupkeyboardnavigationtabnavigationxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/FocusManager/FocusedElement/Window1.xaml.cs" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/window1.xaml.vb" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/window1.xaml.vb" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::
 
  ]]></format>
     </remarks>
@@ -892,7 +892,7 @@
  :::code language="xml" source="~/snippets/csharp/System.Windows.Input/FocusManager/FocusedElement/Window1.xaml" id="Snippetmarkupkeyboardnavigationtabnavigationxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/FocusManager/FocusedElement/Window1.xaml.cs" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/window1.xaml.vb" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/window1.xaml.vb" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/KeyboardNavigationMode.xml b/xml/System.Windows.Input/KeyboardNavigationMode.xml
index b1585c40ff4..8e764c86c2d 100644
--- a/xml/System.Windows.Input/KeyboardNavigationMode.xml
+++ b/xml/System.Windows.Input/KeyboardNavigationMode.xml
@@ -30,7 +30,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/FocusManager/FocusedElement/Window1.xaml" id="Snippetmarkupkeyboardnavigationtabnavigationxaml":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/FocusManager/FocusedElement/Window1.xaml.cs" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/window1.xaml.vb" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/window1.xaml.vb" id="Snippetmarkupkeyboardnavigationtabnavigationcode":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/ManipulationDelta.xml b/xml/System.Windows.Input/ManipulationDelta.xml
index 4d1bbaf5cd8..cdbf2f08f8a 100644
--- a/xml/System.Windows.Input/ManipulationDelta.xml
+++ b/xml/System.Windows.Input/ManipulationDelta.xml
@@ -35,7 +35,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event.  The example applies the <xref:System.Windows.Input.ManipulationDelta.Translation%2A>, <xref:System.Windows.Input.ManipulationDelta.Scale%2A>, and <xref:System.Windows.Input.ManipulationDelta.Rotation%2A> properties to move, resize, and rotate a <xref:System.Windows.Shapes.Rectangle>. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
   
  ]]></format>
     </remarks>
@@ -156,7 +156,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event.  The example applies the <xref:System.Windows.Input.ManipulationDelta.Translation%2A>, <xref:System.Windows.Input.ManipulationDelta.Scale%2A>, and <xref:System.Windows.Input.ManipulationDelta.Rotation%2A> properties to move, resize, and rotate a <xref:System.Windows.Shapes.Rectangle>. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
   
  ]]></format>
         </remarks>
@@ -204,7 +204,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event.  The example applies the <xref:System.Windows.Input.ManipulationDelta.Translation%2A>, <xref:System.Windows.Input.ManipulationDelta.Scale%2A>, and <xref:System.Windows.Input.ManipulationDelta.Rotation%2A> properties to move, resize, and rotate a <xref:System.Windows.Shapes.Rectangle>. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
   
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event.  The example applies the <xref:System.Windows.Input.ManipulationDelta.Translation%2A>, <xref:System.Windows.Input.ManipulationDelta.Scale%2A>, and <xref:System.Windows.Input.ManipulationDelta.Rotation%2A> properties to move, resize, and rotate a <xref:System.Windows.Shapes.Rectangle>. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/ManipulationDeltaEventArgs.xml b/xml/System.Windows.Input/ManipulationDeltaEventArgs.xml
index 8da784615bd..594936f7ea3 100644
--- a/xml/System.Windows.Input/ManipulationDeltaEventArgs.xml
+++ b/xml/System.Windows.Input/ManipulationDeltaEventArgs.xml
@@ -35,7 +35,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event. The example uses the <xref:System.Windows.Input.ManipulationDeltaEventArgs.DeltaManipulation%2A> property to move, resize, and rotate a <xref:System.Windows.Shapes.Rectangle>. The example also checks whether the <xref:System.Windows.UIElement.ManipulationDelta> event occurred during inertia and whether the rectangle is touching the edge of a window. If those cases are true, the application stops the manipulation to prevent the rectangle from leaving the visible area of the application. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
   
  ]]></format>
     </remarks>
@@ -113,7 +113,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event. The example checks whether the <xref:System.Windows.UIElement.ManipulationDelta> event occurred during inertia and whether the rectangle is touching the edge of a window. If those cases are true, the application stops the manipulation to prevent the rectangle from leaving the visible area of the application. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
   
  ]]></format>
         </remarks>
@@ -201,7 +201,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event. The example uses the <xref:System.Windows.Input.ManipulationDeltaEventArgs.DeltaManipulation%2A> property to move, resize, and rotate a <xref:System.Windows.Shapes.Rectangle>. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
   
  ]]></format>
         </remarks>
@@ -282,7 +282,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event. The example checks whether the <xref:System.Windows.UIElement.ManipulationDelta> event occurred during inertia and whether the rectangle is touching the edge of a window. If those cases are true, the application stops the manipulation to prevent the rectangle from leaving the visible area of the application. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::  
   
  ]]></format>
         </remarks>
@@ -420,7 +420,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event that calls the <xref:System.Windows.Input.ManipulationDeltaEventArgs.ReportBoundaryFeedback%2A> method when the user moves the element over the edge of its container.  To test this example, follow the steps in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application) and replace the code in step 5 with this code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/reportboundaryfeedbackexample.xaml.cs" id="Snippetreportboundaryfeedback":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/reportboundaryfeedbackexample.xaml.vb" id="Snippetreportboundaryfeedback":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/reportboundaryfeedbackexample.xaml.vb" id="Snippetreportboundaryfeedback":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/ManipulationInertiaStartingEventArgs.xml b/xml/System.Windows.Input/ManipulationInertiaStartingEventArgs.xml
index e7e0aafd4a5..69cd568e29d 100644
--- a/xml/System.Windows.Input/ManipulationInertiaStartingEventArgs.xml
+++ b/xml/System.Windows.Input/ManipulationInertiaStartingEventArgs.xml
@@ -43,7 +43,7 @@
  The following example shows the <xref:System.Windows.UIElement.ManipulationInertiaStarting> event handler and sets the desired deceleration for translation, expansion, and rotation that is used during inertia. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationinertiastarting":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/ManipulationPivot.xml b/xml/System.Windows.Input/ManipulationPivot.xml
index bb59153f2f3..4d374f6579a 100644
--- a/xml/System.Windows.Input/ManipulationPivot.xml
+++ b/xml/System.Windows.Input/ManipulationPivot.xml
@@ -33,7 +33,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationStarting> event and sets the <xref:System.Windows.Input.ManipulationStartingEventArgs.Pivot%2A?displayProperty=nameWithType> property. To test this example, follow the steps in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application) and replace the code in step 4 with this code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/reportboundaryfeedbackexample.xaml.cs" id="Snippetmanipulationpivot":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/reportboundaryfeedbackexample.xaml.vb" id="Snippetmanipulationpivot":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/reportboundaryfeedbackexample.xaml.vb" id="Snippetmanipulationpivot":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/ManipulationStartingEventArgs.xml b/xml/System.Windows.Input/ManipulationStartingEventArgs.xml
index efe14f93a9f..82c129c4b1c 100644
--- a/xml/System.Windows.Input/ManipulationStartingEventArgs.xml
+++ b/xml/System.Windows.Input/ManipulationStartingEventArgs.xml
@@ -318,7 +318,7 @@
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationStarting> event and sets the <xref:System.Windows.Input.ManipulationStartingEventArgs.Pivot%2A?displayProperty=nameWithType> property. To test this example, follow the steps in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application) and replace the code in step 4 with this code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/reportboundaryfeedbackexample.xaml.cs" id="Snippetmanipulationpivot":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/reportboundaryfeedbackexample.xaml.vb" id="Snippetmanipulationpivot":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/reportboundaryfeedbackexample.xaml.vb" id="Snippetmanipulationpivot":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/ModifierKeys.xml b/xml/System.Windows.Input/ModifierKeys.xml
index 38fec3305d8..90af5809140 100644
--- a/xml/System.Windows.Input/ModifierKeys.xml
+++ b/xml/System.Windows.Input/ModifierKeys.xml
@@ -63,7 +63,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window11.xaml" id="Snippetcommandhandlerkeybinding":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window1.xaml.cs" id="Snippetcommandhandlerkeybindingcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml.vb" id="Snippetcommandhandlerkeybindingcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml.vb" id="Snippetcommandhandlerkeybindingcodebehind":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/Mouse.xml b/xml/System.Windows.Input/Mouse.xml
index 780c78c5169..1432fb59a2d 100644
--- a/xml/System.Windows.Input/Mouse.xml
+++ b/xml/System.Windows.Input/Mouse.xml
@@ -602,7 +602,7 @@
  The following example shows how to capture the mouse to a specific element by using the <xref:System.Windows.Input.Mouse.Capture%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/Capture/Window1.xaml.cs" id="Snippetmousecaptursamplecaptureelement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/window1.xaml.vb" id="Snippetmousecaptursamplecaptureelement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/Capture/window1.xaml.vb" id="Snippetmousecaptursamplecaptureelement":::
 
  ]]></format>
         </remarks>
@@ -656,7 +656,7 @@
  The following example shows how to capture the mouse to a specific element by using the <xref:System.Windows.Input.Mouse.Capture%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/Capture/Window1.xaml.cs" id="Snippetmousecaptursamplecaptureelement":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/window1.xaml.vb" id="Snippetmousecaptursamplecaptureelement":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/Capture/window1.xaml.vb" id="Snippetmousecaptursamplecaptureelement":::
 
  ]]></format>
         </remarks>
@@ -699,7 +699,7 @@
  The follow example shows how to obtain the element that has mouse capture.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/Capture/Window1.xaml.cs" id="Snippetmousecapturemousecaptured":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseCaptureSample/visualbasic/window1.xaml.vb" id="Snippetmousecapturemousecaptured":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/Capture/window1.xaml.vb" id="Snippetmousecapturemousecaptured":::
 
  ]]></format>
         </remarks>
@@ -833,7 +833,7 @@
  The following example shows how to use <xref:System.Windows.Input.Mouse.GetPosition%2A> to determine the position of the mouse pointer.  The position of the mouse pointer is stored in a <xref:System.Windows.Point> structure.  The <xref:System.Windows.Point.X%2A> and <xref:System.Windows.Point.Y%2A> values of the <xref:System.Windows.Point> object are displayed in a <xref:System.Windows.Controls.TextBox>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/GetPosition/Window1.xaml.cs" id="Snippetmouserelatedsnippetspositionmouse":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml.vb" id="Snippetmouserelatedsnippetspositionmouse":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml.vb" id="Snippetmouserelatedsnippetspositionmouse":::
 
  ]]></format>
         </remarks>
@@ -951,7 +951,7 @@
  The following example shows how to determine whether the left mouse button is pressed by checking if the state of the <xref:System.Windows.Input.Mouse.LeftButton%2A> is equal to the <xref:System.Windows.Input.MouseButtonState> enumeration value <xref:System.Windows.Input.MouseButtonState.Pressed>.  If the button is pressed, a method is called which updates display elements in the sample.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/GetPosition/Window1.xaml.cs" id="Snippetmouserelatedsnippetsgetleftbuttonmouse":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetleftbuttonmouse":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetleftbuttonmouse":::
 
  ]]></format>
         </remarks>
@@ -1069,7 +1069,7 @@
  The following example shows how to determine whether the middle mouse button is pressed by checking if the state of the <xref:System.Windows.Input.Mouse.MiddleButton%2A> is equal to the <xref:System.Windows.Input.MouseButtonState> enumeration value <xref:System.Windows.Input.MouseButtonState.Pressed>.  If the button is pressed, a method is called which updates display elements in the sample.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/GetPosition/Window1.xaml.cs" id="Snippetmouserelatedsnippetsgetmiddlebuttonmouse":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetmiddlebuttonmouse":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetmiddlebuttonmouse":::
 
  ]]></format>
         </remarks>
@@ -1629,7 +1629,7 @@
  The following example shows an event handler for a <xref:System.Windows.Controls.RadioButton> that is used to toggle the scope of a cursor change between a single element and the entire application.  If the control that raised the event is the `rbScopeElement` <xref:System.Windows.Controls.RadioButton>, a flag that denotes the scope of the cursor change is set and <xref:System.Windows.Input.Mouse.OverrideCursor%2A> is set to `null`.  If the control that raised the event is the `rbScopeApplication` <xref:System.Windows.Controls.RadioButton>, a flag that denotes the scope of the cursor change is set and <xref:System.Windows.Input.Mouse.OverrideCursor%2A> is set to the <xref:System.Windows.FrameworkElement.Cursor%2A> property of the <xref:System.Windows.Controls.Border> control named `DisplayArea`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.cs" id="Snippetcursorssampleoverridecursor":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/Window1.xaml.vb" id="Snippetcursorssampleoverridecursor":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.vb" id="Snippetcursorssampleoverridecursor":::
 
  ]]></format>
         </remarks>
@@ -2746,7 +2746,7 @@
  The following example shows how to determine whether the right mouse button is pressed by checking if the state of the <xref:System.Windows.Input.Mouse.RightButton%2A> is equal to the <xref:System.Windows.Input.MouseButtonState> enumeration value <xref:System.Windows.Input.MouseButtonState.Pressed>.  If the button is pressed, a method is called which updates display elements in the sample.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/GetPosition/Window1.xaml.cs" id="Snippetmouserelatedsnippetsgetrightbuttonmouse":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetrightbuttonmouse":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetrightbuttonmouse":::
 
  ]]></format>
         </remarks>
@@ -2889,7 +2889,7 @@
  The following example shows how to determine whether the first extended mouse button is pressed by checking if the state of <xref:System.Windows.Input.Mouse.XButton1%2A> is equal to the <xref:System.Windows.Input.MouseButtonState> enumeration value <xref:System.Windows.Input.MouseButtonState.Pressed>.  If the button is pressed, a method is called which updates display elements in the sample.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/GetPosition/Window1.xaml.cs" id="Snippetmouserelatedsnippetsgetx1buttonmouse":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetx1buttonmouse":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetx1buttonmouse":::
 
  ]]></format>
         </remarks>
@@ -2928,7 +2928,7 @@
  The following example shows how to determine whether the second extended mouse button is pressed by checking if the state of <xref:System.Windows.Input.Mouse.XButton2%2A> is equal to the <xref:System.Windows.Input.MouseButtonState> enumeration value <xref:System.Windows.Input.MouseButtonState.Pressed>.  If the button is pressed, a method is called which updates display elements in the sample.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Mouse/GetPosition/Window1.xaml.cs" id="Snippetmouserelatedsnippetsgetx2buttonmouse":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseRelatedSnippets/visualbasic/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetx2buttonmouse":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Mouse/GetPosition/window1.xaml.vb" id="Snippetmouserelatedsnippetsgetx2buttonmouse":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/MouseAction.xml b/xml/System.Windows.Input/MouseAction.xml
index 749ad0b525c..d6d6b0aa1c4 100644
--- a/xml/System.Windows.Input/MouseAction.xml
+++ b/xml/System.Windows.Input/MouseAction.xml
@@ -47,7 +47,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml" id="Snippetmousebindingmouseactionxaml":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetmousebindingmouseaction":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetmousebindingmouseaction":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetmousebindingmouseaction":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/MouseBinding.xml b/xml/System.Windows.Input/MouseBinding.xml
index 897a8b645a4..f2510bd0d91 100644
--- a/xml/System.Windows.Input/MouseBinding.xml
+++ b/xml/System.Windows.Input/MouseBinding.xml
@@ -40,7 +40,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml" id="Snippetmousebindingmousegesturexaml":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetmousebindingaddedtoinputbinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetmousebindingaddedtoinputbinding":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetmousebindingaddedtoinputbinding":::  
   
  ]]></format>
     </remarks>
@@ -127,7 +127,7 @@
  The following example shows how to bind an <xref:System.Windows.Input.ICommand> with a <xref:System.Windows.Input.MouseGesture> using a <xref:System.Windows.Input.MouseBinding.MouseAction%2A>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetmousebindingaddedcommand":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetmousebindingaddedcommand":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetmousebindingaddedcommand":::  
   
  ]]></format>
         </remarks>
@@ -274,7 +274,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml" id="Snippetmousebindinggesturexaml":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetmousebindinggesture":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetmousebindinggesture":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetmousebindinggesture":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/MouseButton.xml b/xml/System.Windows.Input/MouseButton.xml
index 3c78f0c9b03..e2659c21cdd 100644
--- a/xml/System.Windows.Input/MouseButton.xml
+++ b/xml/System.Windows.Input/MouseButton.xml
@@ -28,7 +28,7 @@
  The following example creates a <xref:System.Windows.Input.Mouse.MouseDown> event handler that uses the <xref:System.Windows.Input.MouseButton> enumeration to determine which button was pressed. Depending on which button was pressed, the background of the control that fired the event is changed.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargschangedbutton":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargschangedbutton":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargschangedbutton":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/MouseButtonEventArgs.xml b/xml/System.Windows.Input/MouseButtonEventArgs.xml
index 6948b1fc872..00d4b0212a7 100644
--- a/xml/System.Windows.Input/MouseButtonEventArgs.xml
+++ b/xml/System.Windows.Input/MouseButtonEventArgs.xml
@@ -36,7 +36,7 @@
  The following example creates a mouse button event handler that changes the color of the object that raised the event.  The color chosen depends on the mouse button which was pressed.  The <xref:System.Windows.Input.MouseButtonEventArgs.ChangedButton%2A> property is checked to determine which button was pressed.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargschangedbutton":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargschangedbutton":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargschangedbutton":::  
   
  ]]></format>
     </remarks>
@@ -172,7 +172,7 @@
  The following example creates a mouse button event handler that changes the color of the object that handles the event.  The color that is chosen depends on whether the mouse button was pressed or released.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsbuttonstatepressed":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsbuttonstatepressed":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsbuttonstatepressed":::  
   
  ]]></format>
         </remarks>
@@ -227,7 +227,7 @@
  The following example creates a mouse button event handler that changes the color of an object depending on the mouse button which was pressed.  The <xref:System.Windows.Input.MouseButtonEventArgs.ChangedButton%2A> property is checked to determine which button was pressed.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargschangedbutton":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargschangedbutton":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargschangedbutton":::  
   
  ]]></format>
         </remarks>
@@ -286,7 +286,7 @@
  The following example creates a <xref:System.Windows.Input.MouseButtonEventHandler> which determines if a single, double, or triple click occurred.  <xref:System.Windows.Input.MouseButtonEventArgs.ClickCount%2A> property is used to determine the number of clicks.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseclickcountdoubleclick":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseclickcountdoubleclick":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseclickcountdoubleclick":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/MouseButtonEventHandler.xml b/xml/System.Windows.Input/MouseButtonEventHandler.xml
index b7949a39f46..41cd9dbd89f 100644
--- a/xml/System.Windows.Input/MouseButtonEventHandler.xml
+++ b/xml/System.Windows.Input/MouseButtonEventHandler.xml
@@ -82,7 +82,7 @@
  The following example creates a <xref:System.Windows.UIElement.MouseDown> event handler that changes the background color of the source of the event.  The background color is determined by which button is pressed.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargschangedbutton":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargschangedbutton":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargschangedbutton":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/MouseButtonState.xml b/xml/System.Windows.Input/MouseButtonState.xml
index 9ff0f500baa..7aba5c7a541 100644
--- a/xml/System.Windows.Input/MouseButtonState.xml
+++ b/xml/System.Windows.Input/MouseButtonState.xml
@@ -33,7 +33,7 @@
  The following example shows a mouse event handler that determines which buttons are currently pressed by checking the button state of each mouse button.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsmousebutton":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsmousebutton":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsmousebutton":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/MouseEventArgs.xml b/xml/System.Windows.Input/MouseEventArgs.xml
index c66a59e745b..3c86b9e93e8 100644
--- a/xml/System.Windows.Input/MouseEventArgs.xml
+++ b/xml/System.Windows.Input/MouseEventArgs.xml
@@ -261,7 +261,7 @@
  The following example prints a message if the state of the <xref:System.Windows.Input.MouseEventArgs.LeftButton%2A> property is <xref:System.Windows.Input.MouseButtonState.Pressed>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsleftbuttondown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsleftbuttondown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsleftbuttondown":::  
   
  ]]></format>
         </remarks>
@@ -304,7 +304,7 @@
  The following example prints a message if the state of the <xref:System.Windows.Input.MouseEventArgs.MiddleButton%2A> property is <xref:System.Windows.Input.MouseButtonState.Pressed>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsmiddlebuttondown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsmiddlebuttondown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsmiddlebuttondown":::  
   
  ]]></format>
         </remarks>
@@ -347,7 +347,7 @@
  The following example gets the <xref:System.Windows.Input.MouseDevice> associated with an input event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsmousedevice":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsmousedevice":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsmousedevice":::  
   
  ]]></format>
         </remarks>
@@ -390,7 +390,7 @@
  The following example prints a message if the state of the <xref:System.Windows.Input.MouseEventArgs.RightButton%2A> property is <xref:System.Windows.Input.MouseButtonState.Pressed>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsrightbuttondown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsrightbuttondown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsrightbuttondown":::  
   
  ]]></format>
         </remarks>
@@ -434,7 +434,7 @@
  The following example shows how to retrieve the <xref:System.Windows.Input.StylusDevice> associated with an event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsstylusdevice":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsstylusdevice":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsstylusdevice":::  
   
  ]]></format>
         </remarks>
@@ -477,7 +477,7 @@
  The following example prints a message if the state of the <xref:System.Windows.Input.MouseEventArgs.XButton1%2A> property is <xref:System.Windows.Input.MouseButtonState.Pressed>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsxbutton1buttondown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsxbutton1buttondown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsxbutton1buttondown":::  
   
  ]]></format>
         </remarks>
@@ -520,7 +520,7 @@
  The following example prints a message if the state of the <xref:System.Windows.Input.MouseEventArgs.XButton2%2A> property is <xref:System.Windows.Input.MouseButtonState.Pressed>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmouseeventargsxbutton2buttondown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmouseeventargsxbutton2buttondown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmouseeventargsxbutton2buttondown":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/MouseGesture.xml b/xml/System.Windows.Input/MouseGesture.xml
index 101c0f67a3e..988d27cf081 100644
--- a/xml/System.Windows.Input/MouseGesture.xml
+++ b/xml/System.Windows.Input/MouseGesture.xml
@@ -71,7 +71,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml" id="Snippetmousebindingmousegesturexaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetmousebindingaddedtoinputbinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetmousebindingaddedtoinputbinding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetmousebindingaddedtoinputbinding":::
 
  ]]></format>
     </remarks>
@@ -248,7 +248,7 @@
  The following example shows how to test whether a <xref:System.Windows.Input.MouseGesture> matches the input associated with an instance of an <xref:System.Windows.Input.InputEventArgs>. A <xref:System.Windows.UIElement.MouseDown> event handler compares the event data with the <xref:System.Windows.Input.MouseGesture> by using the <xref:System.Windows.Input.MouseGesture.Matches%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetkeydownhandlermousegesturematches":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetkeydownhandlermousegesturematches":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetkeydownhandlermousegesturematches":::
 
  ]]></format>
         </remarks>
@@ -311,7 +311,7 @@
  The following example shows to create a <xref:System.Windows.Input.MouseGesture> and associate it with a <xref:System.Windows.Input.RoutedCommand> through a <xref:System.Windows.Input.MouseBinding>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetmousebindingaddedtoinputbinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetmousebindingaddedtoinputbinding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetmousebindingaddedtoinputbinding":::
 
  ]]></format>
         </remarks>
@@ -365,7 +365,7 @@
  The following example shows to create a <xref:System.Windows.Input.MouseGesture> and associate it with a <xref:System.Windows.Input.RoutedCommand> through a <xref:System.Windows.Input.MouseBinding>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetmousebindingaddedtoinputbinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetmousebindingaddedtoinputbinding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetmousebindingaddedtoinputbinding":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/MouseWheelEventArgs.xml b/xml/System.Windows.Input/MouseWheelEventArgs.xml
index 1286ab4c052..ebf39733f84 100644
--- a/xml/System.Windows.Input/MouseWheelEventArgs.xml
+++ b/xml/System.Windows.Input/MouseWheelEventArgs.xml
@@ -50,7 +50,7 @@
  The following example moves a <xref:System.Windows.Controls.TextBox> up if the mouse wheel <xref:System.Windows.Input.MouseWheelEventArgs.Delta%2A> is positive and moves the <xref:System.Windows.Controls.TextBox> down if the mouse wheel <xref:System.Windows.Input.MouseWheelEventArgs.Delta%2A> is negative. The <xref:System.Windows.Controls.TextBox> is attached to a <xref:System.Windows.Controls.Canvas>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmousewheeldelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmousewheeldelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmousewheeldelta":::  
   
  ]]></format>
     </remarks>
@@ -132,7 +132,7 @@
  The following example moves a <xref:System.Windows.Controls.TextBox> up if the mouse wheel <xref:System.Windows.Input.MouseWheelEventArgs.Delta%2A> is positive and moves the <xref:System.Windows.Controls.TextBox> down if the mouse wheel <xref:System.Windows.Input.MouseWheelEventArgs.Delta%2A> is negative. The <xref:System.Windows.Controls.TextBox> is attached to a <xref:System.Windows.Controls.Canvas>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmousewheeldelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmousewheeldelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmousewheeldelta":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/MouseWheelEventHandler.xml b/xml/System.Windows.Input/MouseWheelEventHandler.xml
index 299343039e3..77da7074720 100644
--- a/xml/System.Windows.Input/MouseWheelEventHandler.xml
+++ b/xml/System.Windows.Input/MouseWheelEventHandler.xml
@@ -60,7 +60,7 @@
  The following example moves a <xref:System.Windows.Controls.TextBox>, which is attached to a <xref:System.Windows.Controls.Canvas>, upward if the mouse wheel <xref:System.Windows.Input.MouseWheelEventArgs.Delta%2A> is positive and moves the <xref:System.Windows.Controls.TextBox> downward if the mouse wheel <xref:System.Windows.Input.MouseWheelEventArgs.Delta%2A> is negative.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetmousewheeldelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetmousewheeldelta":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetmousewheeldelta":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/NavigationCommands.xml b/xml/System.Windows.Input/NavigationCommands.xml
index ac02f7423cb..63a0f27ad50 100644
--- a/xml/System.Windows.Input/NavigationCommands.xml
+++ b/xml/System.Windows.Input/NavigationCommands.xml
@@ -271,7 +271,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/NavigationCommands/BrowseBack/BrowseHome.xaml" id="Snippetbrowsehomemarkup4":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/NavigationCommands/BrowseBack/BrowseHome.xaml.cs" id="Snippetbrowsehomecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/browsehome.xaml.vb" id="Snippetbrowsehomecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/browsehome.xaml.vb" id="Snippetbrowsehomecodebehind":::
 
  ]]></format>
         </remarks>
@@ -1244,7 +1244,7 @@
 :::code language="xaml" source="~/snippets/csharp/System.Windows.Input/NavigationCommands/BrowseBack/Search.xaml" id="Snippetsearchmarkup5":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/NavigationCommands/BrowseBack/Search.xaml.cs" id="Snippetsearchcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationCommandsSnippets/visualbasic/search.xaml.vb" id="Snippetsearchcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/NavigationCommands/BrowseHome/search.xaml.vb" id="Snippetsearchcodebehind":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/RoutedCommand.xml b/xml/System.Windows.Input/RoutedCommand.xml
index 926449ac254..9ff52ee00eb 100644
--- a/xml/System.Windows.Input/RoutedCommand.xml
+++ b/xml/System.Windows.Input/RoutedCommand.xml
@@ -266,7 +266,7 @@
  If the <xref:System.Windows.Input.RoutedCommand.CanExecute%2A> method returns `true`, then the control is enabled; otherwise, the control is disable.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/RoutedCommand/CanExecute/CommandSlider.cs" id="Snippetimplementicommandcanexecutechanged":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/commandslider.vb" id="Snippetimplementicommandcanexecutechanged":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/commandslider.vb" id="Snippetimplementicommandcanexecutechanged":::
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
  If the <xref:System.Windows.Input.RoutedCommand.CanExecute%2A> method returns `true`, then the control is enabled; otherwise, the control is disabled.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/RoutedCommand/CanExecute/CommandSlider.cs" id="Snippetimplementicommandcanexecutechanged":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/commandslider.vb" id="Snippetimplementicommandcanexecutechanged":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/commandslider.vb" id="Snippetimplementicommandcanexecutechanged":::
 
  ]]></format>
         </remarks>
@@ -377,7 +377,7 @@
  `this.Command` in this example is the Command property on the <xref:System.Windows.Input.ICommandSource>.  If the command is not null, the command is cast to a <xref:System.Windows.Input.RoutedCommand>.  If it is a <xref:System.Windows.Input.RoutedCommand>, then the <xref:System.Windows.Input.RoutedCommand.Execute%2A> method is called passing the <xref:System.Windows.Input.ICommandSource.CommandTarget%2A> and the <xref:System.Windows.Input.ICommandSource.CommandParameter%2A>.  If the command is not a <xref:System.Windows.Input.RoutedCommand>, it is cast to an <xref:System.Windows.Input.ICommand> and the <xref:System.Windows.Input.ICommand.Execute%2A> method is called passing the <xref:System.Windows.Input.ICommandSource.CommandParameter%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/RoutedCommand/CanExecute/CommandSlider.cs" id="Snippetimplementicommandexecute":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImplementICommandSource/visualbasic/commandslider.vb" id="Snippetimplementicommandexecute":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/RoutedCommand/CanExecute/commandslider.vb" id="Snippetimplementicommandexecute":::
 
  ]]></format>
         </remarks>
@@ -417,7 +417,7 @@
  The following example shows how to add a new <xref:System.Windows.Input.MouseGesture> to a <xref:System.Windows.Input.RoutedCommand>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/InputBinding/.ctor/Window1.xaml.cs" id="Snippetmousebindingaddedcommand":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandLibrarySnippets/visualbasic/window1.xaml.vb" id="Snippetmousebindingaddedcommand":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/InputBinding/.ctor/window1.xaml.vb" id="Snippetmousebindingaddedcommand":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/SpeechMode.xml b/xml/System.Windows.Input/SpeechMode.xml
index a57018d4a80..1e3977650d3 100644
--- a/xml/System.Windows.Input/SpeechMode.xml
+++ b/xml/System.Windows.Input/SpeechMode.xml
@@ -28,7 +28,7 @@
  The following example shows how to specify the speech mode using the <xref:System.Windows.Input.SpeechMode> enumeration.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/ImeSentenceModeValues/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/languageManager/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/ImeSentenceModeValues/Overview/window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/Stylus.xml b/xml/System.Windows.Input/Stylus.xml
index 786085dafd7..2ec3037f473 100644
--- a/xml/System.Windows.Input/Stylus.xml
+++ b/xml/System.Windows.Input/Stylus.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to record the coordinates of the stylus, even if the stylus leaves the bounds of a <xref:System.Windows.Controls.TextBox>. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and that the <xref:System.Windows.Input.Stylus.StylusDown>, <xref:System.Windows.Input.Stylus.StylusUp>, and <xref:System.Windows.Input.Stylus.StylusMove> events are connected to event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -820,7 +820,7 @@
  The following example demonstrates how to record the coordinates of the stylus, even if the stylus leaves the bounds of a <xref:System.Windows.Controls.TextBox>. This example assumes there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and that the <xref:System.Windows.Input.Stylus.StylusDown>, <xref:System.Windows.Input.Stylus.StylusUp>, and <xref:System.Windows.Input.Stylus.StylusMove> events are connected to event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -872,7 +872,7 @@
  The following example demonstrates how to record the coordinates of the stylus, even if the stylus leaves the bounds of a <xref:System.Windows.Controls.TextBox>. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and that the <xref:System.Windows.Input.Stylus.StylusDown>, <xref:System.Windows.Input.Stylus.StylusUp>, and <xref:System.Windows.Input.Stylus.StylusMove> events are connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -910,7 +910,7 @@
  The following example demonstrates how to ensure that the stylus is not captured when the user touches the stylus to the digitizer. This example assumes that the <xref:System.Windows.Input.Stylus.PreviewStylusDown> event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -954,7 +954,7 @@
  The following example demonstrates how to erase the text that is selected with an inverted stylus. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.StylusUpEvent> event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -992,7 +992,7 @@
  The following example demonstrates how to determine which element the stylus is positioned over. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.StylusInAirMove> event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1095,7 +1095,7 @@
  The following example demonstrates how to enable press and hold on a <xref:System.Windows.Controls.Slider>. This example assumes that there is a <xref:System.Windows.Controls.Slider> called `horizontalSlider1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -1237,7 +1237,7 @@
  The following example demonstrates how to change the background color of a <xref:System.Windows.Controls.TextBox> when the <xref:System.Windows.Controls.TextBox> captures and releases stylus events. This example assumes that there is a textbox called `textBox1`, and that the <xref:System.Windows.Input.Stylus.GotStylusCapture> and <xref:System.Windows.Input.Stylus.LostStylusCapture> events are connected to event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1606,7 +1606,7 @@
  The following example demonstrates how to change the background color of a <xref:System.Windows.Controls.TextBox> when the <xref:System.Windows.Controls.TextBox> captures and releases stylus events. This example assumes that there is a textbox called `textBox1`, and that the <xref:System.Windows.Input.Stylus.GotStylusCapture> and <xref:System.Windows.Input.Stylus.LostStylusCapture> events are connected to the event handlers in the example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1681,7 +1681,7 @@
  The following example demonstrates how to determine which button raised the <xref:System.Windows.Input.Stylus.PreviewStylusButtonDown> event. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.PreviewStylusButtonDown> event is connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -1756,7 +1756,7 @@
  The following example demonstrates how to determine which button raised the <xref:System.Windows.Input.Stylus.PreviewStylusButtonUp> event. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.PreviewStylusButtonUp> event is connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -1831,7 +1831,7 @@
  The following example demonstrates how to ensure that the stylus is not captured when the user touches the stylus to the tablet. This example assumes that the <xref:System.Windows.Input.Stylus.PreviewStylusDown> event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1906,7 +1906,7 @@
  The following example demonstrates how to determine which element the stylus is positioned over. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and that the <xref:System.Windows.Input.Stylus.PreviewStylusInAirMove> event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1981,7 +1981,7 @@
  The following example demonstrates how to determine whether the stylus is inverted. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.PreviewStylusInRange> event is connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -2056,7 +2056,7 @@
  The example demonstrates how to determine the position of the stylus when it moves. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.PreviewStylusMove> event is connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -2131,7 +2131,7 @@
  The following example demonstrates how to determine whether the stylus is inverted. This example assumes there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.PreviewStylusOutOfRange> event is connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet20":::
 
  ]]></format>
         </remarks>
@@ -2206,7 +2206,7 @@
  The following example demonstrates how to determine the system gesture that raised the <xref:System.Windows.Input.Stylus.PreviewStylusSystemGesture> event. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.PreviewStylusSystemGesture> event is connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -2281,7 +2281,7 @@
  The following example demonstrates how to determine the position of the stylus when the user lifts it from the tablet. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.PreviewStylusUp> event is connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
@@ -3133,7 +3133,7 @@
  The following example demonstrates how to enable press and hold on a <xref:System.Windows.Controls.Slider>. This example assumes that there is a <xref:System.Windows.Controls.Slider> called `horizontalSlider1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -3273,7 +3273,7 @@
  The following example demonstrates how to show a shortcut menu when the user presses the barrel button on a stylus. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and a <xref:System.Windows.Controls.ContextMenu> called `textBoxContextMenu`, and that the <xref:System.Windows.Input.Stylus.StylusButtonDown> event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3348,7 +3348,7 @@
  The following example demonstrates how to copy the selected text when the user releases the barrel button on a stylus. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and that the <xref:System.Windows.Input.Stylus.StylusButtonUp> event is connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -3423,7 +3423,7 @@
  The following example demonstrates how to record the coordinates of the stylus, even if the stylus leaves the bounds of a <xref:System.Windows.Controls.TextBox>. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and that the <xref:System.Windows.Input.Stylus.StylusDown>, <xref:System.Windows.Input.Stylus.StylusUp>, and <xref:System.Windows.Input.Stylus.StylusMove> events are connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3498,7 +3498,7 @@
  The following example demonstrates how to change the color of a <xref:System.Windows.Controls.Button> when the stylus cursor enters and leaves its bounds. This example assumes that there is a <xref:System.Windows.Controls.Button> called `button1` and that the <xref:System.Windows.Input.Stylus.StylusEnter> and <xref:System.Windows.Input.Stylus.StylusLeave> events are connected to the event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3573,7 +3573,7 @@
  The following example demonstrates how to determine which element the stylus is positioned over. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.StylusInAirMove> event is connected to the event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3648,7 +3648,7 @@
  The following example demonstrates how to set the <xref:System.Windows.Controls.InkCanvas.EditingMode%2A> property of an <xref:System.Windows.Controls.InkCanvas> to <xref:System.Windows.Controls.InkCanvasEditingMode.EraseByStroke> when the stylus is inverted. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1` and that the <xref:System.Windows.Input.Stylus.StylusInRange> event is connected to the event handlers. To see the cursor change, set the <xref:System.Windows.Controls.InkCanvas.UseCustomCursor%2A> property to `true` on `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window2.xaml.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -3723,7 +3723,7 @@
  The following example demonstrates how to change the color of a <xref:System.Windows.Controls.Button> when the stylus cursor enters and leaves its bounds. This example assumes that there is a <xref:System.Windows.Controls.Button> called `button1` and that the <xref:System.Windows.Input.Stylus.StylusEnter> and <xref:System.Windows.Input.Stylus.StylusLeave> events are connected to event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3798,7 +3798,7 @@
  The following example demonstrates how to record the coordinates of the stylus, even if the stylus leaves the bounds of a <xref:System.Windows.Controls.TextBox>. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and that the <xref:System.Windows.Input.Stylus.StylusDown>, <xref:System.Windows.Input.Stylus.StylusUp>, and <xref:System.Windows.Input.Stylus.StylusMove> events are connected to event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3873,7 +3873,7 @@
  The following example demonstrates how to change the cursor to an arrow when the stylus goes out of range. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkCanvas1` and that the <xref:System.Windows.Input.Stylus.StylusOutOfRange> event is connected to an event handler. To see the cursor change, set the <xref:System.Windows.Controls.InkCanvas.UseCustomCursor%2A> property to `true` on `inkCanvas1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window2.xaml.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml.vb" id="Snippet19":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml.vb" id="Snippet19":::
 
  ]]></format>
         </remarks>
@@ -3948,7 +3948,7 @@
  The following example demonstrates how to determine the system gesture that raised the <xref:System.Windows.Input.Stylus.StylusSystemGesture> event. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1` and that the <xref:System.Windows.Input.Stylus.StylusSystemGesture> event is connected to an event handler.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -4023,7 +4023,7 @@
  The following example demonstrates how to record the coordinates of the stylus, even if the stylus leaves the bounds of a <xref:System.Windows.Controls.TextBox>. This example assumes that there is a <xref:System.Windows.Controls.TextBox> called `textBox1`, and that the <xref:System.Windows.Input.Stylus.StylusDown>, <xref:System.Windows.Input.Stylus.StylusUp>, and <xref:System.Windows.Input.Stylus.StylusMove> events are connected to event handlers.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4094,9 +4094,9 @@
  The following example demonstrates how to get the element that is under the cursor. Calling <xref:System.Windows.Input.Stylus.Synchronize%2A> ensures that <xref:System.Windows.Input.Stylus.DirectlyOver%2A> returns the correct element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window2.xaml.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml.vb" id="Snippet24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml.vb" id="Snippet24":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window2.xaml.cs" id="Snippet25":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml.vb" id="Snippet25":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml.vb" id="Snippet25":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusButton.xml b/xml/System.Windows.Input/StylusButton.xml
index 39958bbf8f8..fa39e17f34b 100644
--- a/xml/System.Windows.Input/StylusButton.xml
+++ b/xml/System.Windows.Input/StylusButton.xml
@@ -29,7 +29,7 @@
  The following checks whether the user pressed the barrel button on a stylus.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet24":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet24":::  
   
  ]]></format>
     </remarks>
@@ -78,7 +78,7 @@
  The following checks whether the user pressed the barrel button on a stylus.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet24":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet24":::  
   
  ]]></format>
         </remarks>
@@ -122,7 +122,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusButton.Name%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet25":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet25":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet25":::  
   
  ]]></format>
         </remarks>
@@ -160,7 +160,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusButton.StylusButtonState%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet26":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet26":::  
   
  ]]></format>
         </remarks>
@@ -204,7 +204,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusButton.StylusDevice%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet27":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet27":::  
   
  ]]></format>
         </remarks>
@@ -243,7 +243,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusButton.ToString%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet28":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet28":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusButtonCollection.xml b/xml/System.Windows.Input/StylusButtonCollection.xml
index 9411fb9b398..f69b414b621 100644
--- a/xml/System.Windows.Input/StylusButtonCollection.xml
+++ b/xml/System.Windows.Input/StylusButtonCollection.xml
@@ -32,7 +32,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusButtonCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet14":::  
   
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
  The following example demonstrates how to get the <xref:System.Windows.Input.StylusButtonState> of the `barrel button`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window1.xaml.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window1.xaml.vb" id="Snippet23":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window1.xaml.vb" id="Snippet23":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusButtonState.xml b/xml/System.Windows.Input/StylusButtonState.xml
index f40d6ac7914..0156fce1603 100644
--- a/xml/System.Windows.Input/StylusButtonState.xml
+++ b/xml/System.Windows.Input/StylusButtonState.xml
@@ -28,7 +28,7 @@
  The following example demonstrates how to determine the state of a <xref:System.Windows.Input.StylusButton>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet26":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet26":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/StylusDevice.xml b/xml/System.Windows.Input/StylusDevice.xml
index d84fca7ed39..9e194f10506 100644
--- a/xml/System.Windows.Input/StylusDevice.xml
+++ b/xml/System.Windows.Input/StylusDevice.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to retrieve a reference to the default stylus device.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -73,7 +73,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.ActiveSource%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -131,7 +131,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.Capture%28System.Windows.IInputElement%29> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -180,7 +180,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.Capture%28System.Windows.IInputElement%2CSystem.Windows.Input.CaptureMode%29> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -222,7 +222,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.Captured%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -260,7 +260,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.DirectlyOver%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -308,7 +308,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.GetPosition%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -361,7 +361,7 @@
  The following example demonstrates how to get the <xref:System.Windows.Input.StylusPointCollection> from the <xref:System.Windows.Input.StylusDevice>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -412,7 +412,7 @@
  The following example demonstrates how to get <xref:System.Windows.Input.StylusPoint> objects from the current <xref:System.Windows.Input.StylusDevice>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet26":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet26":::  
   
  ]]></format>
         </remarks>
@@ -452,7 +452,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.Id%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -491,7 +491,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.InAir%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -530,7 +530,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.InRange%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -569,7 +569,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.Inverted%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet12":::  
   
  ]]></format>
         </remarks>
@@ -635,7 +635,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.Name%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet13":::  
   
  ]]></format>
         </remarks>
@@ -673,7 +673,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.StylusButtons%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet14":::  
   
  ]]></format>
         </remarks>
@@ -722,9 +722,9 @@
  The following example demonstrates how to return an element that is under the cursor.  Calling <xref:System.Windows.Input.StylusDevice.Synchronize%2A> ensures that <xref:System.Windows.Input.StylusDevice.DirectlyOver%2A> returns the correct element.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window2.xaml.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml.vb" id="Snippet24":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml.vb" id="Snippet24":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Stylus/Overview/Window2.xaml.cs" id="Snippet26":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSamples/VisualBasic/Window2.xaml.vb" id="Snippet26":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Stylus/Overview/Window2.xaml.vb" id="Snippet26":::  
   
  ]]></format>
         </remarks>
@@ -768,7 +768,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.TabletDevice%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet15":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet15":::  
   
  ]]></format>
         </remarks>
@@ -806,7 +806,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.Target%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet16":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet16":::  
   
  ]]></format>
         </remarks>
@@ -845,7 +845,7 @@
  The following example demonstrates the <xref:System.Windows.Input.StylusDevice.ToString%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet17":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet17":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusDeviceCollection.xml b/xml/System.Windows.Input/StylusDeviceCollection.xml
index 5dddd03647f..1f18bc0b61a 100644
--- a/xml/System.Windows.Input/StylusDeviceCollection.xml
+++ b/xml/System.Windows.Input/StylusDeviceCollection.xml
@@ -32,7 +32,7 @@
  The following example demonstrates how to access the <xref:System.Windows.Input.StylusDevice> objects.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet11":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/StylusEventHandler.xml b/xml/System.Windows.Input/StylusEventHandler.xml
index 6d55b6b198c..00fe141b935 100644
--- a/xml/System.Windows.Input/StylusEventHandler.xml
+++ b/xml/System.Windows.Input/StylusEventHandler.xml
@@ -37,7 +37,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Input.StylusEventHandler> delegate to designate a handler for the <xref:System.Windows.Input.Stylus.StylusDown> event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusButton/Overview/Window1.xaml.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusSnippets/VisualBasic/Window1.xaml.vb" id="Snippet18":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusButton/Overview/Window1.xaml.vb" id="Snippet18":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/StylusPoint.xml b/xml/System.Windows.Input/StylusPoint.xml
index 3d52d6dfe38..81fddb95a65 100644
--- a/xml/System.Windows.Input/StylusPoint.xml
+++ b/xml/System.Windows.Input/StylusPoint.xml
@@ -38,9 +38,9 @@
  The following example gets property names and values for each <xref:System.Windows.Input.StylusPoint> in a <xref:System.Windows.Input.StylusPointCollection>. This example assumes that there is a <xref:System.Windows.Controls.TextBlock> called `packetOutput`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet3":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -89,7 +89,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Input.StylusPoint>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -142,7 +142,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Input.StylusPoint>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -196,7 +196,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Input.StylusPoint>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -247,9 +247,9 @@
  The following example uses the <xref:System.Windows.Input.StylusPoint.Description%2A> property to get property values from <xref:System.Windows.Input.StylusPoint> in a <xref:System.Windows.Input.StylusPointCollection>. This example assumes that there is a <xref:System.Windows.Controls.TextBlock> called `packetOutput`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet3":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -301,9 +301,9 @@
  The following example checks two <xref:System.Windows.Input.StylusPoint> objects for equality. Because the <xref:System.Windows.Input.StylusPoint.X%2A>, <xref:System.Windows.Input.StylusPoint.Y%2A>, and <xref:System.Windows.Input.StylusPoint.PressureFactor%2A> properties on `point1` and `point2` are set to the same value, the "The two StylusPoint objects are equal." Message appears.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet6":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet7":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -349,9 +349,9 @@
  The following example checks two <xref:System.Windows.Input.StylusPoint> objects for equality. Because the <xref:System.Windows.Input.StylusPoint.X%2A>, <xref:System.Windows.Input.StylusPoint.Y%2A>, and <xref:System.Windows.Input.StylusPoint.PressureFactor%2A> properties on `point1` and `point2` are set to the same value, the "The two StylusPoint objects are equal." Message appears.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet6":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet7":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -396,9 +396,9 @@
  The following example checks two <xref:System.Windows.Input.StylusPoint> objects for equality. Because the <xref:System.Windows.Input.StylusPoint.X%2A>, <xref:System.Windows.Input.StylusPoint.Y%2A>, and <xref:System.Windows.Input.StylusPoint.PressureFactor%2A> properties on `point1` and `point2` are set to the same value, the "The two StylusPoint objects are equal." Message appears.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet6":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet8":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet8":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -475,7 +475,7 @@
  The following example checks for the existence of a stylus point property before getting the property's value. This example assumes that there is a <xref:System.Windows.Input.StylusPoint> called `point`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -525,7 +525,7 @@
  The following example checks for the existence of a stylus point property before getting the property's value. This example assumes that there is a <xref:System.Windows.Input.StylusPoint> called `point`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -562,7 +562,7 @@
  The following example ensures that the <xref:System.Windows.Input.StylusPoint.X%2A> property of the <xref:System.Windows.Input.StylusPoint> is set to a legal value.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet14":::  
   
  ]]></format>
         </remarks>
@@ -599,7 +599,7 @@
  The following example ensures that the <xref:System.Windows.Input.StylusPoint.X%2A> property of the <xref:System.Windows.Input.StylusPoint> is set to a legal value.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet14":::  
   
  ]]></format>
         </remarks>
@@ -650,9 +650,9 @@
  The following example checks two <xref:System.Windows.Input.StylusPoint> objects for equality. Because the <xref:System.Windows.Input.StylusPoint.X%2A>, <xref:System.Windows.Input.StylusPoint.Y%2A>, and <xref:System.Windows.Input.StylusPoint.PressureFactor%2A> properties on `point1` and `point2` are set to the same value, the "The two StylusPoint objects are equal." Message appears.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet6":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet9":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet9":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -691,7 +691,7 @@
           <format type="text/markdown"><![CDATA[The following example demonstrates how to cast a <xref:System.Windows.Input.StylusPoint> to a <xref:System.Windows.Point> object to draw a circle at the beginning of every stroke. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> object called `inkcanvas1` and that the <xref:System.Windows.UIElement.StylusDown> event is connected to the event handler in the example.
 
            :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet13":::
-           :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet13":::  
+           :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet13":::  
 
            ]]></format>
         </remarks>
@@ -736,9 +736,9 @@
  The following example demonstrates how to check two <xref:System.Windows.Input.StylusPoint> objects for inequality. Because the <xref:System.Windows.Input.StylusPoint.X%2A>, <xref:System.Windows.Input.StylusPoint.Y%2A>, and <xref:System.Windows.Input.StylusPoint.PressureFactor%2A> properties on `point1` and `point2` are set to the same value, the "The two StylusPoint objects are equal." Message appears.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet6":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet10":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet10":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -781,9 +781,9 @@
  The following example uses the <xref:System.Windows.Input.StylusPoint.PressureFactor%2A> property to retrieve and display the pressure value for each <xref:System.Windows.Input.StylusPoint> in a <xref:System.Windows.Input.StylusPointCollection> called `points`. This example assumes that there is a <xref:System.Windows.Controls.TextBlock> called `packetOutput`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet3":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -838,7 +838,7 @@
  The following example checks for the existence of a stylus point property before setting the property's value. This example assumes that there is a <xref:System.Windows.Input.StylusPoint> called `point`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet12":::  
   
  ]]></format>
         </remarks>
@@ -913,9 +913,9 @@
  The following example gets the <xref:System.Windows.Input.StylusPoint.X%2A> property for each <xref:System.Windows.Input.StylusPoint> in a <xref:System.Windows.Input.StylusPointCollection>. This example assumes that there is a <xref:System.Windows.Controls.TextBlock> called `packetOutput`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet3":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -959,9 +959,9 @@
  The following example gets the <xref:System.Windows.Input.StylusPoint.Y%2A> property for each <xref:System.Windows.Input.StylusPoint> in a <xref:System.Windows.Input.StylusPointCollection>. This example assumes that there is a <xref:System.Windows.Controls.TextBlock> called `packetOutput`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet3":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusPointCollection.xml b/xml/System.Windows.Input/StylusPointCollection.xml
index ccb98daacc3..1599c1dc77a 100644
--- a/xml/System.Windows.Input/StylusPointCollection.xml
+++ b/xml/System.Windows.Input/StylusPointCollection.xml
@@ -37,7 +37,7 @@
  The following example overrides the <xref:System.Windows.Ink.Stroke.DrawCore%2A?displayProperty=nameWithType> method to draw a circle at each <xref:System.Windows.Input.StylusPoint> comprising a <xref:System.Windows.Ink.Stroke>. If the <xref:System.Windows.Ink.DrawingAttributes.FitToCurve%2A> property is set to `true`, the <xref:System.Windows.Ink.Stroke.GetBezierStylusPoints%2A> method returns the stylus points. Otherwise, the <xref:System.Windows.Ink.Stroke.StylusPoints%2A> property returns the stylus points.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyStroke.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyStroke.vb" id="Snippet23":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyStroke.vb" id="Snippet23":::  
   
  ]]></format>
     </remarks>
@@ -80,7 +80,7 @@
  The following example collects <xref:System.Windows.Input.StylusPoint> objects in the <xref:System.Windows.UIElement.OnStylusDown%2A> method of a custom control. The example creates a <xref:System.Windows.Input.StylusPointCollection> by specifying the <xref:System.Windows.Input.StylusPointDescription> and the initial size of the <xref:System.Windows.Input.StylusPointCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet19":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet19":::  
   
  ]]></format>
         </remarks>
@@ -118,7 +118,7 @@
  The following example creates a <xref:System.Windows.Input.StylusPointCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet28":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet28":::  
   
  ]]></format>
         </remarks>
@@ -163,7 +163,7 @@
  The following example creates a <xref:System.Windows.Input.StylusPointCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet20":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet20":::  
   
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
  The following example collects <xref:System.Windows.Input.StylusPoint> objects in the <xref:System.Windows.UIElement.OnStylusDown%2A> method of a custom control. The example creates a <xref:System.Windows.Input.StylusPointCollection> by specifying both the <xref:System.Windows.Input.StylusPointDescription> and the initial size of the <xref:System.Windows.Input.StylusPointCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet19":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet19":::  
   
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
  The following example collects <xref:System.Windows.Input.StylusPoint> objects in the <xref:System.Windows.UIElement.OnStylusDown%2A> method of a custom control. The example creates a <xref:System.Windows.Input.StylusPointCollection> by specifying the <xref:System.Windows.Input.StylusPointDescription> and the initial size of the <xref:System.Windows.Input.StylusPointCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet19":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet19":::  
   
  ]]></format>
         </remarks>
@@ -301,7 +301,7 @@
  The following example collects <xref:System.Windows.Input.StylusPoint> objects in the <xref:System.Windows.UIElement.OnStylusDown%2A> method of a custom control. The example creates a <xref:System.Windows.Input.StylusPointCollection> by specifying the <xref:System.Windows.Input.StylusPointDescription> and the initial size of the <xref:System.Windows.Input.StylusPointCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet19":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet19":::  
   
  ]]></format>
         </remarks>
@@ -346,7 +346,7 @@
  The following example collects <xref:System.Windows.Input.StylusPoint> objects in the <xref:System.Windows.UIElement.OnStylusDown%2A> method of a custom control.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet19":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet19":::  
   
  ]]></format>
         </remarks>
@@ -387,7 +387,7 @@
  The following example demonstrates how to handle the <xref:System.Windows.Input.StylusPointCollection.Changed> event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Ink/Stroke/.ctor/MyBorder.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeSnippets/VisualBasic/MyBorder.vb" id="Snippet27":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Ink/Stroke/.ctor/MyBorder.vb" id="Snippet27":::  
   
  ]]></format>
         </remarks>
@@ -455,7 +455,7 @@
  The following example demonstrates how to copy a <xref:System.Windows.Input.StylusPointCollection>. The example creates a stroke comprised of members of the <xref:System.Windows.Input.StylusPointCollection> and adds them to an <xref:System.Windows.Controls.InkCanvas>. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkcanvs1`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet18":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet18":::  
   
  ]]></format>
         </remarks>
@@ -493,9 +493,9 @@
  The following example gets the <xref:System.Windows.Input.StylusPointDescription> for a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -602,7 +602,7 @@
  The following example demonstrates how to erase the strokes that are surrounded by a lasso. The example assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StrokeCollectionMethods/VisualBasic/StrokeCollectionDemo.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/InkPresenter/DetachVisuals/StrokeCollectionDemo.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -654,7 +654,7 @@
  The following example demonstrates how to create a new <xref:System.Windows.Input.StylusPointCollection> that uses a different <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet17":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet17":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusPointDescription.xml b/xml/System.Windows.Input/StylusPointDescription.xml
index 4e0981d04af..dc956b9da38 100644
--- a/xml/System.Windows.Input/StylusPointDescription.xml
+++ b/xml/System.Windows.Input/StylusPointDescription.xml
@@ -36,9 +36,9 @@
  The following example gets the <xref:System.Windows.Input.StylusPointDescription> for a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -86,7 +86,7 @@
  The following example creates a <xref:System.Windows.Input.StylusPointDescription> object and uses it to create a <xref:System.Windows.Input.StylusPoint>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -129,7 +129,7 @@
  The following example creates an <xref:System.Windows.Input.StylusPointDescription> object and uses it to create a <xref:System.Windows.Input.StylusPoint>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -179,9 +179,9 @@
  The following example checks whether two <xref:System.Windows.Input.StylusPointDescription> objects are compatible.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet22":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet22":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet23":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet23":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet23":::  
   
  ]]></format>
         </remarks>
@@ -230,7 +230,7 @@
 The following example demonstrates how to find the common <xref:System.Windows.Input.StylusPointDescription> from two different <xref:System.Windows.Input.StylusPointDescription> objects.
 
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet26":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet26":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet26":::  
   
  ]]></format>
         </remarks>
@@ -272,7 +272,7 @@ The following example demonstrates how to find the common <xref:System.Windows.I
  The following example demonstrates how to get the information about a property from a <xref:System.Windows.Input.StylusPointDescription>. This example assumes that the <xref:System.Windows.UIElement.StylusMove> event has been connected to the event handler below.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet21":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet21":::  
   
  ]]></format>
         </remarks>
@@ -311,9 +311,9 @@ The following example demonstrates how to find the common <xref:System.Windows.I
  The following example gets the <xref:System.Windows.Input.StylusPointDescription> for a <xref:System.Windows.Input.StylusPointCollection> together with the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -356,7 +356,7 @@ The following example demonstrates how to find the common <xref:System.Windows.I
  The following example demonstrates how to get the information about a property from a <xref:System.Windows.Input.StylusPointDescription>. This example assumes that the <xref:System.Windows.UIElement.StylusMove> event has been connected to the event handler.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet21":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet21":::  
   
  ]]></format>
         </remarks>
@@ -399,9 +399,9 @@ The following example demonstrates how to find the common <xref:System.Windows.I
  The following example checks whether `description2` is a subset of `description1`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet22":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet22":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet24":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet24":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet24":::  
   
  ]]></format>
         </remarks>
@@ -439,9 +439,9 @@ The following example demonstrates how to find the common <xref:System.Windows.I
  The following example demonstrates how to get the properties of each <xref:System.Windows.Input.StylusPoint> in a <xref:System.Windows.Input.StylusPointCollection>. This example assumes there is a <xref:System.Windows.Controls.TextBlock> called `packetOutput`.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet3":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusPointProperties.xml b/xml/System.Windows.Input/StylusPointProperties.xml
index 089bb10c625..a6d385dbd89 100644
--- a/xml/System.Windows.Input/StylusPointProperties.xml
+++ b/xml/System.Windows.Input/StylusPointProperties.xml
@@ -34,7 +34,7 @@
  The following example demonstrates how to create a <xref:System.Windows.Input.StylusPointDescription> using the <xref:System.Windows.Input.StylusPointProperties> fields.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet5":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/StylusPointProperty.xml b/xml/System.Windows.Input/StylusPointProperty.xml
index a11f7c45600..32efdd9d7ad 100644
--- a/xml/System.Windows.Input/StylusPointProperty.xml
+++ b/xml/System.Windows.Input/StylusPointProperty.xml
@@ -34,9 +34,9 @@
  The following example creates the <xref:System.Windows.Input.StylusPointDescription> object from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -114,7 +114,7 @@
  The following example demonstrates how to create a new <xref:System.Windows.Input.StylusPointProperty>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet25":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet25":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet25":::  
   
  ]]></format>
         </remarks>
@@ -158,9 +158,9 @@
  The following example creates the <xref:System.Windows.Input.StylusPointDescription> from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -205,9 +205,9 @@
  The following example creates the <xref:System.Windows.Input.StylusPointDescription> object from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusPointPropertyInfo.xml b/xml/System.Windows.Input/StylusPointPropertyInfo.xml
index bcf007fa8c0..3354f897732 100644
--- a/xml/System.Windows.Input/StylusPointPropertyInfo.xml
+++ b/xml/System.Windows.Input/StylusPointPropertyInfo.xml
@@ -34,9 +34,9 @@
  The following example creates an <xref:System.Windows.Input.StylusPointDescription> object from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -83,7 +83,7 @@
  The following example demonstrates how to create a new <xref:System.Windows.Input.StylusPointPropertyInfo>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet16":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet16":::  
   
  ]]></format>
         </remarks>
@@ -129,7 +129,7 @@
  The following example demonstrates how to create a new <xref:System.Windows.Input.StylusPointPropertyInfo>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet16":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet16":::  
   
  ]]></format>
         </remarks>
@@ -173,9 +173,9 @@
  The following example creates an <xref:System.Windows.Input.StylusPointDescription> object from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -219,9 +219,9 @@
  The following example creates a <xref:System.Windows.Input.StylusPointDescription> object from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -270,9 +270,9 @@
  The following example creates a <xref:System.Windows.Input.StylusPointDescription> object from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -316,9 +316,9 @@
  The following example creates a <xref:System.Windows.Input.StylusPointDescription> object from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/StylusPointPropertyUnit.xml b/xml/System.Windows.Input/StylusPointPropertyUnit.xml
index 3323229e35c..af01ad83f5e 100644
--- a/xml/System.Windows.Input/StylusPointPropertyUnit.xml
+++ b/xml/System.Windows.Input/StylusPointPropertyUnit.xml
@@ -28,9 +28,9 @@
  The following example creates an <xref:System.Windows.Input.StylusPointDescription> object from a <xref:System.Windows.Input.StylusPointCollection> and gets the information for each <xref:System.Windows.Input.StylusPointPropertyInfo> in the <xref:System.Windows.Input.StylusPointDescription>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet2":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/SystemGesture.xml b/xml/System.Windows.Input/SystemGesture.xml
index 076f2aae315..1e4d7f7538e 100644
--- a/xml/System.Windows.Input/SystemGesture.xml
+++ b/xml/System.Windows.Input/SystemGesture.xml
@@ -33,7 +33,7 @@
  The following example determines which type of system gesture raised the <xref:System.Windows.Input.SystemGesture> event. This example assumes that there is an <xref:System.Windows.Controls.InkCanvas> called `inkcanvas1`, and that <xref:System.Windows.Input.SystemGesture> is connected to the following event handler.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet15":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet15":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/Tablet.xml b/xml/System.Windows.Input/Tablet.xml
index c1752a9ac67..06f704d7d88 100644
--- a/xml/System.Windows.Input/Tablet.xml
+++ b/xml/System.Windows.Input/Tablet.xml
@@ -62,7 +62,7 @@
  The following example demonstrates the <xref:System.Windows.Input.TabletDevice> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -106,7 +106,7 @@
  The following example demonstrates the <xref:System.Windows.Input.TabletDeviceCollection> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet15":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet15":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/TabletDevice.xml b/xml/System.Windows.Input/TabletDevice.xml
index 970029b24cb..eab0b6fd434 100644
--- a/xml/System.Windows.Input/TabletDevice.xml
+++ b/xml/System.Windows.Input/TabletDevice.xml
@@ -29,7 +29,7 @@
  The following example demonstrates how to get the properties that a <xref:System.Windows.Input.TabletDevice> supports.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet27":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet27":::  
   
  ]]></format>
     </remarks>
@@ -73,7 +73,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice.ActiveSource%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -111,7 +111,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice.Id%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -149,7 +149,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice.Name%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice.ProductId%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -230,7 +230,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice.StylusDevices%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@
  The following example demonstrates how to get the properties that a <xref:System.Windows.Input.TabletDevice> supports.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PacketSpy/VisualBasic/Window1.xaml.vb" id="Snippet27":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDevice/GetStylusPoints/Window1.xaml.vb" id="Snippet27":::  
   
  ]]></format>
         </remarks>
@@ -306,7 +306,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice.TabletHardwareCapabilities%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -344,7 +344,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice.Target%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet13":::  
   
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet14":::  
   
  ]]></format>
         </remarks>
@@ -421,7 +421,7 @@
  The following code example demonstrates the <xref:System.Windows.Input.TabletDevice.Type%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/TabletDeviceCollection.xml b/xml/System.Windows.Input/TabletDeviceCollection.xml
index d0a7502ebcf..5bfb434e954 100644
--- a/xml/System.Windows.Input/TabletDeviceCollection.xml
+++ b/xml/System.Windows.Input/TabletDeviceCollection.xml
@@ -36,7 +36,7 @@
  The following example demonstrates the <xref:System.Windows.Input.TabletDeviceCollection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet15":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet15":::  
   
  ]]></format>
     </remarks>
@@ -102,7 +102,7 @@
  The following example demonstrates the <xref:System.Windows.Input.TabletDeviceCollection.CopyTo%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet18":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet18":::  
   
  ]]></format>
         </remarks>
@@ -146,7 +146,7 @@
  The following example demonstrates the <xref:System.Windows.Input.TabletDeviceCollection.Count%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet16":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet16":::  
   
  ]]></format>
         </remarks>
@@ -188,7 +188,7 @@
  The following example demonstrates the <xref:System.Windows.Input.TabletDeviceCollection.IsSynchronized%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet17":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet17":::  
   
  ]]></format>
         </remarks>
@@ -230,7 +230,7 @@
  The following example demonstrates the <xref:System.Windows.Input.TabletDeviceCollection.Item%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet19":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet19":::  
   
  ]]></format>
         </remarks>
@@ -272,7 +272,7 @@
  The following example demonstrates the <xref:System.Windows.Input.TabletDeviceCollection.SyncRoot%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet17":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet17":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/TabletDeviceType.xml b/xml/System.Windows.Input/TabletDeviceType.xml
index 12c90faf332..dfc153d3eb1 100644
--- a/xml/System.Windows.Input/TabletDeviceType.xml
+++ b/xml/System.Windows.Input/TabletDeviceType.xml
@@ -28,7 +28,7 @@
  The following example demonstrates how to determine the type of tablet device.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/TabletHardwareCapabilities.xml b/xml/System.Windows.Input/TabletHardwareCapabilities.xml
index c0d32088e95..526bb19b730 100644
--- a/xml/System.Windows.Input/TabletHardwareCapabilities.xml
+++ b/xml/System.Windows.Input/TabletHardwareCapabilities.xml
@@ -44,7 +44,7 @@
  The following example demonstrates how to determine the hardware capabilities of a tablet device.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HwCaps/VisualBasic/Window1.xaml.vb" id="Snippet26":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/StylusDeviceCollection/Overview/Window1.xaml.vb" id="Snippet26":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Input/Touch.xml b/xml/System.Windows.Input/Touch.xml
index 4bf90d56638..85d0e55a4f2 100644
--- a/xml/System.Windows.Input/Touch.xml
+++ b/xml/System.Windows.Input/Touch.xml
@@ -43,7 +43,7 @@
  The following code handles the <xref:System.Windows.Input.Touch.FrameReported> event. When a touch presses on the <xref:System.Windows.Controls.Canvas>, the <xref:System.Windows.Input.TouchDevice> is captured to the <xref:System.Windows.Controls.Canvas>. When the touch is lifted, the <xref:System.Windows.Input.TouchDevice> is released. When a touch moves across the <xref:System.Windows.Controls.Canvas>, the <xref:System.Windows.Input.TouchDevice.Id%2A> is checked. If the move came from the first touch, its location is recorded. If the move came from the second touch, a line is drawn from the position of the first touch to the position of the second touch.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Touch/Overview/mainwindow.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml.vb" id="Snippet100":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml.vb" id="Snippet100":::  
   
  ]]></format>
     </remarks>
@@ -89,7 +89,7 @@
  This example is part of a larger example that is available in the <xref:System.Windows.Input.Touch> class overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Touch/Overview/mainwindow.xaml.cs" id="Snippet110":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml.vb" id="Snippet110":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml.vb" id="Snippet110":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/TouchDevice.xml b/xml/System.Windows.Input/TouchDevice.xml
index 611455ae872..6aa162608b3 100644
--- a/xml/System.Windows.Input/TouchDevice.xml
+++ b/xml/System.Windows.Input/TouchDevice.xml
@@ -46,7 +46,7 @@
  The following code handles the touch events. When a touch is pressed on the <xref:System.Windows.Controls.Canvas>, the <xref:System.Windows.Input.TouchDevice> is captured to the <xref:System.Windows.Controls.Canvas>. When the touch is lifted, the <xref:System.Windows.Input.TouchDevice> is released. When a touch moves on the <xref:System.Windows.Controls.Canvas>, the <xref:System.Windows.Input.TouchDevice.Id%2A> is checked. If the move came from the first touch, its location is recorded. If the move came from the second touch, a line is drawn from the position of the first touch to the position of the second touch.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml.vb" id="Snippet100":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.vb" id="Snippet100":::
 
  ]]></format>
     </remarks>
@@ -239,7 +239,7 @@
  This example is part of a larger example that is available in the <xref:System.Windows.Input.TouchDevice> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.cs" id="Snippet110":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml.vb" id="Snippet110":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.vb" id="Snippet110":::
 
  ]]></format>
         </remarks>
@@ -329,7 +329,7 @@
  This example is part of a larger example that is available in the <xref:System.Windows.Input.TouchDevice> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.cs" id="Snippet130":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml.vb" id="Snippet130":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.vb" id="Snippet130":::
 
  ]]></format>
         </remarks>
@@ -575,7 +575,7 @@
  This example is part of a larger example available in the <xref:System.Windows.Input.TouchDevice> class overview.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.cs" id="Snippet120":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml.vb" id="Snippet120":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.vb" id="Snippet120":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/TouchEventArgs.xml b/xml/System.Windows.Input/TouchEventArgs.xml
index 1c332158987..1e73d568e7a 100644
--- a/xml/System.Windows.Input/TouchEventArgs.xml
+++ b/xml/System.Windows.Input/TouchEventArgs.xml
@@ -65,7 +65,7 @@
  This example is part of a larger example that is available in the <xref:System.Windows.Input.TouchDevice> class overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.cs" id="Snippet130":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml.vb" id="Snippet130":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.vb" id="Snippet130":::  
   
  ]]></format>
     </remarks>
@@ -240,7 +240,7 @@
  This example is part of a larger example that is available in the <xref:System.Windows.Input.TouchDevice> class overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.cs" id="Snippet130":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/toucheventssample/vb/mainwindow.xaml.vb" id="Snippet130":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/TouchDevice/Overview/mainwindow.xaml.vb" id="Snippet130":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/TouchFrameEventArgs.xml b/xml/System.Windows.Input/TouchFrameEventArgs.xml
index a7beae72fc6..67d5f2c2e6a 100644
--- a/xml/System.Windows.Input/TouchFrameEventArgs.xml
+++ b/xml/System.Windows.Input/TouchFrameEventArgs.xml
@@ -37,7 +37,7 @@
  This example is part of a larger example that is available in the <xref:System.Windows.Input.Touch> class overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Touch/Overview/mainwindow.xaml.cs" id="Snippet110":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml.vb" id="Snippet110":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml.vb" id="Snippet110":::  
   
  ]]></format>
     </remarks>
@@ -85,7 +85,7 @@
  This example is part of a larger example that is available in the <xref:System.Windows.Input.Touch> class overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Touch/Overview/mainwindow.xaml.cs" id="Snippet120":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml.vb" id="Snippet120":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml.vb" id="Snippet120":::  
   
  ]]></format>
         </remarks>
@@ -128,7 +128,7 @@
  This example is part of a larger example that is available in the <xref:System.Windows.Input.Touch> class overview.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/Touch/Overview/mainwindow.xaml.cs" id="Snippet120":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/touchframesample/vb/mainwindow.xaml.vb" id="Snippet120":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/Touch/Overview/mainwindow.xaml.vb" id="Snippet120":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Input/TraversalRequest.xml b/xml/System.Windows.Input/TraversalRequest.xml
index 9214f588fd5..ea8502701c4 100644
--- a/xml/System.Windows.Input/TraversalRequest.xml
+++ b/xml/System.Windows.Input/TraversalRequest.xml
@@ -47,7 +47,7 @@
  The following example creates a <xref:System.Windows.Input.TraversalRequest> instance as input for a <xref:System.Windows.FrameworkElement.MoveFocus%2A?displayProperty=nameWithType> call.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/MoveFocus/Window1.xaml.cs" id="Snippetfocussamplemovefocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml.vb" id="Snippetfocussamplemovefocus":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml.vb" id="Snippetfocussamplemovefocus":::  
   
  ]]></format>
     </remarks>
@@ -86,7 +86,7 @@
  The following example creates a <xref:System.Windows.Input.TraversalRequest> instance as input for a <xref:System.Windows.FrameworkElement.MoveFocus%2A?displayProperty=nameWithType> call.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/MoveFocus/Window1.xaml.cs" id="Snippetfocussamplemovefocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml.vb" id="Snippetfocussamplemovefocus":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml.vb" id="Snippetfocussamplemovefocus":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Interop/BrowserInteropHelper.xml b/xml/System.Windows.Interop/BrowserInteropHelper.xml
index 168654e6ca0..ab33020a7b2 100644
--- a/xml/System.Windows.Interop/BrowserInteropHelper.xml
+++ b/xml/System.Windows.Interop/BrowserInteropHelper.xml
@@ -111,7 +111,7 @@
   
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Interop/BrowserInteropHelper/HostScript/page1.xaml" id="Snippet1":::  
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Interop/BrowserInteropHelper/HostScript/page1.xaml.cs" id="Snippet10":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/xbapbrowserinterop/vb/page1.xaml.vb" id="Snippet10":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/HostScript/page1.xaml.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -155,7 +155,7 @@
  The following example demonstrates how to use <xref:System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted%2A?displayProperty=nameWithType> to determine if a <xref:System.Windows.Controls.Page> is hosted in a browser.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/Page1.xaml.cs" id="Snippetisbrowserhostedcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTOBrowserInteropHelperSnippets/visualbasic/page1.xaml.vb" id="Snippetisbrowserhostedcode":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Interop/BrowserInteropHelper/IsBrowserHosted/page1.xaml.vb" id="Snippetisbrowserhostedcode":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Interop/WindowInteropHelper.xml b/xml/System.Windows.Interop/WindowInteropHelper.xml
index c6ece14de6e..9cc86723b06 100644
--- a/xml/System.Windows.Interop/WindowInteropHelper.xml
+++ b/xml/System.Windows.Interop/WindowInteropHelper.xml
@@ -33,7 +33,7 @@
  An example scenario is if you need to host a WPF dialog box in a Win32 application. Initialize the <xref:System.Windows.Interop.WindowInteropHelper> with a WPF window object for the dialog box. You can then get the WPF window's handle (HWND) from the <xref:System.Windows.Interop.WindowInteropHelper.Handle%2A> property and specify the owner for the WPF window with the <xref:System.Windows.Interop.WindowInteropHelper.Owner%2A> property. The following code example shows how to use <xref:System.Windows.Interop.WindowInteropHelper> when hosting a WPF dialog box in a Win32 application.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetwindowinterophelper":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetwindowinterophelper":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetwindowinterophelper":::  
   
  Another scenario supported by this class is to obtain a <xref:System.Windows.Interop.HwndSource> object from a WPF <xref:System.Windows.Window> object. The <xref:System.Windows.Interop.HwndSource> enables direct processing of Win32 messages through the <xref:System.Windows.Interop.HwndSource.AddHook%2A> method. By using <xref:System.Windows.Interop.HwndSource> and <xref:System.Windows.Interop.HwndSource.AddHook%2A> in place of a <xref:System.Windows.Window> you can still handle messages that have no equivalent or handling in WPF. Create a <xref:System.Windows.Interop.WindowInteropHelper> with the <xref:System.Windows.Window> source, then call <xref:System.Windows.Interop.WindowInteropHelper.Handle%2A> on the <xref:System.Windows.Interop.WindowInteropHelper> to get from HWND to <xref:System.Windows.Interop.HwndSource>.  
   
diff --git a/xml/System.Windows.Markup/ContentPropertyAttribute.xml b/xml/System.Windows.Markup/ContentPropertyAttribute.xml
index faf08e69056..d9f65efa720 100644
--- a/xml/System.Windows.Markup/ContentPropertyAttribute.xml
+++ b/xml/System.Windows.Markup/ContentPropertyAttribute.xml
@@ -63,7 +63,7 @@
  The following example creates a class named `Film` that has a <xref:System.Windows.Markup.ContentPropertyAttribute> applied.  The property named `Title` is indicated as the content property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/FocusManager/FocusedElement/Window1.xaml.cs" id="Snippetmarkupcontentpropertyattribute":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MarkupSnippets/visualbasic/window1.xaml.vb" id="Snippetmarkupcontentpropertyattribute":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/KeyboardNavigation/Overview/window1.xaml.vb" id="Snippetmarkupcontentpropertyattribute":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Markup/XamlReader.xml b/xml/System.Windows.Markup/XamlReader.xml
index 0e3e46886a4..35d78becd5d 100644
--- a/xml/System.Windows.Markup/XamlReader.xml
+++ b/xml/System.Windows.Markup/XamlReader.xml
@@ -70,7 +70,7 @@
  The following example converts a <xref:System.Windows.Controls.Button> into a string using the <xref:System.Windows.Markup.XamlWriter> class.  The string is then loaded back into a <xref:System.Windows.Controls.Button> using the static <xref:System.Windows.Markup.XamlReader.Load%2A> method on the <xref:System.Windows.Markup.XamlReader> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Markup/XamlReader/Overview/Window1.xaml.cs" id="Snippetxamlreaderloadxmlreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::
 
  ]]></format>
     </remarks>
@@ -209,7 +209,7 @@
  The following example saves a <xref:System.Windows.Controls.Button> into a <xref:System.IO.MemoryStream> using the <xref:System.Windows.Markup.XamlWriter> class. The stream is then loaded back into a <xref:System.Windows.Controls.Button> using the static <xref:System.Windows.Markup.XamlReader.Load%2A> method on the <xref:System.Windows.Markup.XamlReader> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Markup/XamlReader/Overview/Window1.xaml.cs" id="Snippetxamlreaderloadxmlreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::
 
  ]]></format>
         </remarks>
@@ -294,7 +294,7 @@
  The following example converts a <xref:System.Windows.Controls.Button> into a string using the <xref:System.Windows.Markup.XamlWriter> class.  The string is then loaded back into a <xref:System.Windows.Controls.Button> using the static <xref:System.Windows.Markup.XamlReader.Load%2A> method on the <xref:System.Windows.Markup.XamlReader> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Markup/XamlReader/Overview/Window1.xaml.cs" id="Snippetxamlreaderloadxmlreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Markup/XamlWriter.xml b/xml/System.Windows.Markup/XamlWriter.xml
index cb121b5e3d8..e0a3e4b1fd3 100644
--- a/xml/System.Windows.Markup/XamlWriter.xml
+++ b/xml/System.Windows.Markup/XamlWriter.xml
@@ -36,7 +36,7 @@
  The following example serializes a <xref:System.Windows.Controls.Button> into a string using the <xref:System.Windows.Markup.XamlWriter> class.  The string is then deserialized back into a <xref:System.Windows.Controls.Button> using the static <xref:System.Windows.Markup.XamlReader.Load%2A> method on the <xref:System.Windows.Markup.XamlReader> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Markup/XamlReader/Overview/Window1.xaml.cs" id="Snippetxamlreaderloadxmlreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::  
   
  ]]></format>
     </remarks>
@@ -101,7 +101,7 @@
  The following example serializes a <xref:System.Windows.Controls.Button> into a string using the <xref:System.Windows.Markup.XamlWriter> class.  The string is then deserialized back into a <xref:System.Windows.Controls.Button> using the static <xref:System.Windows.Markup.XamlReader.Load%2A> method on the <xref:System.Windows.Markup.XamlReader> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Markup/XamlReader/Overview/Window1.xaml.cs" id="Snippetxamlreaderloadxmlreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::  
   
  ]]></format>
         </remarks>
@@ -161,7 +161,7 @@
  The following example serializes a <xref:System.Windows.Controls.Button> into a <xref:System.IO.MemoryStream> using the <xref:System.Windows.Markup.XamlWriter> class. The stream is then deserialized back into a <xref:System.Windows.Controls.Button> using the static <xref:System.Windows.Markup.XamlReader.Load%2A> method on the <xref:System.Windows.Markup.XamlReader> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Markup/XamlReader/Overview/Window1.xaml.cs" id="Snippetxamlreaderloadxmlreader":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XamlReaderWriterSnippets/visualbasic/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Markup/XamlReader/Overview/window1.xaml.vb" id="Snippetxamlreaderloadxmlreader":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Animation/Animatable.xml b/xml/System.Windows.Media.Animation/Animatable.xml
index 44aebbefd68..ada1914f12c 100644
--- a/xml/System.Windows.Media.Animation/Animatable.xml
+++ b/xml/System.Windows.Media.Animation/Animatable.xml
@@ -447,7 +447,7 @@
  In the following example, the non-animated values of animated properties are retrieved and displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/ApplyAnimationClock/GetAnimationBaseValueExample.cs" id="Snippetgetanimationbasevalueexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/getanimationbasevalueexample.vb" id="Snippetgetanimationbasevalueexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/getanimationbasevalueexample.vb" id="Snippetgetanimationbasevalueexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Animation/ClockController.xml b/xml/System.Windows.Media.Animation/ClockController.xml
index 493302e4af7..323317b1a48 100644
--- a/xml/System.Windows.Media.Animation/ClockController.xml
+++ b/xml/System.Windows.Media.Animation/ClockController.xml
@@ -187,7 +187,7 @@
  The following example shows how to remove and otherwise interactively control a clock.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Animation/ClockController/Remove/SeekAlignedToLastTickExample.cs" id="Snippetclockcontrollerseekexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/seekalignedtolasttickexample.vb" id="Snippetclockcontrollerseekexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/seekalignedtolasttickexample.vb" id="Snippetclockcontrollerseekexample":::  
   
  ]]></format>
         </remarks>
@@ -279,7 +279,7 @@
  The following example shows how to seek using a <xref:System.Windows.Media.Animation.ClockController>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Animation/ClockController/Remove/SeekAlignedToLastTickExample.cs" id="Snippetclockcontrollerseekexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/seekalignedtolasttickexample.vb" id="Snippetclockcontrollerseekexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/seekalignedtolasttickexample.vb" id="Snippetclockcontrollerseekexample":::  
   
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
  The following example demonstrates both the <xref:System.Windows.Media.Animation.ClockController.Seek%2A> and <xref:System.Windows.Media.Animation.ClockController.SeekAlignedToLastTick%2A> methods of a <xref:System.Windows.Media.Animation.ClockController>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Animation/ClockController/Remove/SeekAlignedToLastTickExample.cs" id="Snippetclockcontrollerseekexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ClockController_procedural_snip/visualbasic/seekalignedtolasttickexample.vb" id="Snippetclockcontrollerseekexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Animation/ClockController/Remove/seekalignedtolasttickexample.vb" id="Snippetclockcontrollerseekexample":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Animation/DiscreteInt16KeyFrame.xml b/xml/System.Windows.Media.Animation/DiscreteInt16KeyFrame.xml
index 87b7efa0aea..3e582b5f227 100644
--- a/xml/System.Windows.Media.Animation/DiscreteInt16KeyFrame.xml
+++ b/xml/System.Windows.Media.Animation/DiscreteInt16KeyFrame.xml
@@ -46,7 +46,7 @@
 3.  In the final two seconds, uses an instance of the <xref:System.Windows.Media.Animation.SplineDoubleKeyFrame> class to move the rectangle back to its starting position. Spline key frames like <xref:System.Windows.Media.Animation.SplineDoubleKeyFrame> create a variable transition between values according to the value of the <xref:System.Windows.Media.Animation.SplineDoubleKeyFrame.KeySpline%2A> property. In this example, the rectangle begins by moving slowly and then speeds up exponentially toward the end of the time segment  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/AltDoubleAnimationUsingKeyFramesExample.cs" id="Snippetaltdoubleanimationusingkeyframeswholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/keyframes_snip/visualbasic/altdoubleanimationusingkeyframesexample.vb" id="Snippetaltdoubleanimationusingkeyframeswholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Animation/DiscreteInt16KeyFrame/Overview/altdoubleanimationusingkeyframesexample.vb" id="Snippetaltdoubleanimationusingkeyframeswholepage":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/keyframes_snip/XAML/AltDoubleAnimationUsingKeyFramesExample.xaml" id="Snippetaltdoubleanimationusingkeyframeswholepage":::  
   
  Not every \<Type>AnimationUsingKeyFrames class supports all interpolation methods. For more information, see the [Key-Frame Animations Overview](/dotnet/framework/wpf/graphics-multimedia/key-frame-animations-overview).  
diff --git a/xml/System.Windows.Media.Animation/EasingFunctionBase.xml b/xml/System.Windows.Media.Animation/EasingFunctionBase.xml
index 95f1a9582ea..13409f8f4e7 100644
--- a/xml/System.Windows.Media.Animation/EasingFunctionBase.xml
+++ b/xml/System.Windows.Media.Animation/EasingFunctionBase.xml
@@ -37,7 +37,7 @@
  The following example demonstrates how to create a simple custom easing function. You can add your own mathematical logic for how the easing function behaves by overriding the <xref:System.Windows.Media.Animation.EasingFunctionBase.EaseInCore%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Animation/EasingFunctionBase/Overview/customlog10easingfunction.cs" id="Snippetcustomeasingfunction":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/customeasingfunction/visualbasic/customlog10easingfunction.vb" id="Snippetcustomeasingfunction":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Animation/EasingFunctionBase/Overview/customlog10easingfunction.vb" id="Snippetcustomeasingfunction":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Animation/EasingFunctionBase/Overview/window1.xaml" id="Snippetcustomeasingfunction":::
 
  ]]></format>
diff --git a/xml/System.Windows.Media.Animation/Storyboard.xml b/xml/System.Windows.Media.Animation/Storyboard.xml
index 830aaa87f05..5ec2528253e 100644
--- a/xml/System.Windows.Media.Animation/Storyboard.xml
+++ b/xml/System.Windows.Media.Animation/Storyboard.xml
@@ -175,7 +175,7 @@
  The following example uses a storyboard to animate a <xref:System.Windows.Media.TextEffect>. The <xref:System.Windows.Media.TextEffect> is contained within a <xref:System.Windows.FrameworkContentElement>'s name scope.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementStoryboardExample.cs" id="Snippetframeworkcontentelementstoryboardexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementstoryboardexample.vb" id="Snippetframeworkcontentelementstoryboardexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementstoryboardexample.vb" id="Snippetframeworkcontentelementstoryboardexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -284,7 +284,7 @@
  The following example uses a controllable storyboard to animate a <xref:System.Windows.Media.TextEffect>. The <xref:System.Windows.Media.TextEffect> is contained within a <xref:System.Windows.FrameworkContentElement>'s name scope.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementControlStoryboardExample.cs" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -348,7 +348,7 @@
  The following example uses the <xref:System.Windows.Media.Animation.HandoffBehavior.SnapshotAndReplace> <xref:System.Windows.Media.Animation.HandoffBehavior> to animate when the user left-clicks, and the <xref:System.Windows.Media.Animation.HandoffBehavior.Compose> <xref:System.Windows.Media.Animation.HandoffBehavior> when the user right-clicks.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementStoryboardWithHandoffBehaviorExample.cs" id="Snippetframeworkcontentelementstoryboardwithhandoffbehaviorexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementstoryboardwithhandoffbehaviorexample.vb" id="Snippetframeworkcontentelementstoryboardwithhandoffbehaviorexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementstoryboardwithhandoffbehaviorexample.vb" id="Snippetframeworkcontentelementstoryboardwithhandoffbehaviorexamplewholepage":::
 
  ]]></format>
         </remarks>
@@ -500,7 +500,7 @@
  The following example uses the <xref:System.Windows.Media.Animation.HandoffBehavior.SnapshotAndReplace> <xref:System.Windows.Media.Animation.HandoffBehavior> to animate when the user left-clicks, and the <xref:System.Windows.Media.Animation.HandoffBehavior.Compose> <xref:System.Windows.Media.Animation.HandoffBehavior> when the user right-clicks.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkElementStoryboardHandoffBehaviorExample.cs" id="Snippetgraphicsmmframeworkelementstoryboardhandoffbehaviorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkelementstoryboardhandoffbehaviorexample.vb" id="Snippetgraphicsmmframeworkelementstoryboardhandoffbehaviorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkelementstoryboardhandoffbehaviorexample.vb" id="Snippetgraphicsmmframeworkelementstoryboardhandoffbehaviorexample":::
 
  ]]></format>
         </remarks>
@@ -569,12 +569,12 @@
  The following example uses a controllable storyboard to animate a <xref:System.Windows.Media.TextEffect>. The <xref:System.Windows.Media.TextEffect> is contained within a <xref:System.Windows.FrameworkContentElement>'s name scope.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementControlStoryboardExample.cs" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
 
  The next example uses the <xref:System.Windows.Media.Animation.HandoffBehavior.SnapshotAndReplace> <xref:System.Windows.Media.Animation.HandoffBehavior> to animate when the user left-clicks, and the <xref:System.Windows.Media.Animation.HandoffBehavior.Compose> <xref:System.Windows.Media.Animation.HandoffBehavior> when the user right-clicks.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementStoryboardWithHandoffBehaviorExample.cs" id="Snippetframeworkcontentelementstoryboardwithhandoffbehaviorexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementstoryboardwithhandoffbehaviorexample.vb" id="Snippetframeworkcontentelementstoryboardwithhandoffbehaviorexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementstoryboardwithhandoffbehaviorexample.vb" id="Snippetframeworkcontentelementstoryboardwithhandoffbehaviorexamplewholepage":::
 
  ]]></format>
         </remarks>
@@ -759,12 +759,12 @@
  The following example shows how to create a controllable storyboard.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Animation/Storyboard/Begin/ControllableStoryboardExample.cs" id="Snippetcontrollablestoryboardexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/animation_ovws_procedural_snip/visualbasic/controllablestoryboardexample.vb" id="Snippetcontrollablestoryboardexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Animation/Storyboard/Begin/controllablestoryboardexample.vb" id="Snippetcontrollablestoryboardexamplewholepage":::
 
  The next example uses the <xref:System.Windows.Media.Animation.HandoffBehavior.SnapshotAndReplace> <xref:System.Windows.Media.Animation.HandoffBehavior> to animate when the user left-clicks, and the <xref:System.Windows.Media.Animation.HandoffBehavior.Compose> <xref:System.Windows.Media.Animation.HandoffBehavior> when the user right-clicks.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkElementStoryboardHandoffBehaviorExample.cs" id="Snippetgraphicsmmframeworkelementstoryboardhandoffbehaviorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkelementstoryboardhandoffbehaviorexample.vb" id="Snippetgraphicsmmframeworkelementstoryboardhandoffbehaviorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkelementstoryboardhandoffbehaviorexample.vb" id="Snippetgraphicsmmframeworkelementstoryboardhandoffbehaviorexample":::
 
  ]]></format>
         </remarks>
@@ -2030,7 +2030,7 @@
  The following example uses a controllable storyboard to animate a <xref:System.Windows.Media.TextEffect>. The <xref:System.Windows.Media.TextEffect> is contained within a <xref:System.Windows.FrameworkContentElement>'s name scope.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementControlStoryboardExample.cs" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -2337,7 +2337,7 @@
  The following example uses a controllable storyboard to animate a <xref:System.Windows.Media.TextEffect>. The <xref:System.Windows.Media.TextEffect> is contained within a <xref:System.Windows.FrameworkContentElement>'s name scope.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementControlStoryboardExample.cs" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -2554,7 +2554,7 @@
  The following example shows both the <xref:System.Windows.Media.Animation.Storyboard.Seek%2A> and <xref:System.Windows.Media.Animation.Storyboard.SeekAlignedToLastTick%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementSeekExample.cs" id="Snippetframeworkcontentelementseekexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementseekexample.vb" id="Snippetframeworkcontentelementseekexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementseekexample.vb" id="Snippetframeworkcontentelementseekexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -2616,12 +2616,12 @@
  The following example shows how to seek (skip) to one second after a Storyboard begins.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/ApplyAnimationClock/SeekStoryboardExample.cs" id="Snippetseekstoryboardexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/seekstoryboardexample.vb" id="Snippetseekstoryboardexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/seekstoryboardexample.vb" id="Snippetseekstoryboardexamplewholepage":::
 
  The next example shows both the <xref:System.Windows.Media.Animation.Storyboard.Seek%2A> and <xref:System.Windows.Media.Animation.Storyboard.SeekAlignedToLastTick%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/SeekExample.cs" id="Snippetseekexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/seekexample.vb" id="Snippetseekexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/seekexample.vb" id="Snippetseekexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -2795,7 +2795,7 @@
  The following example shows both the <xref:System.Windows.Media.Animation.Storyboard.Seek%2A> and <xref:System.Windows.Media.Animation.Storyboard.SeekAlignedToLastTick%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementSeekExample.cs" id="Snippetframeworkcontentelementseekexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementseekexample.vb" id="Snippetframeworkcontentelementseekexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementseekexample.vb" id="Snippetframeworkcontentelementseekexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -2861,7 +2861,7 @@
  The following example shows both the <xref:System.Windows.Media.Animation.Storyboard.Seek%2A> and <xref:System.Windows.Media.Animation.Storyboard.SeekAlignedToLastTick%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/SeekExample.cs" id="Snippetseekexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/seekexample.vb" id="Snippetseekexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/seekexample.vb" id="Snippetseekexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -2970,7 +2970,7 @@
  The following example uses a controllable storyboard to animate a <xref:System.Windows.Media.TextEffect>. The <xref:System.Windows.Media.TextEffect> is contained within a <xref:System.Windows.FrameworkContentElement>'s name scope.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementControlStoryboardExample.cs" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -3253,7 +3253,7 @@ This method sets the <xref:System.Windows.Media.Animation.Storyboard.TargetPrope
  The following example uses a controllable storyboard to animate a <xref:System.Windows.Media.TextEffect>. The <xref:System.Windows.Media.TextEffect> is contained within a <xref:System.Windows.FrameworkContentElement>'s name scope.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementControlStoryboardExample.cs" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
 
  ]]></format>
         </remarks>
@@ -3409,7 +3409,7 @@ This method sets the <xref:System.Windows.Media.Animation.Storyboard.TargetPrope
  The following example uses a controllable storyboard to animate a <xref:System.Windows.Media.TextEffect>. The <xref:System.Windows.Media.TextEffect> is contained within a <xref:System.Windows.FrameworkContentElement>'s name scope.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/FrameworkContentElementControlStoryboardExample.cs" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/frameworkcontentelementcontrolstoryboardexample.vb" id="Snippetframeworkcontentelementcontrolstoryboardexampleusingwholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Animation/Timeline.xml b/xml/System.Windows.Media.Animation/Timeline.xml
index fa4347de398..20d7d2efeaf 100644
--- a/xml/System.Windows.Media.Animation/Timeline.xml
+++ b/xml/System.Windows.Media.Animation/Timeline.xml
@@ -822,7 +822,7 @@
  The following example shows how to register for the <xref:System.Windows.Media.Animation.Timeline.CurrentGlobalSpeedInvalidated> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/ApplyAnimationClock/TimelineCurrentGlobalSpeedInvalidatedExample.cs" id="Snippettimelinecurrentglobalspeedinvalidatedexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/timelinecurrentglobalspeedinvalidatedexample.vb" id="Snippettimelinecurrentglobalspeedinvalidatedexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/timelinecurrentglobalspeedinvalidatedexample.vb" id="Snippettimelinecurrentglobalspeedinvalidatedexamplewholepage":::
 
  ]]></format>
         </remarks>
@@ -916,7 +916,7 @@
  The following example shows how to register for the <xref:System.Windows.Media.Animation.Timeline.CurrentTimeInvalidated> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/ApplyAnimationClock/TimelineCurrentTimeInvalidatedExample.cs" id="Snippettimelinecurrenttimeinvalidatedexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/timelinecurrenttimeinvalidatedexample.vb" id="Snippettimelinecurrenttimeinvalidatedexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/timelinecurrenttimeinvalidatedexample.vb" id="Snippettimelinecurrenttimeinvalidatedexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Imaging/BitmapDecoder.xml b/xml/System.Windows.Media.Imaging/BitmapDecoder.xml
index f8e9c6db6b9..05d9b694d7a 100644
--- a/xml/System.Windows.Media.Imaging/BitmapDecoder.xml
+++ b/xml/System.Windows.Media.Imaging/BitmapDecoder.xml
@@ -39,7 +39,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Media.Imaging.BitmapDecoder.Create%28System.Uri%2CSystem.Windows.Media.Imaging.BitmapCreateOptions%2CSystem.Windows.Media.Imaging.BitmapCacheOption%29> method to create a decoder for a given image. The first <xref:System.Windows.Media.Imaging.BitmapFrame> of the image is used as the source of an <xref:System.Windows.Controls.Image> control.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/BitmapDecoderExample.cs" id="Snippetbitmapdecodercreate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/BitmapDecoderExample.vb" id="Snippetbitmapdecodercreate":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/BitmapDecoderExample.vb" id="Snippetbitmapdecodercreate":::  
   
  The following code example demonstrates how to use the built in <xref:System.Windows.Media.Imaging.TiffBitmapDecoder> to open and decode a Tagged Image File Format (TIFF) bitmap. The resulting <xref:System.Windows.Media.Imaging.BitmapSource> is used as the <xref:System.Windows.Controls.Image.Source%2A> of an <xref:System.Windows.Controls.Image> element.  
   
@@ -216,7 +216,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Media.Imaging.BitmapDecoder.Create%2A> method to create a decoder for a given image. The first <xref:System.Windows.Media.Imaging.BitmapFrame> of the image is used as the source of an <xref:System.Windows.Controls.Image> control.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/BitmapDecoderExample.cs" id="Snippetbitmapdecodercreatestream":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/BitmapDecoderExample.vb" id="Snippetbitmapdecodercreatestream":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/BitmapDecoderExample.vb" id="Snippetbitmapdecodercreatestream":::  
   
  ]]></format>
         </remarks>
@@ -269,7 +269,7 @@
  The following example demonstrates how to use the <xref:System.Windows.Media.Imaging.BitmapDecoder.Create%28System.Uri%2CSystem.Windows.Media.Imaging.BitmapCreateOptions%2CSystem.Windows.Media.Imaging.BitmapCacheOption%29> method to create a decoder for a given image. The first <xref:System.Windows.Media.Imaging.BitmapFrame> of the image is used as the source of an <xref:System.Windows.Controls.Image> control.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/BitmapDecoderExample.cs" id="Snippetbitmapdecodercreate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/BitmapDecoderExample.vb" id="Snippetbitmapdecodercreate":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/BitmapDecoderExample.vb" id="Snippetbitmapdecodercreate":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Imaging/BitmapImage.xml b/xml/System.Windows.Media.Imaging/BitmapImage.xml
index 2ea301e077d..95b5dcea4c1 100644
--- a/xml/System.Windows.Media.Imaging/BitmapImage.xml
+++ b/xml/System.Windows.Media.Imaging/BitmapImage.xml
@@ -46,10 +46,10 @@
  The following code examples demonstrate how to use a <xref:System.Windows.Media.Imaging.BitmapImage> in Extensible Application Markup Language (XAML) and code.
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml" id="Snippetsimplexaml2":::
- :::code language="xaml" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml" id="Snippetsimplexaml2":::
+ :::code language="xaml" source="~/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml" id="Snippetsimplexaml2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml.cs" id="Snippetsimplecsharp1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml.vb" id="Snippetsimplecsharp1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml.vb" id="Snippetsimplecsharp1":::
 
  ]]></format>
     </remarks>
@@ -992,7 +992,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml" id="Snippettransformedxaml2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml.cs" id="Snippettransformedcsharp1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/TransformedImageExample.xaml.vb" id="Snippettransformedcsharp1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml.vb" id="Snippettransformedcsharp1":::
 
  ]]></format>
         </remarks>
@@ -1300,10 +1300,10 @@
  The following example demonstrates the use the <xref:System.Windows.Media.Imaging.BitmapImage.UriSource%2A> property in Extensible Application Markup Language (XAML) and code.
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml" id="Snippetsimplexaml2":::
- :::code language="xaml" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml" id="Snippetsimplexaml2":::
+ :::code language="xaml" source="~/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml" id="Snippetsimplexaml2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml.cs" id="Snippetsimplecsharp1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml.vb" id="Snippetsimplecsharp1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml.vb" id="Snippetsimplecsharp1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Imaging/BitmapSource.xml b/xml/System.Windows.Media.Imaging/BitmapSource.xml
index de0923e7f06..f44acdad627 100644
--- a/xml/System.Windows.Media.Imaging/BitmapSource.xml
+++ b/xml/System.Windows.Media.Imaging/BitmapSource.xml
@@ -47,12 +47,12 @@
  The following code example demonstrates how to create a <xref:System.Windows.Media.Imaging.BitmapSource> and use it as the source of an <xref:System.Windows.Controls.Image> control.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/BitmapSourceExample.cs" id="Snippetbitmapsourcecreate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/BitmapSourceExample.vb" id="Snippetbitmapsourcecreate":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/BitmapSourceExample.vb" id="Snippetbitmapsourcecreate":::  
   
  The following code example uses a <xref:System.Windows.Media.Imaging.BitmapSource> derived class, <xref:System.Windows.Media.Imaging.BitmapImage>, to create a bitmap from an image file and use it as the source of an <xref:System.Windows.Controls.Image> control.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml.cs" id="Snippetsimplecsharp1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/SimpleImageExample.xaml.vb" id="Snippetsimplecsharp1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/SimpleImageExample.xaml.vb" id="Snippetsimplecsharp1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media.Imaging/CroppedBitmap.xml b/xml/System.Windows.Media.Imaging/CroppedBitmap.xml
index 845bd66ebd3..696712d8cdc 100644
--- a/xml/System.Windows.Media.Imaging/CroppedBitmap.xml
+++ b/xml/System.Windows.Media.Imaging/CroppedBitmap.xml
@@ -123,7 +123,7 @@
  The following example shows how to use <xref:System.Windows.Media.Imaging.CroppedBitmap.%23ctor%28System.Windows.Media.Imaging.BitmapSource%2CSystem.Windows.Int32Rect%29> to initialize a new instance of the <xref:System.Windows.Media.Imaging.CroppedBitmap> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/CroppedImageExample.xaml.cs" id="Snippetcroppedcsharp2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/CroppedImageExample.xaml.vb" id="Snippetcroppedcsharp2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/CroppedImageExample.xaml.vb" id="Snippetcroppedcsharp2":::
 
  ]]></format>
         </remarks>
@@ -173,7 +173,7 @@
  The following example demonstrates how to initialize a <xref:System.Windows.Media.Imaging.CroppedBitmap> with a set of properties by using the <xref:System.Windows.Media.Imaging.CroppedBitmap.BeginInit%2A> and <xref:System.Windows.Media.Imaging.CroppedBitmap.EndInit%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/CroppedBitmapExample.cs" id="Snippetcroppedbitmapcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/CroppedBitmapExample.vb" id="Snippetcroppedbitmapcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/CroppedBitmapExample.vb" id="Snippetcroppedbitmapcodeexamplewholepage":::
 
  ]]></format>
         </remarks>
@@ -398,7 +398,7 @@
  The following example demonstrates how to initialize a <xref:System.Windows.Media.Imaging.CroppedBitmap> with a set of properties by using the <xref:System.Windows.Media.Imaging.CroppedBitmap.BeginInit%2A> and <xref:System.Windows.Media.Imaging.CroppedBitmap.EndInit%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/CroppedBitmapExample.cs" id="Snippetcroppedbitmapcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/CroppedBitmapExample.vb" id="Snippetcroppedbitmapcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/CroppedBitmapExample.vb" id="Snippetcroppedbitmapcodeexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Imaging/FormatConvertedBitmap.xml b/xml/System.Windows.Media.Imaging/FormatConvertedBitmap.xml
index 987281963e4..16577bb263c 100644
--- a/xml/System.Windows.Media.Imaging/FormatConvertedBitmap.xml
+++ b/xml/System.Windows.Media.Imaging/FormatConvertedBitmap.xml
@@ -241,7 +241,7 @@
  The following example demonstrates how to initialize a <xref:System.Windows.Media.Imaging.FormatConvertedBitmap> with a set of properties by using the <xref:System.Windows.Media.Imaging.FormatConvertedBitmap.BeginInit%2A> and <xref:System.Windows.Media.Imaging.FormatConvertedBitmap.EndInit%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/FormatConvertedBitmapExample.cs" id="Snippetformatconvertedbitmapcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/FormatConvertedBitmapExample.vb" id="Snippetformatconvertedbitmapcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/FormatConvertedBitmapExample.vb" id="Snippetformatconvertedbitmapcodeexamplewholepage":::
 
  ]]></format>
         </remarks>
@@ -609,7 +609,7 @@
  The following example demonstrates how to initialize a <xref:System.Windows.Media.Imaging.FormatConvertedBitmap> with a set of properties by using the <xref:System.Windows.Media.Imaging.FormatConvertedBitmap.BeginInit%2A> and <xref:System.Windows.Media.Imaging.FormatConvertedBitmap.EndInit%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/FormatConvertedBitmapExample.cs" id="Snippetformatconvertedbitmapcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/FormatConvertedBitmapExample.vb" id="Snippetformatconvertedbitmapcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/FormatConvertedBitmapExample.vb" id="Snippetformatconvertedbitmapcodeexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Imaging/RenderTargetBitmap.xml b/xml/System.Windows.Media.Imaging/RenderTargetBitmap.xml
index 0a488d568f1..7a95f96df12 100644
--- a/xml/System.Windows.Media.Imaging/RenderTargetBitmap.xml
+++ b/xml/System.Windows.Media.Imaging/RenderTargetBitmap.xml
@@ -29,7 +29,7 @@
  The following example shows how to use <xref:System.Windows.Media.Imaging.RenderTargetBitmap> to render text as an image.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/RenderTargetBitmapExample.cs" id="Snippetrendertargetbitmapcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/RenderTargetBitmapExample.vb" id="Snippetrendertargetbitmapcodeexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/RenderTargetBitmapExample.vb" id="Snippetrendertargetbitmapcodeexamplewholepage":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media.Imaging/TransformedBitmap.xml b/xml/System.Windows.Media.Imaging/TransformedBitmap.xml
index f81fefa4996..38ee84ec605 100644
--- a/xml/System.Windows.Media.Imaging/TransformedBitmap.xml
+++ b/xml/System.Windows.Media.Imaging/TransformedBitmap.xml
@@ -167,7 +167,7 @@
  The following example demonstrates how to initialize a <xref:System.Windows.Media.Imaging.TransformedBitmap> with a set of properties by using the <xref:System.Windows.Media.Imaging.TransformedBitmap.BeginInit%2A> and <xref:System.Windows.Media.Imaging.TransformedBitmap.EndInit%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/TransformedBitmapExample.cs" id="Snippettransformedbitmappropinit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/TransformedBitmapExample.vb" id="Snippettransformedbitmappropinit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/TransformedBitmapExample.vb" id="Snippettransformedbitmappropinit":::
 
  ]]></format>
         </remarks>
@@ -393,7 +393,7 @@
  The following example demonstrates how to initialize a <xref:System.Windows.Media.Imaging.TransformedBitmap> with a set of properties by using the <xref:System.Windows.Media.Imaging.TransformedBitmap.BeginInit%2A> and <xref:System.Windows.Media.Imaging.TransformedBitmap.EndInit%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/TransformedBitmapExample.cs" id="Snippettransformedbitmappropinit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/TransformedBitmapExample.vb" id="Snippettransformedbitmappropinit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/TransformedBitmapExample.vb" id="Snippettransformedbitmappropinit":::
 
  ]]></format>
         </remarks>
@@ -589,7 +589,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml" id="Snippettransformedxaml2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml.cs" id="Snippettransformedcsharp1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImageElementExample/VB/TransformedImageExample.xaml.vb" id="Snippettransformedcsharp1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Imaging/BitmapImage/Overview/TransformedImageExample.xaml.vb" id="Snippettransformedcsharp1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/AmbientLight.xml b/xml/System.Windows.Media.Media3D/AmbientLight.xml
index 592d437a83a..b78e08d9c78 100644
--- a/xml/System.Windows.Media.Media3D/AmbientLight.xml
+++ b/xml/System.Windows.Media.Media3D/AmbientLight.xml
@@ -38,7 +38,7 @@
  The following example creates an AmbientLight in code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn1":::
 
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
  The following example creates an AmbientLight in code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn1":::
 
  ]]></format>
         </remarks>
@@ -117,7 +117,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/AxisAngleRotation3D.xml b/xml/System.Windows.Media.Media3D/AxisAngleRotation3D.xml
index 2a6ea625148..87216b9a413 100644
--- a/xml/System.Windows.Media.Media3D/AxisAngleRotation3D.xml
+++ b/xml/System.Windows.Media.Media3D/AxisAngleRotation3D.xml
@@ -30,7 +30,7 @@
  The following code excerpt specifies an <xref:System.Windows.Media.Media3D.AxisAngleRotation3D> as the <xref:System.Windows.Media.Media3D.RotateTransform3D.Rotation%2A> property of a <xref:System.Windows.Media.Media3D.RotateTransform3D>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/Window1.xaml.cs" id="Snippet3doverview3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml.vb" id="Snippet3doverview3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml.vb" id="Snippet3doverview3dn1":::
 
  The following code excerpt applies an <xref:System.Windows.Media.Media3D.AxisAngleRotation3D> to a <xref:System.Windows.Media.Media3D.GeometryModel3D>.
 
@@ -108,7 +108,7 @@
  The following code excerpt specifies an <xref:System.Windows.Media.Media3D.AxisAngleRotation3D> as the <xref:System.Windows.Media.Media3D.RotateTransform3D.Rotation%2A> property of a <xref:System.Windows.Media.Media3D.RotateTransform3D>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/Window1.xaml.cs" id="Snippet3doverview3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml.vb" id="Snippet3doverview3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml.vb" id="Snippet3doverview3dn1":::
 
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@
  The following code excerpt uses this property as the target of an animation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/Window1.xaml.cs" id="Snippetanimate3drotationcode3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/window1.xaml.vb" id="Snippetanimate3drotationcode3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/window1.xaml.vb" id="Snippetanimate3drotationcode3dn1":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The following code excerpt uses this property as the target of an animation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/Window1.xaml.cs" id="Snippet3doverview3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml.vb" id="Snippet3doverview3dn4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml.vb" id="Snippet3doverview3dn4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/ContainerUIElement3D.xml b/xml/System.Windows.Media.Media3D/ContainerUIElement3D.xml
index e05db58758a..38f1c988593 100644
--- a/xml/System.Windows.Media.Media3D/ContainerUIElement3D.xml
+++ b/xml/System.Windows.Media.Media3D/ContainerUIElement3D.xml
@@ -50,7 +50,7 @@
  The following shows the event handler of the container:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/Window1.xaml.cs" id="Snippetcontainermousedown":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerModelSample/visualbasic/window1.xaml.vb" id="Snippetcontainermousedown":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/ContainerUIElement3D/Overview/window1.xaml.vb" id="Snippetcontainermousedown":::  
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media.Media3D/GeometryModel3D.xml b/xml/System.Windows.Media.Media3D/GeometryModel3D.xml
index 896fea0a14d..712b99e7ffc 100644
--- a/xml/System.Windows.Media.Media3D/GeometryModel3D.xml
+++ b/xml/System.Windows.Media.Media3D/GeometryModel3D.xml
@@ -60,7 +60,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Light.xml b/xml/System.Windows.Media.Media3D/Light.xml
index f45674b9595..56d4b0516e8 100644
--- a/xml/System.Windows.Media.Media3D/Light.xml
+++ b/xml/System.Windows.Media.Media3D/Light.xml
@@ -153,7 +153,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml" id="Snippethittest3d3dn6":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/MaterialCollection.xml b/xml/System.Windows.Media.Media3D/MaterialCollection.xml
index fc3ba053253..58da9ccf552 100644
--- a/xml/System.Windows.Media.Media3D/MaterialCollection.xml
+++ b/xml/System.Windows.Media.Media3D/MaterialCollection.xml
@@ -101,7 +101,7 @@
  The following example shows a <xref:System.Windows.Media.Media3D.MaterialGroup>; the children of the MaterialGroup are a MaterialCollection.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/EmissiveMaterialExample.cs" id="Snippetemissivematerialcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/emissivematerialexample.vb" id="Snippetemissivematerialcodeexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/emissivematerialexample.vb" id="Snippetemissivematerialcodeexamplewholepage":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/MaterialGroup.xml b/xml/System.Windows.Media.Media3D/MaterialGroup.xml
index 37e18685fdd..e797f44ad96 100644
--- a/xml/System.Windows.Media.Media3D/MaterialGroup.xml
+++ b/xml/System.Windows.Media.Media3D/MaterialGroup.xml
@@ -124,7 +124,7 @@
  The following example shows how to add multiple materials to a <xref:System.Windows.Media.Media3D.MaterialGroup>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/EmissiveMaterialExample.cs" id="Snippetemissivematerialcodeexampleinline1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/emissivematerialexample.vb" id="Snippetemissivematerialcodeexampleinline1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/emissivematerialexample.vb" id="Snippetemissivematerialcodeexampleinline1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Matrix3D.xml b/xml/System.Windows.Media.Media3D/Matrix3D.xml
index 0faa792df69..cf1a5be3618 100644
--- a/xml/System.Windows.Media.Media3D/Matrix3D.xml
+++ b/xml/System.Windows.Media.Media3D/Matrix3D.xml
@@ -153,7 +153,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn15":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media.Media3D/MatrixCamera.xml b/xml/System.Windows.Media.Media3D/MatrixCamera.xml
index 7d07a37ca42..64b00569955 100644
--- a/xml/System.Windows.Media.Media3D/MatrixCamera.xml
+++ b/xml/System.Windows.Media.Media3D/MatrixCamera.xml
@@ -39,7 +39,7 @@
  The following code creates a <xref:System.Windows.Media.Media3D.MatrixCamera> and sets the <xref:System.Windows.Media.Media3D.MatrixCamera.ViewMatrix%2A> and <xref:System.Windows.Media.Media3D.MatrixCamera.ProjectionMatrix%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
 
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
  The following code creates a MatrixCamera and sets the ViewMatrix and ProjectionMatrix properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
 
  ]]></format>
         </remarks>
@@ -122,7 +122,7 @@
  The following code creates a MatrixCamera and sets the ViewMatrix and ProjectionMatrix properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
 
  ]]></format>
         </remarks>
@@ -279,7 +279,7 @@
  The following code creates a <xref:System.Windows.Media.Media3D.MatrixCamera> and sets the <xref:System.Windows.Media.Media3D.MatrixCamera.ViewMatrix%2A> and <xref:System.Windows.Media.Media3D.MatrixCamera.ProjectionMatrix%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
 
  ]]></format>
         </remarks>
@@ -359,7 +359,7 @@
  The following code creates a <xref:System.Windows.Media.Media3D.MatrixCamera> and sets the <xref:System.Windows.Media.Media3D.MatrixCamera.ViewMatrix%2A> and <xref:System.Windows.Media.Media3D.MatrixCamera.ProjectionMatrix%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn11":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/MatrixTransform3D.xml b/xml/System.Windows.Media.Media3D/MatrixTransform3D.xml
index 2943a7adbd2..41ab39b4467 100644
--- a/xml/System.Windows.Media.Media3D/MatrixTransform3D.xml
+++ b/xml/System.Windows.Media.Media3D/MatrixTransform3D.xml
@@ -35,7 +35,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn1":::
 
  ]]></format>
     </remarks>
@@ -278,7 +278,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn1":::
 
  ]]></format>
         </remarks>
@@ -352,7 +352,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn13":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/MeshGeometry3D.xml b/xml/System.Windows.Media.Media3D/MeshGeometry3D.xml
index e16ef102125..754b8fd35b8 100644
--- a/xml/System.Windows.Media.Media3D/MeshGeometry3D.xml
+++ b/xml/System.Windows.Media.Media3D/MeshGeometry3D.xml
@@ -66,7 +66,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/Basic3DShapeExample.cs" id="Snippetbasic3dshapecodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/basic3dshapeexample.vb" id="Snippetbasic3dshapecodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/basic3dshapeexample.vb" id="Snippetbasic3dshapecodeexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Model3DCollection.xml b/xml/System.Windows.Media.Media3D/Model3DCollection.xml
index 746026bb63a..77ca84a9c31 100644
--- a/xml/System.Windows.Media.Media3D/Model3DCollection.xml
+++ b/xml/System.Windows.Media.Media3D/Model3DCollection.xml
@@ -57,7 +57,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/EmissiveMaterialExample.cs" id="Snippetemissivematerialcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/emissivematerialexample.vb" id="Snippetemissivematerialcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/emissivematerialexample.vb" id="Snippetemissivematerialcodeexamplewholepage":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media.Media3D/OrthographicCamera.xml b/xml/System.Windows.Media.Media3D/OrthographicCamera.xml
index b1a2b461526..3fa2bcdbcb1 100644
--- a/xml/System.Windows.Media.Media3D/OrthographicCamera.xml
+++ b/xml/System.Windows.Media.Media3D/OrthographicCamera.xml
@@ -39,7 +39,7 @@
  The following example shows how to create an <xref:System.Windows.Media.Media3D.OrthographicCamera> and toggle camera projections.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn12":::
 
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
  The following example instantiates an <xref:System.Windows.Media.Media3D.OrthographicCamera>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn12":::
 
  ]]></format>
         </remarks>
@@ -126,7 +126,7 @@
  The following code instantiates an <xref:System.Windows.Media.Media3D.OrthographicCamera>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn12":::
 
  ]]></format>
         </remarks>
@@ -285,7 +285,7 @@
  The following example creates an <xref:System.Windows.Media.Media3D.OrthographicCamera> and sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn12":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/PerspectiveCamera.xml b/xml/System.Windows.Media.Media3D/PerspectiveCamera.xml
index c8b375b31c8..8131db416ae 100644
--- a/xml/System.Windows.Media.Media3D/PerspectiveCamera.xml
+++ b/xml/System.Windows.Media.Media3D/PerspectiveCamera.xml
@@ -116,7 +116,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn12":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Point3D.xml b/xml/System.Windows.Media.Media3D/Point3D.xml
index 875f019a39e..62583dca297 100644
--- a/xml/System.Windows.Media.Media3D/Point3D.xml
+++ b/xml/System.Windows.Media.Media3D/Point3D.xml
@@ -163,7 +163,7 @@
  The following example shows how to add a <xref:System.Windows.Media.Media3D.Point3D> and a <xref:System.Windows.Media.Media3D.Vector3D>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn4":::
 
  ]]></format>
         </remarks>
@@ -225,7 +225,7 @@
  The following example shows how to check whether an object and <xref:System.Windows.Media.Media3D.Point3D> structure are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn14":::
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
  The following example shows how to check whether two <xref:System.Windows.Media.Media3D.Point3D> structures are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn13":::
 
  ]]></format>
         </remarks>
@@ -359,7 +359,7 @@
  The following example shows how to get the hash code of a <xref:System.Windows.Media.Media3D.Point3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn16":::
 
  ]]></format>
         </remarks>
@@ -446,7 +446,7 @@
  The following example shows how to offset a <xref:System.Windows.Media.Media3D.Point3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn9":::
 
  ]]></format>
         </remarks>
@@ -495,7 +495,7 @@
  The following example shows how to add a <xref:System.Windows.Media.Media3D.Vector3D> structure to a <xref:System.Windows.Media.Media3D.Point3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn3":::
 
  ]]></format>
         </remarks>
@@ -548,7 +548,7 @@
  The following example shows how to use the overloaded equality operator to check whether two <xref:System.Windows.Media.Media3D.Point3D> structures are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn12":::
 
  ]]></format>
         </remarks>
@@ -674,7 +674,7 @@
  The following example shows how to use the overloaded inequality operator to check whether two <xref:System.Windows.Media.Media3D.Point3D> structures are not equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn16":::
 
  ]]></format>
         </remarks>
@@ -718,7 +718,7 @@
  The following example shows how to use the overloaded multiplication operator to transform a <xref:System.Windows.Media.Media3D.Point3D> structure by using a <xref:System.Windows.Media.Media3D.Matrix3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn10":::
 
  ]]></format>
         </remarks>
@@ -772,7 +772,7 @@
  The following example shows how to use the overloaded subtraction operator to subtract a <xref:System.Windows.Media.Media3D.Point3D> structure from a <xref:System.Windows.Media.Media3D.Point3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn7":::
 
  ]]></format>
         </remarks>
@@ -817,7 +817,7 @@
  The following example shows how to use the overloaded subtraction operator to subtract a <xref:System.Windows.Media.Media3D.Vector3D> structure from a <xref:System.Windows.Media.Media3D.Point3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn5":::
 
  ]]></format>
         </remarks>
@@ -860,7 +860,7 @@
  The following example shows how to convert a string representation of a 3-D point into a <xref:System.Windows.Media.Media3D.Point3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn15":::
 
  ]]></format>
         </remarks>
@@ -913,7 +913,7 @@
  The following example shows how to subtract a <xref:System.Windows.Media.Media3D.Point3D> structure from a <xref:System.Windows.Media.Media3D.Point3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn8":::
 
  ]]></format>
         </remarks>
@@ -958,7 +958,7 @@
  The following example shows how to subtract a <xref:System.Windows.Media.Media3D.Vector3D> structure from a <xref:System.Windows.Media.Media3D.Point3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn6":::
 
  ]]></format>
         </remarks>
@@ -1140,7 +1140,7 @@
  The following example shows how set <xref:System.Windows.Media.Media3D.Point3D> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn13":::
 
  ]]></format>
         </remarks>
@@ -1188,7 +1188,7 @@
  The following example shows how set <xref:System.Windows.Media.Media3D.Point3D> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn13":::
 
  ]]></format>
         </remarks>
@@ -1236,7 +1236,7 @@
  The following example shows how set <xref:System.Windows.Media.Media3D.Point3D> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/Add/Window1.xaml.cs" id="Snippetmil3dpoints3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dpoints3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/Add/window1.xaml.vb" id="Snippetmil3dpoints3dn13":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Point3DCollection.xml b/xml/System.Windows.Media.Media3D/Point3DCollection.xml
index 35697842555..6a96d36a191 100644
--- a/xml/System.Windows.Media.Media3D/Point3DCollection.xml
+++ b/xml/System.Windows.Media.Media3D/Point3DCollection.xml
@@ -99,7 +99,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/Basic3DShapeExample.cs" id="Snippetbasic3dshapecodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/basic3dshapeexample.vb" id="Snippetbasic3dshapecodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/basic3dshapeexample.vb" id="Snippetbasic3dshapecodeexamplewholepage":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Point4D.xml b/xml/System.Windows.Media.Media3D/Point4D.xml
index a707551cd4b..687f67152c8 100644
--- a/xml/System.Windows.Media.Media3D/Point4D.xml
+++ b/xml/System.Windows.Media.Media3D/Point4D.xml
@@ -154,7 +154,7 @@
  The following example shows how to add two <xref:System.Windows.Media.Media3D.Point4D> structures.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn3":::
 
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
  The following example shows how to check whether an <xref:System.Object> and a <xref:System.Windows.Media.Media3D.Point4D> structure are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn12":::
 
  ]]></format>
         </remarks>
@@ -310,7 +310,7 @@
  The following example shows how to check whether two <xref:System.Windows.Media.Media3D.Point4D> structures are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn11":::
 
  ]]></format>
         </remarks>
@@ -350,7 +350,7 @@
  The following example shows how to get the hashcode of a  <xref:System.Windows.Media.Media3D.Point4D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn16":::
 
  ]]></format>
         </remarks>
@@ -394,7 +394,7 @@
  The following example shows how to multiply a <xref:System.Windows.Media.Media3D.Point4D> structure by a <xref:System.Windows.Media.Media3D.Matrix3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn9":::
 
  ]]></format>
         </remarks>
@@ -447,7 +447,7 @@
  The following example shows how to offset a <xref:System.Windows.Media.Media3D.Point4D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn7":::
 
  ]]></format>
         </remarks>
@@ -491,7 +491,7 @@
  The following example shows how to use the overloaded addition operator to add two <xref:System.Windows.Media.Media3D.Point4D> structures.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn4":::
 
  ]]></format>
         </remarks>
@@ -544,7 +544,7 @@
  The following example shows how to use the overloaded equality operator to check whether two <xref:System.Windows.Media.Media3D.Point4D> structures are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn10":::
 
  ]]></format>
         </remarks>
@@ -597,7 +597,7 @@
  The following example shows how to use the overloaded inequality operator to check whether two <xref:System.Windows.Media.Media3D.Point4D> structures are not equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn14":::
 
  ]]></format>
         </remarks>
@@ -641,7 +641,7 @@
  The following example shows how to use the overloaded multiplication operator to transform a <xref:System.Windows.Media.Media3D.Point4D> structure by a <xref:System.Windows.Media.Media3D.Matrix3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn8":::
 
  ]]></format>
         </remarks>
@@ -686,7 +686,7 @@
  The following example shows how to use the overloaded subtraction operator to subtract a <xref:System.Windows.Media.Media3D.Point4D> structure from a <xref:System.Windows.Media.Media3D.Point4D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn5":::
 
  ]]></format>
         </remarks>
@@ -729,7 +729,7 @@
  The following example shows how to use the <xref:System.Windows.Media.Media3D.Point4D.Parse%2A> method to convert a string representation of point4D structure into a <xref:System.Windows.Media.Media3D.Point4D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn13":::
 
  ]]></format>
         </remarks>
@@ -773,7 +773,7 @@
  The following example shows how to subtract a <xref:System.Windows.Media.Media3D.Point4D> structure from a <xref:System.Windows.Media.Media3D.Point4D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn6":::
 
  ]]></format>
         </remarks>
@@ -879,7 +879,7 @@
  The following example shows how to get a string representation of a <xref:System.Windows.Media.Media3D.Point4D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn15":::
 
  ]]></format>
         </remarks>
@@ -927,7 +927,7 @@
  The following example shows how get a string representation of a <xref:System.Windows.Media.Media3D.Point4D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Point3D/GetHashCode/Window1.xaml.cs" id="Snippetmil4dpoints3dn15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Point4DSample/visualbasic/window1.xaml.vb" id="Snippetmil4dpoints3dn15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Point3D/GetHashCode/window1.xaml.vb" id="Snippetmil4dpoints3dn15":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/PointLight.xml b/xml/System.Windows.Media.Media3D/PointLight.xml
index 922edbb3b21..d6e0346d23a 100644
--- a/xml/System.Windows.Media.Media3D/PointLight.xml
+++ b/xml/System.Windows.Media.Media3D/PointLight.xml
@@ -34,10 +34,10 @@
  The following examples create a <xref:System.Windows.Media.Media3D.PointLight> object and set some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn3":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn5":::
 
  ]]></format>
     </remarks>
@@ -80,7 +80,7 @@
  The following example shows how to use this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/PointLightBase.xml b/xml/System.Windows.Media.Media3D/PointLightBase.xml
index 9f7831927a4..8c729166e60 100644
--- a/xml/System.Windows.Media.Media3D/PointLightBase.xml
+++ b/xml/System.Windows.Media.Media3D/PointLightBase.xml
@@ -153,7 +153,7 @@
  The following example sets this property in code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn5":::
 
  ]]></format>
         </remarks>
@@ -439,7 +439,7 @@
  The following example sets this property in code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/MyLights.cs" id="Snippetshow3dlights3dn5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Show3DLights/visualbasic/mylights.vb" id="Snippetshow3dlights3dn5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AmbientLight/Overview/mylights.vb" id="Snippetshow3dlights3dn5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Quaternion.xml b/xml/System.Windows.Media.Media3D/Quaternion.xml
index c13541aacd5..ad7c4398eff 100644
--- a/xml/System.Windows.Media.Media3D/Quaternion.xml
+++ b/xml/System.Windows.Media.Media3D/Quaternion.xml
@@ -80,7 +80,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Media3D/Quaternion/Overview/QuaternionAnimationExample.xaml" id="Snippetquaternionanimationexampleinline2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::
 
  ]]></format>
     </remarks>
@@ -879,7 +879,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Quaternion/Parse/Window1.xaml.cs" id="Snippetquaternionview3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/QuaternionView/visualbasic/window1.xaml.vb" id="Snippetquaternionview3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Quaternion/Parse/window1.xaml.vb" id="Snippetquaternionview3dn3":::
 
  ]]></format>
         </remarks>
@@ -1210,7 +1210,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn3":::
 
  ]]></format>
         </remarks>
@@ -1257,7 +1257,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn3":::
 
  ]]></format>
         </remarks>
@@ -1304,7 +1304,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn3":::
 
  ]]></format>
         </remarks>
@@ -1351,7 +1351,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/QuaternionRotation3D.xml b/xml/System.Windows.Media.Media3D/QuaternionRotation3D.xml
index fc5689272c0..8a72e7cf7b3 100644
--- a/xml/System.Windows.Media.Media3D/QuaternionRotation3D.xml
+++ b/xml/System.Windows.Media.Media3D/QuaternionRotation3D.xml
@@ -28,7 +28,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Media3D/Quaternion/Overview/QuaternionAnimationExample.xaml" id="Snippetquaternionanimationexamplewholepage":::
 
@@ -71,7 +71,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::
 
  ]]></format>
         </remarks>
@@ -107,7 +107,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/RayHitTestParameters.xml b/xml/System.Windows.Media.Media3D/RayHitTestParameters.xml
index c788f644220..51f22d7f762 100644
--- a/xml/System.Windows.Media.Media3D/RayHitTestParameters.xml
+++ b/xml/System.Windows.Media.Media3D/RayHitTestParameters.xml
@@ -112,7 +112,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn4":::  
   
  ]]></format>
         </remarks>
@@ -160,7 +160,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/RayMeshGeometry3DHitTestResult.xml b/xml/System.Windows.Media.Media3D/RayMeshGeometry3DHitTestResult.xml
index 1d1e40d0f6d..0f1db19bcd8 100644
--- a/xml/System.Windows.Media.Media3D/RayMeshGeometry3DHitTestResult.xml
+++ b/xml/System.Windows.Media.Media3D/RayMeshGeometry3DHitTestResult.xml
@@ -72,7 +72,7 @@
  The following code excerpt reads this property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn7":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/RotateTransform3D.xml b/xml/System.Windows.Media.Media3D/RotateTransform3D.xml
index e652df6e3ae..1e833751eaa 100644
--- a/xml/System.Windows.Media.Media3D/RotateTransform3D.xml
+++ b/xml/System.Windows.Media.Media3D/RotateTransform3D.xml
@@ -37,7 +37,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/Window1.xaml.cs" id="Snippet3doverview3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml.vb" id="Snippet3doverview3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml.vb" id="Snippet3doverview3dn1":::
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/Window11.xaml" id="Snippetanimate3drotation3dn1":::
 
@@ -108,7 +108,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/Window1.xaml.cs" id="Snippetanimate3drotationcode3dn1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Animate3DRotationCode/visualbasic/window1.xaml.vb" id="Snippetanimate3drotationcode3dn1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/AngleProperty/window1.xaml.vb" id="Snippetanimate3drotationcode3dn1":::
 
  ]]></format>
         </remarks>
@@ -222,7 +222,7 @@
  The following code uses this property to change the point around which a RotateTransform3D transforms the model.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn13":::
 
  ]]></format>
         </remarks>
@@ -299,7 +299,7 @@
  The following code uses this property to change the point around which a RotateTransform3D transforms the model.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn13":::
 
  ]]></format>
         </remarks>
@@ -364,7 +364,7 @@
  The following code uses this property to change the point around which a RotateTransform3D transforms the model.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AmbientLight/Overview/Window1.xaml.cs" id="Snippethittest3d3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTest3D/visualbasic/window1.xaml.vb" id="Snippethittest3d3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/GeometryModel3D/.ctor/window1.xaml.vb" id="Snippethittest3d3dn13":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/ScaleTransform3D.xml b/xml/System.Windows.Media.Media3D/ScaleTransform3D.xml
index fe18021f39d..f78028e004b 100644
--- a/xml/System.Windows.Media.Media3D/ScaleTransform3D.xml
+++ b/xml/System.Windows.Media.Media3D/ScaleTransform3D.xml
@@ -61,7 +61,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/MultipleTransformationsExample.cs" id="Snippetmultiple3dtransformationscodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/multipletransformationsexample.vb" id="Snippetmultiple3dtransformationscodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/multipletransformationsexample.vb" id="Snippetmultiple3dtransformationscodeexamplewholepage":::
 
  ]]></format>
         </remarks>
@@ -159,7 +159,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Viewport3D/.ctor/MultipleTransformationsExample.cs" id="Snippetmultiple3dtransformationscodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DGallery_procedural_snip/visualbasic/multipletransformationsexample.vb" id="Snippetmultiple3dtransformationscodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Viewport3D/.ctor/multipletransformationsexample.vb" id="Snippetmultiple3dtransformationscodeexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Size3D.xml b/xml/System.Windows.Media.Media3D/Size3D.xml
index 3c98b4deea1..e71163b6dd5 100644
--- a/xml/System.Windows.Media.Media3D/Size3D.xml
+++ b/xml/System.Windows.Media.Media3D/Size3D.xml
@@ -140,7 +140,7 @@
  The following example shows how to make a <xref:System.Windows.Media.Media3D.Size3D> structure empty.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn10":::  
   
  ]]></format>
         </remarks>
@@ -199,7 +199,7 @@
  The following example shows how to check if an <xref:System.Object> and a <xref:System.Windows.Media.Media3D.Size3D> structure are equal.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn3":::  
   
  ]]></format>
         </remarks>
@@ -332,7 +332,7 @@
  The following example shows how to get the hash code of a <xref:System.Windows.Media.Media3D.Size3D> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn12":::  
   
  ]]></format>
         </remarks>
@@ -376,7 +376,7 @@
  The following example shows how to check if a <xref:System.Windows.Media.Media3D.Size3D> structure is empty.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn9":::  
   
  ]]></format>
         </remarks>
@@ -427,7 +427,7 @@
  The following example shows how to use the overloaded equality operator to check if two <xref:System.Windows.Media.Media3D.Size3D> structures are equal.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn4":::  
   
  ]]></format>
         </remarks>
@@ -479,7 +479,7 @@
  The following example shows how to explicitly convert a <xref:System.Windows.Media.Media3D.Size3D> structure into a  <xref:System.Windows.Media.Media3D.Point3D> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn8":::  
   
  ]]></format>
         </remarks>
@@ -521,7 +521,7 @@
  The following example shows how to explicitly convert a <xref:System.Windows.Media.Media3D.Size3D> structure into a  <xref:System.Windows.Media.Media3D.Vector3D> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn7":::  
   
  ]]></format>
         </remarks>
@@ -571,7 +571,7 @@
  The following example shows how to use the overloaded inequality operator to check if two <xref:System.Windows.Media.Media3D.Size3D> structures are not equal.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn5":::  
   
  ]]></format>
         </remarks>
@@ -613,7 +613,7 @@
  The following example shows how to turn a string representation of a <xref:System.Windows.Media.Media3D.Size3D> into a <xref:System.Windows.Media.Media3D.Size3D> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn6":::  
   
  ]]></format>
         </remarks>
@@ -723,7 +723,7 @@
  The following example shows how to get a string representation of a <xref:System.Windows.Media.Media3D.Size3D> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn11":::  
   
  ]]></format>
         </remarks>
@@ -817,7 +817,7 @@
  The following example shows how to check if two <xref:System.Windows.Media.Media3D.Size3D> structures are equal. It also shows how to assign values to a <xref:System.Windows.Media.Media3D.Size3D> structure when the structure is being declared and after the structure has been declared.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Size3D/Empty/Window1.xaml.cs" id="Snippetmil3dsize3dn2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Size3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dsize3dn2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Size3D/Empty/window1.xaml.vb" id="Snippetmil3dsize3dn2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Transform3D.xml b/xml/System.Windows.Media.Media3D/Transform3D.xml
index 94a69e06ecc..54e6d152c78 100644
--- a/xml/System.Windows.Media.Media3D/Transform3D.xml
+++ b/xml/System.Windows.Media.Media3D/Transform3D.xml
@@ -534,7 +534,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/MatrixCamera/Overview/Window1.xaml.cs" id="Snippetmatrixtransform3dview3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MatrixTransform3DView/visualbasic/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/MatrixCamera/Overview/window1.xaml.vb" id="Snippetmatrixtransform3dview3dn4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/TranslateTransform3D.xml b/xml/System.Windows.Media.Media3D/TranslateTransform3D.xml
index 29a7d9f61b1..8a71e51b9b3 100644
--- a/xml/System.Windows.Media.Media3D/TranslateTransform3D.xml
+++ b/xml/System.Windows.Media.Media3D/TranslateTransform3D.xml
@@ -92,7 +92,7 @@
  The following code excerpt creates a new TranslateTransform3D.  To use the transformation, add it to the <xref:System.Windows.Media.Media3D.Model3D> to be transformed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/Window1.xaml.cs" id="Snippet3doverview3dn19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/3DOverview/visualbasic/window1.xaml.vb" id="Snippet3doverview3dn19":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/AxisAngleRotation3D/Overview/window1.xaml.vb" id="Snippet3doverview3dn19":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.Media3D/Vector3D.xml b/xml/System.Windows.Media.Media3D/Vector3D.xml
index 0d09331e86f..03082b796d1 100644
--- a/xml/System.Windows.Media.Media3D/Vector3D.xml
+++ b/xml/System.Windows.Media.Media3D/Vector3D.xml
@@ -119,7 +119,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn2":::
 
  ]]></format>
         </remarks>
@@ -172,7 +172,7 @@
  The following example shows how to use the <xref:System.Windows.Media.Media3D.Vector3D.Add%2A> method to translate a <xref:System.Windows.Media.Media3D.Point3D> structure by a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn4":::
 
  ]]></format>
         </remarks>
@@ -217,7 +217,7 @@
  The following example shows how to add two <xref:System.Windows.Media.Media3D.Vector3D> structures.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn3":::
 
  ]]></format>
         </remarks>
@@ -267,7 +267,7 @@
  The following example shows how to get the angle between two <xref:System.Windows.Media.Media3D.Vector3D> structures.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn22":::
 
  ]]></format>
         </remarks>
@@ -309,7 +309,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn23":::
 
  ]]></format>
         </remarks>
@@ -353,7 +353,7 @@
  The following example shows how to divide a <xref:System.Windows.Media.Media3D.Vector3D> structure by a scalar.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn16":::
 
  ]]></format>
         </remarks>
@@ -398,7 +398,7 @@
  The following example shows how to calculate the dot product of two <xref:System.Windows.Media.Media3D.Vector3D> structures.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn24":::
 
  ]]></format>
         </remarks>
@@ -457,7 +457,7 @@
  The following example shows how to check if an <xref:System.Object> and a <xref:System.Windows.Media.Media3D.Vector3D> structure are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn27":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn27":::
 
  ]]></format>
         </remarks>
@@ -551,7 +551,7 @@
  The following example checks whether two <xref:System.Windows.Media.Media3D.Vector3D> structures are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn26":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn26":::
 
  ]]></format>
         </remarks>
@@ -591,7 +591,7 @@
  The following example shows how to get the hashcode of a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn33":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn33":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn33":::
 
  ]]></format>
         </remarks>
@@ -634,7 +634,7 @@
  The following example shows how to get the length of a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn19":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn19":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn19":::
 
  ]]></format>
         </remarks>
@@ -677,7 +677,7 @@
  The following example shows how to get the square of the length of a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn20":::
 
  ]]></format>
         </remarks>
@@ -730,7 +730,7 @@
  The following example shows how to multiply a scalar by a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn13":::
 
  ]]></format>
         </remarks>
@@ -775,7 +775,7 @@
  The following example shows how to multiply a <xref:System.Windows.Media.Media3D.Vector3D> structure by a scalar.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn13":::
 
  ]]></format>
         </remarks>
@@ -820,7 +820,7 @@
  The following example shows how to use the <xref:System.Windows.Media.Media3D.Vector3D.Multiply%2A> method to transform a <xref:System.Windows.Media.Media3D.Vector3D> structure by a <xref:System.Windows.Media.Media3D.Matrix3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn15":::
 
  ]]></format>
         </remarks>
@@ -864,7 +864,7 @@
  The following example shows how to negate a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn30":::
 
  ]]></format>
         </remarks>
@@ -908,7 +908,7 @@
  The following example shows how to normalize a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn21":::
 
  ]]></format>
         </remarks>
@@ -961,7 +961,7 @@
  The following example shows how to use the overloaded addition operator to translate a <xref:System.Windows.Media.Media3D.Point3D> structure by a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn2":::
 
  ]]></format>
         </remarks>
@@ -1006,7 +1006,7 @@
  The following example shows how to use the overloaded addition operator to add two <xref:System.Windows.Media.Media3D.Vector3D> structures.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn3":::
 
  ]]></format>
         </remarks>
@@ -1051,7 +1051,7 @@
  The following example shows how to use the overloaded addition operator to divide a <xref:System.Windows.Media.Media3D.Vector3D> structure by a scalar.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadeddivisionoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadeddivisionoperatorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadeddivisionoperatorexample":::
 
  ]]></format>
         </remarks>
@@ -1104,7 +1104,7 @@
  The following example shows how to use the overloaded equality operator to check if two <xref:System.Windows.Media.Media3D.Vector3D> structures are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn25":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn25":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn25":::
 
  ]]></format>
         </remarks>
@@ -1237,7 +1237,7 @@
  The following example shows how to use the overloaded inequality operator to check if two <xref:System.Windows.Media.Media3D.Vector3D> structures are not equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn29":::
 
  ]]></format>
         </remarks>
@@ -1290,7 +1290,7 @@
  The following example shows how to multiple a scalar by a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn11":::
 
  ]]></format>
         </remarks>
@@ -1335,7 +1335,7 @@
  The following example shows how to multiply a <xref:System.Windows.Media.Media3D.Vector3D> structure by a scalar.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn10":::
 
  ]]></format>
         </remarks>
@@ -1380,7 +1380,7 @@
  The following example shows how to use the overloaded multiplication operator to transform a <xref:System.Windows.Media.Media3D.Vector3D> structure by a <xref:System.Windows.Media.Media3D.Matrix3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn12":::
 
  ]]></format>
         </remarks>
@@ -1434,7 +1434,7 @@
  The following example shows how to use the overloaded subtraction operator to subtract a <xref:System.Windows.Media.Media3D.Point3D> structure from a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn8":::
 
  ]]></format>
         </remarks>
@@ -1479,7 +1479,7 @@
  The following example shows how to use the overloaded subtraction operator to subtract a <xref:System.Windows.Media.Media3D.Vector3D> structure from a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn6":::
 
  ]]></format>
         </remarks>
@@ -1527,7 +1527,7 @@
  The following example shows how to use the overloaded negation operator to negate a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn31":::
 
  ]]></format>
         </remarks>
@@ -1570,7 +1570,7 @@
  The following example shows how to use the <xref:System.Windows.Media.Media3D.Vector3D.Parse%2A> method to convert a string representation of a vector3D into a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn28":::
 
  ]]></format>
         </remarks>
@@ -1621,7 +1621,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn9":::
 
  ]]></format>
         </remarks>
@@ -1666,7 +1666,7 @@
  The following example shows how to subtract a <xref:System.Windows.Media.Media3D.Vector3D> structure from a <xref:System.Windows.Media.Media3D.Vector3D> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn7":::
 
  ]]></format>
         </remarks>
@@ -1770,7 +1770,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn32":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn32":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn32":::
 
  ]]></format>
         </remarks>
@@ -1856,7 +1856,7 @@
  The following example shows how to calculate the dot product of two <xref:System.Windows.Media.Media3D.Vector3D> structures.  It also shows how to assign values to a <xref:System.Windows.Media.Media3D.Vector3D> structure when the structure is being declared and after the structure has been declared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn24":::
 
  ]]></format>
         </remarks>
@@ -1904,7 +1904,7 @@
  The following example shows how to calculate the dot product of two <xref:System.Windows.Media.Media3D.Vector3D> structures.  It also shows how to assign values to a <xref:System.Windows.Media.Media3D.Vector3D> structure when the structure is being declared and after the structure has been declared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn24":::
 
  ]]></format>
         </remarks>
@@ -1952,7 +1952,7 @@
  The following example shows how to calculate the dot product of two <xref:System.Windows.Media.Media3D.Vector3D> structures.  It also shows how to assign values to a <xref:System.Windows.Media.Media3D.Vector3D> structure when the structure is being declared and after the structure has been declared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.Media3D/Matrix3D/Overview/Window1.xaml.cs" id="Snippetmil3dvectorsample3dn24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Vector3DSample/visualbasic/window1.xaml.vb" id="Snippetmil3dvectorsample3dn24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.Media3D/Matrix3D/Overview/window1.xaml.vb" id="Snippetmil3dvectorsample3dn24":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.TextFormatting/MinMaxParagraphWidth.xml b/xml/System.Windows.Media.TextFormatting/MinMaxParagraphWidth.xml
index 28ebaee30df..6b95beb8d2c 100644
--- a/xml/System.Windows.Media.TextFormatting/MinMaxParagraphWidth.xml
+++ b/xml/System.Windows.Media.TextFormatting/MinMaxParagraphWidth.xml
@@ -33,7 +33,7 @@
  The following example shows how to use the <xref:System.Windows.Media.TextFormatting.MinMaxParagraphWidth.MinWidth%2A> property to generate the minimum paragraph width for the formatted lines of text.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/Window1.xaml.cs" id="Snippettextformattingsnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml.vb" id="Snippettextformattingsnippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml.vb" id="Snippettextformattingsnippet3":::  
   
  ]]></format>
     </remarks>
@@ -224,7 +224,7 @@
  The following example shows how to use the <xref:System.Windows.Media.TextFormatting.MinMaxParagraphWidth.MinWidth%2A> property to generate the minimum paragraph width for the formatted lines of text.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/Window1.xaml.cs" id="Snippettextformattingsnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml.vb" id="Snippettextformattingsnippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml.vb" id="Snippettextformattingsnippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.TextFormatting/TextFormatter.xml b/xml/System.Windows.Media.TextFormatting/TextFormatter.xml
index e99967a8207..31e114fcb59 100644
--- a/xml/System.Windows.Media.TextFormatting/TextFormatter.xml
+++ b/xml/System.Windows.Media.TextFormatting/TextFormatter.xml
@@ -88,7 +88,7 @@ Interaction between the text layout client and the TextFormatter object
  The following example shows how to use a <xref:System.Windows.Media.TextFormatting.TextFormatter> object to generate formatted lines of text that can be displayed as drawing objects.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/Window1.xaml.cs" id="Snippettextformattingsnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml.vb" id="Snippettextformattingsnippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml.vb" id="Snippettextformattingsnippet1":::  
   
  ]]></format>
     </remarks>
@@ -279,7 +279,7 @@ Interaction between the text layout client and the TextFormatter object
  The following example shows how to use the <xref:System.Windows.Media.TextFormatting.TextFormatter.FormatLine%2A> method to return a formatted <xref:System.Windows.Media.TextFormatting.TextLine>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/Window1.xaml.cs" id="Snippettextformattingsnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml.vb" id="Snippettextformattingsnippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml.vb" id="Snippettextformattingsnippet2":::  
   
  ]]></format>
         </remarks>
@@ -391,7 +391,7 @@ Minimum paragraph width
  The following example shows how to use the <xref:System.Windows.Media.TextFormatting.TextFormatter.FormatMinMaxParagraphWidth%2A> method to generate the minimum paragraph width for the formatted lines of text.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/Window1.xaml.cs" id="Snippettextformattingsnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/window1.xaml.vb" id="Snippettextformattingsnippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/window1.xaml.vb" id="Snippettextformattingsnippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media.TextFormatting/TextRun.xml b/xml/System.Windows.Media.TextFormatting/TextRun.xml
index b25a417d06b..bf236453e33 100644
--- a/xml/System.Windows.Media.TextFormatting/TextRun.xml
+++ b/xml/System.Windows.Media.TextFormatting/TextRun.xml
@@ -47,7 +47,7 @@
  In the following example, an override for the <xref:System.Windows.Media.TextFormatting.TextSource.GetTextRun%2A> method is implemented.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/CustomTextClasses.cs" id="Snippettextformattingsnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/customtextclasses.vb" id="Snippettextformattingsnippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/customtextclasses.vb" id="Snippettextformattingsnippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media.TextFormatting/TextSource.xml b/xml/System.Windows.Media.TextFormatting/TextSource.xml
index 3c9132bb2cc..63bf204a1e8 100644
--- a/xml/System.Windows.Media.TextFormatting/TextSource.xml
+++ b/xml/System.Windows.Media.TextFormatting/TextSource.xml
@@ -200,7 +200,7 @@
  In the following example, an override for the <xref:System.Windows.Media.TextFormatting.TextSource.GetTextRun%2A> method is implemented.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/CustomTextClasses.cs" id="Snippettextformattingsnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextFormattingSnippets/visualbasic/customtextclasses.vb" id="Snippettextformattingsnippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media.TextFormatting/MinMaxParagraphWidth/Overview/customtextclasses.vb" id="Snippettextformattingsnippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/BitmapScalingMode.xml b/xml/System.Windows.Media/BitmapScalingMode.xml
index 31877c57b69..4fea7f38bbc 100644
--- a/xml/System.Windows.Media/BitmapScalingMode.xml
+++ b/xml/System.Windows.Media/BitmapScalingMode.xml
@@ -33,7 +33,7 @@
  The following example shows how to use the <xref:System.Windows.Media.RenderOptions.SetBitmapScalingMode%2A?displayProperty=nameWithType> method to set the bitmap scale mode to `LowQuality` for an image object:
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/CachingHint.xml b/xml/System.Windows.Media/CachingHint.xml
index 1a9c8410a67..cb093807b95 100644
--- a/xml/System.Windows.Media/CachingHint.xml
+++ b/xml/System.Windows.Media/CachingHint.xml
@@ -37,7 +37,7 @@
  The following example shows how to use the caching hint option for a <xref:System.Windows.Media.DrawingBrush>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/Color.xml b/xml/System.Windows.Media/Color.xml
index b1a82541700..6bba2eb463a 100644
--- a/xml/System.Windows.Media/Color.xml
+++ b/xml/System.Windows.Media/Color.xml
@@ -558,7 +558,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/Color/FromArgb/CreateColorsFromExample.cs" id="Snippetfromargbexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/createcolorsfromexample.vb" id="Snippetfromargbexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/Color/FromArgb/createcolorsfromexample.vb" id="Snippetfromargbexample":::
 
  ]]></format>
         </remarks>
@@ -613,7 +613,7 @@
  The following example shows how to use the <xref:System.Windows.Media.Color.FromAValues%2A> method to create a <xref:System.Windows.Media.Color> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/Color/FromArgb/CreateColorsFromExample.cs" id="Snippetfromavaluesexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/createcolorsfromexample.vb" id="Snippetfromavaluesexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/Color/FromArgb/createcolorsfromexample.vb" id="Snippetfromavaluesexample":::
 
  ]]></format>
         </remarks>
@@ -668,7 +668,7 @@
  The following example shows how to use the <xref:System.Windows.Media.Color.FromRgb%2A> method to create a <xref:System.Windows.Media.Color> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/Color/FromArgb/CreateColorsFromExample.cs" id="Snippetfromrgbexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/createcolorsfromexample.vb" id="Snippetfromrgbexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/Color/FromArgb/createcolorsfromexample.vb" id="Snippetfromrgbexample":::
 
  ]]></format>
         </remarks>
@@ -723,7 +723,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/Color/FromArgb/CreateColorsFromExample.cs" id="Snippetfromscrgbexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/createcolorsfromexample.vb" id="Snippetfromscrgbexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/Color/FromArgb/createcolorsfromexample.vb" id="Snippetfromscrgbexample":::
 
  ]]></format>
         </remarks>
@@ -776,7 +776,7 @@
  The following example shows how to use the <xref:System.Windows.Media.Color.FromValues%2A> method to create a <xref:System.Windows.Media.Color> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/Color/FromArgb/CreateColorsFromExample.cs" id="Snippetfromvaluesexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/createcolorsfromexample.vb" id="Snippetfromvaluesexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/Color/FromArgb/createcolorsfromexample.vb" id="Snippetfromvaluesexample":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/CompositionTarget.xml b/xml/System.Windows.Media/CompositionTarget.xml
index 3fcad99909f..3121ce36f6f 100644
--- a/xml/System.Windows.Media/CompositionTarget.xml
+++ b/xml/System.Windows.Media/CompositionTarget.xml
@@ -103,7 +103,7 @@
  The <xref:System.Windows.Media.CompositionTarget.Rendering> event is raised during the Windows Presentation Foundation (WPF) rendering process. The following example shows how you register an <xref:System.EventHandler> delegate to the static <xref:System.Windows.Media.CompositionTarget.Rendering> method on <xref:System.Windows.Media.CompositionTarget>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/CompositionTarget/Rendering/Window1.xaml.cs" id="Snippetcompositiontarget1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CompositionTargetSample/visualbasic/window1.xaml.vb" id="Snippetcompositiontarget1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/CompositionTarget/Rendering/window1.xaml.vb" id="Snippetcompositiontarget1":::
 
  You can use your rendering event handler to create custom drawing content. This event handler gets called once per frame. Each time that Windows Presentation Foundation (WPF) marshals the persisted rendering data in the visual tree across to the composition tree, your event handler is called. In addition, if changes to the visual tree force updates to the composition tree, your event handler is also called. Note that your event handler is called after layout has been computed. However, you can modify layout in your event handler, which means that layout will be computed once more before rendering.
 
diff --git a/xml/System.Windows.Media/ContainerVisual.xml b/xml/System.Windows.Media/ContainerVisual.xml
index aeb3cfcb810..4281c4d4e37 100644
--- a/xml/System.Windows.Media/ContainerVisual.xml
+++ b/xml/System.Windows.Media/ContainerVisual.xml
@@ -34,7 +34,7 @@
  The following example shows how to create a <xref:System.Windows.Media.ContainerVisual> object that is used as the parent for two <xref:System.Windows.Media.DrawingVisual> objects. Objects that are added to the <xref:System.Windows.Media.ContainerVisual> object must be added in reverse z-order (bottom to top) to ensure they are rendering in the correct drawing order. In order for the visual tree to be enumerated correctly, the example provides overridden implementations of the <xref:System.Windows.Media.ContainerVisual.GetVisualChild%2A> method and <xref:System.Windows.Media.ContainerVisual.VisualChildrenCount%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/ContainerVisual/Overview/Window1.xaml.cs" id="Snippetcontainervisualhost01":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/window1.xaml.vb" id="Snippetcontainervisualhost01":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/window1.xaml.vb" id="Snippetcontainervisualhost01":::  
   
  ]]></format>
     </remarks>
@@ -68,7 +68,7 @@
  The following example shows how to create a new instance of a <xref:System.Windows.Media.ContainerVisual> object, and then add child visual objects to it.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/ContainerVisual/.ctor/Window1.xaml.cs" id="Snippetcontainervisualsnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml.vb" id="Snippetcontainervisualsnippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml.vb" id="Snippetcontainervisualsnippet1":::  
   
  ]]></format>
         </remarks>
@@ -220,7 +220,7 @@
  The following example shows how to retrieve the <xref:System.Windows.Media.VisualCollection> from a <xref:System.Windows.Media.ContainerVisual> object.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/ContainerVisual/.ctor/Window1.xaml.cs" id="Snippetcontainervisualsnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml.vb" id="Snippetcontainervisualsnippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml.vb" id="Snippetcontainervisualsnippet3":::  
   
  ]]></format>
         </remarks>
@@ -292,7 +292,7 @@
  The following example shows how to retrieve the bounding rectangle of a <xref:System.Windows.Media.ContainerVisual> object.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/ContainerVisual/.ctor/Window1.xaml.cs" id="Snippetcontainervisualsnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml.vb" id="Snippetcontainervisualsnippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml.vb" id="Snippetcontainervisualsnippet4":::  
   
  ]]></format>
         </remarks>
@@ -335,7 +335,7 @@
  The following example shows how to retrieve the bounding rectangle of a <xref:System.Windows.Media.ContainerVisual> object's descendants.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/ContainerVisual/.ctor/Window1.xaml.cs" id="Snippetcontainervisualsnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml.vb" id="Snippetcontainervisualsnippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml.vb" id="Snippetcontainervisualsnippet4":::  
   
  ]]></format>
         </remarks>
@@ -411,7 +411,7 @@
  The following example shows how to create a <xref:System.Windows.Media.ContainerVisual> object that is used as the parent for two <xref:System.Windows.Media.DrawingVisual> objects. Objects that are added to the <xref:System.Windows.Media.ContainerVisual> object must be added in reverse z-order (bottom to top) to ensure they are rendering in the correct drawing order. In order for the visual tree to be enumerated correctly, the example provides overridden implementations of the <xref:System.Windows.Media.ContainerVisual.GetVisualChild%2A> method and <xref:System.Windows.Media.ContainerVisual.VisualChildrenCount%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/ContainerVisual/Overview/Window1.xaml.cs" id="Snippetcontainervisualhost01":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/window1.xaml.vb" id="Snippetcontainervisualhost01":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/window1.xaml.vb" id="Snippetcontainervisualhost01":::  
   
  ]]></format>
         </remarks>
@@ -472,7 +472,7 @@
  The following example shows how to retrieve the <xref:System.Windows.Media.HitTestResult> return value from the <xref:System.Windows.Media.ContainerVisual.HitTest%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/ContainerVisual/.ctor/Window1.xaml.cs" id="Snippetcontainervisualsnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualSnippets/visualbasic/window1.xaml.vb" id="Snippetcontainervisualsnippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/ContainerVisual/.ctor/window1.xaml.vb" id="Snippetcontainervisualsnippet2":::  
   
  ]]></format>
         </remarks>
@@ -722,7 +722,7 @@
  The following example shows how to create a <xref:System.Windows.Media.ContainerVisual> object that is used as the parent for two <xref:System.Windows.Media.DrawingVisual> objects. Objects that are added to the <xref:System.Windows.Media.ContainerVisual> object must be added in reverse z-order (bottom to top) to ensure they are rendering in the correct drawing order. In order for the visual tree to be enumerated correctly, the example provides overridden implementations of the <xref:System.Windows.Media.ContainerVisual.GetVisualChild%2A> method and <xref:System.Windows.Media.ContainerVisual.VisualChildrenCount%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/ContainerVisual/Overview/Window1.xaml.cs" id="Snippetcontainervisualhost01":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContainerVisualHost/visualbasic/window1.xaml.vb" id="Snippetcontainervisualhost01":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/ContainerVisual/Overview/window1.xaml.vb" id="Snippetcontainervisualhost01":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/DisableDpiAwarenessAttribute.xml b/xml/System.Windows.Media/DisableDpiAwarenessAttribute.xml
index a10bd84c06b..42f852cdf4b 100644
--- a/xml/System.Windows.Media/DisableDpiAwarenessAttribute.xml
+++ b/xml/System.Windows.Media/DisableDpiAwarenessAttribute.xml
@@ -43,7 +43,7 @@
  The following example shows how to disable Dpi awareness for the WPF application by declaring <xref:System.Windows.Media.DisableDpiAwarenessAttribute> at the assembly level.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/Window1.xaml.cs" id="Snippetdisabledpiawarenessattribute1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DisableDpiAwareness/visualbasic/window1.xaml.vb" id="Snippetdisabledpiawarenessattribute1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DisableDpiAwarenessAttribute/Overview/window1.xaml.vb" id="Snippetdisabledpiawarenessattribute1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/DrawingContext.xml b/xml/System.Windows.Media/DrawingContext.xml
index 5ade50bee1f..54cb59dca59 100644
--- a/xml/System.Windows.Media/DrawingContext.xml
+++ b/xml/System.Windows.Media/DrawingContext.xml
@@ -42,12 +42,12 @@
  The following example retrieves a <xref:System.Windows.Media.DrawingContext> from a <xref:System.Windows.Media.DrawingVisual> and uses it to draw a rectangle.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/Window1.xaml.cs" id="Snippet101":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb" id="Snippet101":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb" id="Snippet101":::  
   
  The next example demonstrates the <xref:System.Windows.Media.DrawingContext.PushOpacity%2A>, <xref:System.Windows.Media.DrawingContext.PushEffect%2A>, and <xref:System.Windows.Media.DrawingContext.Pop%2A> commands. The <xref:System.Windows.Media.DrawingContext> is obtained from a <xref:System.Windows.Media.DrawingGroup> and displayed using an <xref:System.Windows.Controls.Image> control.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/PushEffectExample.cs" id="Snippetpusheffectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/pusheffectexample.vb" id="Snippetpusheffectexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/pusheffectexample.vb" id="Snippetpusheffectexamplewholepage":::  
   
  ]]></format>
     </remarks>
@@ -858,7 +858,7 @@
  The following example shows the effect of the <xref:System.Windows.Media.DrawingContext.Pop%2A> command.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/PopExample.cs" id="Snippetpopexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/popexample.vb" id="Snippetpopexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/popexample.vb" id="Snippetpopexamplewholepage":::  
   
  The following illustration shows this example's output:  
   
@@ -954,7 +954,7 @@
  The following example demonstrates the <xref:System.Windows.Media.DrawingContext.PushOpacity%2A>, <xref:System.Windows.Media.DrawingContext.PushEffect%2A>, and <xref:System.Windows.Media.DrawingContext.Pop%2A> commands.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/PushEffectExample.cs" id="Snippetpusheffectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/pusheffectexample.vb" id="Snippetpusheffectexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/pusheffectexample.vb" id="Snippetpusheffectexamplewholepage":::  
   
  ]]></format>
         </remarks>
@@ -1048,7 +1048,7 @@
  The following example demonstrates the <xref:System.Windows.Media.DrawingContext.PushOpacity%2A>, <xref:System.Windows.Media.DrawingContext.PushEffect%2A>, and <xref:System.Windows.Media.DrawingContext.Pop%2A> commands.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/PushEffectExample.cs" id="Snippetpusheffectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingContext_procedural_snip/visualbasic/pusheffectexample.vb" id="Snippetpusheffectexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/pusheffectexample.vb" id="Snippetpusheffectexamplewholepage":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/DrawingVisual.xml b/xml/System.Windows.Media/DrawingVisual.xml
index 28cc7778253..a668ec9b482 100644
--- a/xml/System.Windows.Media/DrawingVisual.xml
+++ b/xml/System.Windows.Media/DrawingVisual.xml
@@ -76,7 +76,7 @@
  In the following example, a <xref:System.Windows.Media.DrawingVisual> object is created, and a rectangle is drawn into its drawing context. Notice that you must call the <xref:System.Windows.Media.DrawingContext.Close%2A> method of the <xref:System.Windows.Media.DrawingContext> to persist drawing content.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/Window1.xaml.cs" id="Snippet101":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb" id="Snippet101":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb" id="Snippet101":::  
   
  ]]></format>
         </remarks>
@@ -121,7 +121,7 @@
  In the following example, the <xref:System.Windows.Media.DrawingGroup> value of each <xref:System.Windows.Media.DrawingVisual> in a host visual is enumerated.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/DrawingVisual.xaml.cs" id="Snippetdrawingvisualsnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/drawingvisual.xaml.vb" id="Snippetdrawingvisualsnippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/drawingvisual.xaml.vb" id="Snippetdrawingvisualsnippet1":::  
   
  ]]></format>
         </remarks>
@@ -246,12 +246,12 @@
  In the following example, a <xref:System.Windows.Media.DrawingVisual> object is created, and its <xref:System.Windows.Media.DrawingContext> returned.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/Window1.xaml.cs" id="Snippet101":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb" id="Snippet101":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb" id="Snippet101":::  
   
  The order in which you draw into the drawing context is important - each succeeding drawing is drawn on top of the others. In the following example, the rectangle is drawn first, then the text.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Snippets.cs" id="Snippetrenderordersnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/snippets.vb" id="Snippetrenderordersnippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/snippets.vb" id="Snippetrenderordersnippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/EdgeMode.xml b/xml/System.Windows.Media/EdgeMode.xml
index 0fa771285f2..221b105bf26 100644
--- a/xml/System.Windows.Media/EdgeMode.xml
+++ b/xml/System.Windows.Media/EdgeMode.xml
@@ -35,7 +35,7 @@
  The following example shows how to use the <xref:System.Windows.Media.RenderOptions.SetEdgeMode%2A?displayProperty=nameWithType> method to set the edge mode for a drawing primitive to `Aliased`:  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Snippets.cs" id="Snippetsetedgemode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/snippets.vb" id="Snippetsetedgemode":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/snippets.vb" id="Snippetsetedgemode":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/FontFamily.xml b/xml/System.Windows.Media/FontFamily.xml
index 83d50a11860..32648a1a951 100644
--- a/xml/System.Windows.Media/FontFamily.xml
+++ b/xml/System.Windows.Media/FontFamily.xml
@@ -48,7 +48,7 @@ Example of typefaces that are members of the "Times New Roman" font family
  Most user interface (UI) elements, such as <xref:System.Windows.Controls.Button> and <xref:System.Windows.Controls.TextBlock>, provide a <xref:System.Windows.Controls.Control.FontFamily%2A> property that can be used to specify a font for the text content of a control. You define the font by setting that property with a <xref:System.Windows.Media.FontFamily> value. The following examples show how to reference a font, in Extensible Application Markup Language (XAML) and in code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontfallbacksnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontfallbacksnippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontfallbacksnippet3":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml" id="Snippetfontfallbacksnippet3":::
 
  In the preceding example, the font that is referenced, "Comic Sans MS", is referred to by its *friendly name*. Also, in this example the font is assumed to be in the system font collection.
@@ -57,18 +57,18 @@ Example of typefaces that are members of the "Times New Roman" font family
  A Windows Presentation Foundation (WPF) application can specify a directory, other than the directory that contains the systems font collection, for resolving font references. The friendly name of the font can specify an absolute uniform resource identifier (URI) value to resolve the font reference, as shown in the following Extensible Application Markup Language (XAML) and code examples.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontPackageSnippets.xaml.cs" id="Snippetfontpackagesnippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet6":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontPackageSnippets.xaml" id="Snippetfontpackagesnippet6":::
 
  The friendly name of the font can also specify a relative URI value, which requires a base URI to resolve the font reference. The <xref:System.Windows.Media.FontFamily.BaseUri%2A> property of the <xref:System.Windows.Media.FontFamily> object corresponds to the base URI value. The following code example shows how to create a font reference that is composed of a base URI value and a relative URI value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontPackageSnippets.xaml.cs" id="Snippetfontpackagesnippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet7":::
 
  You can use a base URI value when you reference a font that is packaged as part of the application. For example, the base URI value can be a "pack://application" URI, which lets you reference fonts that are packaged as application resources. The following code example shows a font reference that is composed of a base URI value and a relative URI value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontPackageSnippets.xaml.cs" id="Snippetfontpackagesnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet2":::
 
  When a <xref:System.Windows.Media.FontFamily> is specified as an attribute in markup, the base URI value is always implied - its value is the URI of the XAML page. The implied base URI value is used with the relative URI value in the friendly name string to obtain the location of the font. In the following Extensible Application Markup Language (XAML) example, notice that the relative URI value uses the "./" notation, which means "in the current folder" of the base URI value.
 
@@ -93,13 +93,13 @@ Example of typefaces that are members of the "Times New Roman" font family
  The following examples show how to define a font fallback sequence, in Extensible Application Markup Language (XAML) and in code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontfallbacksnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontfallbacksnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontfallbacksnippet1":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml" id="Snippetfontfallbacksnippet1":::
 
  Any one of the fonts in the fallback sequence can specify font locations. In the following examples, "Pericles Light" is referenced as an application resource, and "Verdana" is referenced as a system font collection member.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontfallbacksnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontfallbacksnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontfallbacksnippet2":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml" id="Snippetfontfallbacksnippet2":::
 
 ## Composite Fonts
@@ -239,7 +239,7 @@ Example of typefaces that are members of the "Times New Roman" font family
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet103":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet103":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet103":::
 
  ]]></format>
         </remarks>
@@ -286,7 +286,7 @@ Example of typefaces that are members of the "Times New Roman" font family
  The following code shows a font reference that is composed of a base URI value and a relative URI value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontPackageSnippets.xaml.cs" id="Snippetfontpackagesnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet2":::
 
  ]]></format>
         </remarks>
@@ -357,7 +357,7 @@ Example of typefaces that are members of the "Times New Roman" font family
  The following example shows the results of retrieving the <xref:System.Windows.Media.FontFamily.BaseUri%2A> property from a <xref:System.Windows.Media.FontFamily> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontPackageSnippets.xaml.cs" id="Snippetfontpackagesnippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet9":::
 
  ]]></format>
         </remarks>
@@ -483,7 +483,7 @@ Example of typefaces that are members of the "Times New Roman" font family
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet106":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet106":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet106":::
 
  ]]></format>
         </remarks>
@@ -549,7 +549,7 @@ Example of typefaces that are members of the "Times New Roman" font family
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet107":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet107":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet107":::
 
  ]]></format>
         </remarks>
@@ -621,7 +621,7 @@ Example of typefaces that are members of the "Times New Roman" font family
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet104":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet104":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet104":::
 
  ]]></format>
         </remarks>
@@ -694,7 +694,7 @@ Example of typefaces that are members of the "Times New Roman" font family
  The following example shows the results of retrieving the <xref:System.Windows.Media.FontFamily.BaseUri%2A> and <xref:System.Windows.Media.FontFamily.Source%2A> property values from a <xref:System.Windows.Media.FontFamily> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontPackageSnippets.xaml.cs" id="Snippetfontpackagesnippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontpackagesnippets.xaml.vb" id="Snippetfontpackagesnippet10":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/FontFamilyMap.xml b/xml/System.Windows.Media/FontFamilyMap.xml
index 57455afe88f..ccf63f6fe08 100644
--- a/xml/System.Windows.Media/FontFamilyMap.xml
+++ b/xml/System.Windows.Media/FontFamilyMap.xml
@@ -64,7 +64,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontMapSnippets.xaml.cs" id="Snippetfontmapsnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet1":::
 
  ]]></format>
         </remarks>
@@ -119,7 +119,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontMapSnippets.xaml.cs" id="Snippetfontmapsnippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet5":::
 
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontMapSnippets.xaml.cs" id="Snippetfontmapsnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet2":::
 
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontMapSnippets.xaml.cs" id="Snippetfontmapsnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet3":::
 
  ]]></format>
         </remarks>
@@ -265,7 +265,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontMapSnippets.xaml.cs" id="Snippetfontmapsnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontmapsnippets.xaml.vb" id="Snippetfontmapsnippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/Fonts.xml b/xml/System.Windows.Media/Fonts.xml
index ca236c08b2b..dcb5c2ef891 100644
--- a/xml/System.Windows.Media/Fonts.xml
+++ b/xml/System.Windows.Media/Fonts.xml
@@ -82,7 +82,7 @@ Example of typefaces that are "Times New Roman" font family members
  The following example shows how to use this method to return the collection of <xref:System.Windows.Media.FontFamily> objects from a font location.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet100":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet100":::  
   
  ]]></format>
         </remarks>
@@ -125,12 +125,12 @@ Example of typefaces that are "Times New Roman" font family members
  The following example shows how to use this method to return the collection of <xref:System.Windows.Media.FontFamily> objects from a base URI location.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontssnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet1":::  
   
  To return the collection of <xref:System.Windows.Media.FontFamily> objects in an application's resources, use the "pack://application" URI notation shown in the following example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontssnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet2":::  
   
  ]]></format>
         </remarks>
@@ -174,7 +174,7 @@ Example of typefaces that are "Times New Roman" font family members
  The following example shows how to use this method to return the collection of <xref:System.Windows.Media.FontFamily> objects from the resolved font location. In this case, the application contains a subdirectory named "resources".  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontssnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet3":::  
   
  ]]></format>
         </remarks>
@@ -225,7 +225,7 @@ Example of typefaces that are "Times New Roman" font family members
  The following example shows how to use this method to return the collection of <xref:System.Windows.Media.Typeface> objects from a font location.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontssnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet4":::  
   
  ]]></format>
         </remarks>
@@ -268,12 +268,12 @@ Example of typefaces that are "Times New Roman" font family members
  The following example shows how to use this method to return the collection of <xref:System.Windows.Media.Typeface> objects from a base URI location.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontssnippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet5":::  
   
  To return the collection of <xref:System.Windows.Media.Typeface> objects in an application's resources, use the "pack://application" URI notation shown in the following example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontssnippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet6":::  
   
  ]]></format>
         </remarks>
@@ -317,7 +317,7 @@ Example of typefaces that are "Times New Roman" font family members
  The following example shows how to use this method to return the collection of <xref:System.Windows.Media.Typeface> objects from the resolved font location. In this case, the application contains a subdirectory named "resources".  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontFamilySnippets.xaml.cs" id="Snippetfontssnippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontfamilysnippets.xaml.vb" id="Snippetfontssnippet7":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/FormattedText.xml b/xml/System.Windows.Media/FormattedText.xml
index fe42f4c4b31..8847a0a551f 100644
--- a/xml/System.Windows.Media/FormattedText.xml
+++ b/xml/System.Windows.Media/FormattedText.xml
@@ -41,7 +41,7 @@ Example of a formatted text string
  The following example creates a <xref:System.Windows.Media.FormattedText> object and then applies several formatting styles to the text.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/Overview/Window1.xaml.cs" id="Snippetformattedtextsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
 
  ]]></format>
     </remarks>
@@ -407,7 +407,7 @@ Example of an image brush applied to the stroke
  The following example shows how to create a <xref:System.Windows.Media.FormattedText> object and to retrieve the geometries of the formatted text and its bounding box.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/BuildGeometry/OutlineTextControl.cs" id="Snippetcreatetext":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/outlinetextcontrol.vb" id="Snippetcreatetext":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/outlinetextcontrol.vb" id="Snippetcreatetext":::
 
  ]]></format>
         </remarks>
@@ -468,7 +468,7 @@ Example of an image brush applied to the stroke and highlight
  The following example shows how to create a <xref:System.Windows.Media.FormattedText> object and to retrieve the geometries of the formatted text and its bounding box.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/BuildGeometry/OutlineTextControl.cs" id="Snippetcreatetext":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/OutlineTextControlViewer/visualbasic/outlinetextcontrol.vb" id="Snippetcreatetext":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/BuildGeometry/outlinetextcontrol.vb" id="Snippetcreatetext":::
 
  ]]></format>
         </remarks>
@@ -763,7 +763,7 @@ Example of an image brush applied to the stroke and highlight
  The following example creates a <xref:System.Windows.Media.FormattedText> object and then applies several formatting styles to the text, including <xref:System.Windows.Media.FormattedText.MaxTextHeight%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/Overview/Window1.xaml.cs" id="Snippetformattedtextsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
 
  ]]></format>
         </remarks>
@@ -816,7 +816,7 @@ Example of an image brush applied to the stroke and highlight
  The following example creates a <xref:System.Windows.Media.FormattedText> object and then applies several formatting styles to the text, including <xref:System.Windows.Media.FormattedText.MaxTextWidth%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/Overview/Window1.xaml.cs" id="Snippetformattedtextsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
 
  ]]></format>
         </remarks>
@@ -864,7 +864,7 @@ Minimum text width
  The following example shows how to use the <xref:System.Windows.Media.FormattedText.MinWidth%2A> property to generate the minimum text width for the formatted lines of text.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/Overview/Window1.xaml.cs" id="Snippetformattedtextsnippets3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb" id="Snippetformattedtextsnippets3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb" id="Snippetformattedtextsnippets3":::
 
  ]]></format>
         </remarks>
@@ -1355,7 +1355,7 @@ Minimum text width
  The following example creates a <xref:System.Windows.Media.FormattedText> object and then applies several formatting styles to the text, including <xref:System.Windows.Media.FormattedText.SetFontSize%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/Overview/Window1.xaml.cs" id="Snippetformattedtextsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
 
  ]]></format>
         </remarks>
@@ -1551,7 +1551,7 @@ Minimum text width
  The following example creates a <xref:System.Windows.Media.FormattedText> object and then applies several formatting styles to the text, including <xref:System.Windows.Media.FormattedText.SetFontStyle%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/Overview/Window1.xaml.cs" id="Snippetformattedtextsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
 
  ]]></format>
         </remarks>
@@ -1741,7 +1741,7 @@ Minimum text width
  The following example creates a <xref:System.Windows.Media.FormattedText> object and then applies several formatting styles to the text, including <xref:System.Windows.Media.FormattedText.SetFontWeight%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/Overview/Window1.xaml.cs" id="Snippetformattedtextsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
 
  ]]></format>
         </remarks>
@@ -1838,7 +1838,7 @@ Minimum text width
  The following example creates a <xref:System.Windows.Media.FormattedText> object and then applies several formatting styles to the text, including <xref:System.Windows.Media.FormattedText.SetForegroundBrush%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/FormattedText/Overview/Window1.xaml.cs" id="Snippetformattedtextsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FormattedTextSnippets/visualbasic/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/FormattedText/Overview/window1.xaml.vb" id="Snippetformattedtextsnippets1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/GeometryHitTestParameters.xml b/xml/System.Windows.Media/GeometryHitTestParameters.xml
index b819c5a50b8..2b572597138 100644
--- a/xml/System.Windows.Media/GeometryHitTestParameters.xml
+++ b/xml/System.Windows.Media/GeometryHitTestParameters.xml
@@ -39,7 +39,7 @@
  The following example shows how to set up a hit test using <xref:System.Windows.Media.GeometryHitTestParameters> for the <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> method. The <xref:System.Windows.Point> value that is passed to the `OnMouseDown` method is used to create a <xref:System.Windows.Media.Geometry> object in order to expand the range of the hit test.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/GeometryHitTest.cs" id="Snippethittestingoverviewsnippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb" id="Snippethittestingoverviewsnippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb" id="Snippethittestingoverviewsnippet10":::
 
  The <xref:System.Windows.Media.GeometryHitTestResult.IntersectionDetail%2A> property of <xref:System.Windows.Media.GeometryHitTestResult> provides information about the results of a hit test that uses a <xref:System.Windows.Media.Geometry> as a hit test parameter. The following illustration shows the relationship between the hit test geometry (the blue circle) and the target object (the red square).
 
@@ -82,7 +82,7 @@ Intersection between hit test geometry and target object
  The following example shows how to set up a hit test by using <xref:System.Windows.Media.GeometryHitTestParameters> for the <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> method. A <xref:System.Windows.Point> value is used to create a <xref:System.Windows.Media.Geometry> object to expand the range of the hit test over a wider display area.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/GeometryHitTest.cs" id="Snippethittestingoverviewsnippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb" id="Snippethittestingoverviewsnippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb" id="Snippethittestingoverviewsnippet12":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/GeometryHitTestResult.xml b/xml/System.Windows.Media/GeometryHitTestResult.xml
index 4502677f3f9..30fe870d688 100644
--- a/xml/System.Windows.Media/GeometryHitTestResult.xml
+++ b/xml/System.Windows.Media/GeometryHitTestResult.xml
@@ -72,7 +72,7 @@
  The following example shows how to create a <xref:System.Windows.Media.GeometryHitTestResult> object and use it as a return value for an overridden implementation of <xref:System.Windows.Media.Visual.HitTestCore%2A>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/GeometryHitTest.cs" id="Snippethittestingoverviewsnippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb" id="Snippethittestingoverviewsnippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb" id="Snippethittestingoverviewsnippet13":::  
   
  ]]></format>
         </remarks>
@@ -126,7 +126,7 @@ The intersection between a hit test geometry and a target object
  The following example shows how to use the <xref:System.Windows.Media.GeometryHitTestResult.IntersectionDetail%2A> property of <xref:System.Windows.Media.GeometryHitTestResult>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/GeometryHitTest.cs" id="Snippethittestingoverviewsnippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb" id="Snippethittestingoverviewsnippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb" id="Snippethittestingoverviewsnippet11":::  
   
  ]]></format>
         </remarks>
@@ -164,7 +164,7 @@ The intersection between a hit test geometry and a target object
  The following example shows how to reference the value of the <xref:System.Windows.Media.GeometryHitTestResult.VisualHit%2A> property in a hit test callback procedure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/GeometryHitTest.cs" id="Snippethittestingoverviewsnippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb" id="Snippethittestingoverviewsnippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb" id="Snippethittestingoverviewsnippet11":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/GlyphTypeface.xml b/xml/System.Windows.Media/GlyphTypeface.xml
index 7f061328e39..884cd0e4f81 100644
--- a/xml/System.Windows.Media/GlyphTypeface.xml
+++ b/xml/System.Windows.Media/GlyphTypeface.xml
@@ -141,7 +141,7 @@ Metric values of glyph characters
  The following example shows how to create a new instance of the <xref:System.Windows.Media.GlyphTypeface> class by specifying a font file location.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GlyphTypeface/.ctor/Window1.xaml.cs" id="Snippetglyphtypefacesnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/window1.xaml.vb" id="Snippetglyphtypefacesnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/window1.xaml.vb" id="Snippetglyphtypefacesnippet1":::
 
  ]]></format>
         </remarks>
@@ -227,7 +227,7 @@ Metric values of glyph characters
  The following example shows how to return the collection of advance heights from the glyphs in the font.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GlyphTypeface/.ctor/Window1.xaml.cs" id="Snippetglyphtypefacesnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/window1.xaml.vb" id="Snippetglyphtypefacesnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/window1.xaml.vb" id="Snippetglyphtypefacesnippet2":::
 
  ]]></format>
         </remarks>
@@ -510,7 +510,7 @@ Metric values of glyph characters
  The following example shows how to return the collection of copyright information for the <xref:System.Windows.Media.GlyphTypeface> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GlyphTypeface/.ctor/Window1.xaml.cs" id="Snippetglyphtypefacesnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GlyphTypefaceSnippets/visualbasic/window1.xaml.vb" id="Snippetglyphtypefacesnippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GlyphTypeface/.ctor/window1.xaml.vb" id="Snippetglyphtypefacesnippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/HitTestFilterBehavior.xml b/xml/System.Windows.Media/HitTestFilterBehavior.xml
index 2c124717105..05ea8a01f3d 100644
--- a/xml/System.Windows.Media/HitTestFilterBehavior.xml
+++ b/xml/System.Windows.Media/HitTestFilterBehavior.xml
@@ -39,7 +39,7 @@ Pruning a visual tree
  The following example shows how to return a `HitTestFilterBehavior` value from a hit test filter callback method. In this case, the filter skips labels and their descendants and hit tests everything else.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet106":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet106":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet106":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/HitTestFilterCallback.xml b/xml/System.Windows.Media/HitTestFilterCallback.xml
index c72444f7730..c57d643a28c 100644
--- a/xml/System.Windows.Media/HitTestFilterCallback.xml
+++ b/xml/System.Windows.Media/HitTestFilterCallback.xml
@@ -47,12 +47,12 @@ Pruning a visual tree
  The following example shows how to invoke <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> by using a <xref:System.Windows.Media.HitTestFilterCallback> value. The corresponding hit test callback method is also defined.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet104":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet104":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet104":::
 
  The following example shows how to return a <xref:System.Windows.Media.HitTestFilterBehavior> value from a hit test filter callback method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet106":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet106":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet106":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/HitTestResult.xml b/xml/System.Windows.Media/HitTestResult.xml
index 336b27704e1..51fd9359107 100644
--- a/xml/System.Windows.Media/HitTestResult.xml
+++ b/xml/System.Windows.Media/HitTestResult.xml
@@ -34,7 +34,7 @@
  The following example shows how to retrieve the <xref:System.Windows.Media.HitTestResult> return value from the <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet100":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet100":::  
   
  ]]></format>
     </remarks>
@@ -84,7 +84,7 @@
  The following example shows how to retrieve the <xref:System.Windows.Media.HitTestResult.VisualHit%2A> property value in a hit test callback method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet102":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet102":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet102":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/HitTestResultBehavior.xml b/xml/System.Windows.Media/HitTestResultBehavior.xml
index 343577d25c3..6d975846ba9 100644
--- a/xml/System.Windows.Media/HitTestResultBehavior.xml
+++ b/xml/System.Windows.Media/HitTestResultBehavior.xml
@@ -35,7 +35,7 @@
  The following example shows how to return a `HitTestResultBehavior` value from a hit test results callback method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet102":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet102":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet102":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/HitTestResultCallback.xml b/xml/System.Windows.Media/HitTestResultCallback.xml
index 91816bc63d8..17b3b8697af 100644
--- a/xml/System.Windows.Media/HitTestResultCallback.xml
+++ b/xml/System.Windows.Media/HitTestResultCallback.xml
@@ -41,7 +41,7 @@
  The following example shows how to invoke <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> by using a <xref:System.Windows.Media.HitTestResultCallback> value. The corresponding hit test callback method is also defined.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/Window1.xaml.cs" id="Snippet103":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb" id="Snippet103":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb" id="Snippet103":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/IntersectionDetail.xml b/xml/System.Windows.Media/IntersectionDetail.xml
index 82d43e1d2d5..8182e735894 100644
--- a/xml/System.Windows.Media/IntersectionDetail.xml
+++ b/xml/System.Windows.Media/IntersectionDetail.xml
@@ -36,7 +36,7 @@ Intersection between hit test geometry and visual geometry during hit testing
  The following example shows how to use the <xref:System.Windows.Media.GeometryHitTestResult.IntersectionDetail%2A> property of <xref:System.Windows.Media.GeometryHitTestResult>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/GeometryHitTest.cs" id="Snippethittestingoverviewsnippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb" id="Snippethittestingoverviewsnippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb" id="Snippethittestingoverviewsnippet11":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Media/PixelFormat.xml b/xml/System.Windows.Media/PixelFormat.xml
index 0782f98222a..f0e49360abc 100644
--- a/xml/System.Windows.Media/PixelFormat.xml
+++ b/xml/System.Windows.Media/PixelFormat.xml
@@ -60,7 +60,7 @@
  The following example shows how to create a <xref:System.Windows.Media.PixelFormat> and find the value of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/PixelFormatsExample.cs" id="Snippetpixelformatexample1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/PixelFormatsExample.vb" id="Snippetpixelformatexample1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/PixelFormatsExample.vb" id="Snippetpixelformatexample1":::
 
  ]]></format>
     </remarks>
@@ -109,7 +109,7 @@
  The following example shows how to use the <xref:System.Windows.Media.PixelFormat.BitsPerPixel%2A> property to find the number of bits-per-pixel of a pixel format.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/PixelFormatsExample.cs" id="Snippetpixelformatexample1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/PixelFormatsExample.vb" id="Snippetpixelformatexample1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/PixelFormatsExample.vb" id="Snippetpixelformatexample1":::
 
  ]]></format>
         </remarks>
@@ -320,7 +320,7 @@
  The following example shows how to use the <xref:System.Windows.Media.PixelFormat.Masks%2A> property to get the bit masks associated with the pixel format.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PixelFormat/Overview/PixelFormatsExample.cs" id="Snippetpixelformatexample1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ImagingSnippetGallery_procedural_snip/VB/PixelFormatsExample.vb" id="Snippetpixelformatexample1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PixelFormat/Overview/PixelFormatsExample.vb" id="Snippetpixelformatexample1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/PointCollection.xml b/xml/System.Windows.Media/PointCollection.xml
index 4cec4751c27..e0e1ad1a272 100644
--- a/xml/System.Windows.Media/PointCollection.xml
+++ b/xml/System.Windows.Media/PointCollection.xml
@@ -1589,7 +1589,7 @@
  The following code example shows how to create a string representation of <xref:System.Windows.Media.PointCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PointCollection/ToString/Window1.xaml.cs" id="Snippetpointcollectiontostring":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/window1.xaml.vb" id="Snippetpointcollectiontostring":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PointCollection/ToString/window1.xaml.vb" id="Snippetpointcollectiontostring":::
 
  ]]></format>
         </remarks>
@@ -1631,7 +1631,7 @@
  The following code example shows how to get a string representation of a <xref:System.Windows.Media.PointCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PointCollection/ToString/Window1.xaml.cs" id="Snippetpointcollectiontostring":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointCollection/visualbasic/window1.xaml.vb" id="Snippetpointcollectiontostring":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PointCollection/ToString/window1.xaml.vb" id="Snippetpointcollectiontostring":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/PointHitTestParameters.xml b/xml/System.Windows.Media/PointHitTestParameters.xml
index 2129122486e..0e096b1b57a 100644
--- a/xml/System.Windows.Media/PointHitTestParameters.xml
+++ b/xml/System.Windows.Media/PointHitTestParameters.xml
@@ -70,7 +70,7 @@
  The following example shows how to invoke <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> by using a <xref:System.Windows.Media.PointHitTestParameters> value.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet101":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet101":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet101":::  
   
  ]]></format>
         </remarks>
@@ -114,7 +114,7 @@
  The following example shows how to override default hit test support in a user-defined visual object. In this case, the <xref:System.Windows.Media.PointHitTestParameters.HitPoint%2A> value is simply returned as part of <xref:System.Windows.Media.PointHitTestResult>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet107":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet107":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet107":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/PointHitTestResult.xml b/xml/System.Windows.Media/PointHitTestResult.xml
index 8857028566b..050d7b3d41c 100644
--- a/xml/System.Windows.Media/PointHitTestResult.xml
+++ b/xml/System.Windows.Media/PointHitTestResult.xml
@@ -34,7 +34,7 @@
  The following example shows how to retrieve the <xref:System.Windows.Media.PointHitTestResult> return value from the <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet100":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet100":::  
   
  ]]></format>
     </remarks>
@@ -80,7 +80,7 @@
  The following example shows how to override default hit test support in a user-defined visual object. In this case, a new <xref:System.Windows.Media.PointHitTestResult> is created and returned from the overridden method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet107":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet107":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet107":::  
   
  ]]></format>
         </remarks>
@@ -157,7 +157,7 @@
  The following example shows how to access the <xref:System.Windows.Media.PointHitTestResult.VisualHit%2A> property in a hit test results callback function.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet102":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet102":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet102":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/PolyBezierSegment.xml b/xml/System.Windows.Media/PolyBezierSegment.xml
index bd57cddd854..6240d7982ec 100644
--- a/xml/System.Windows.Media/PolyBezierSegment.xml
+++ b/xml/System.Windows.Media/PolyBezierSegment.xml
@@ -41,7 +41,7 @@
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/PolyBezierSegmentExample.xaml" id="Snippetpolybeziersegmentexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/PolyBezierSegmentExample.cs" id="Snippetpolybeziersegmentcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/polybeziersegmentexample.vb" id="Snippetpolybeziersegmentcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/polybeziersegmentexample.vb" id="Snippetpolybeziersegmentcodeexamplewholepage":::
 
  ]]></format>
     </remarks>
@@ -268,7 +268,7 @@
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/PolyBezierSegmentExample.xaml" id="Snippetpolybeziersegmentexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/PolyBezierSegmentExample.cs" id="Snippetpolybeziersegmentcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/polybeziersegmentexample.vb" id="Snippetpolybeziersegmentcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/polybeziersegmentexample.vb" id="Snippetpolybeziersegmentcodeexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/PolyLineSegment.xml b/xml/System.Windows.Media/PolyLineSegment.xml
index 6da9564e061..3fbaf5ba75c 100644
--- a/xml/System.Windows.Media/PolyLineSegment.xml
+++ b/xml/System.Windows.Media/PolyLineSegment.xml
@@ -37,7 +37,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Media/PolyLineSegment/Overview/GeometryExamples.xaml" id="Snippetgraphicsmmpathgeometrycomplexmultiexample":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyLineSegment/Overview/GeometryExamples.cs" id="Snippetgraphicsmmpathgeometrycomplexmultiexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/geometryexamples.vb" id="Snippetgraphicsmmpathgeometrycomplexmultiexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/geometryexamples.vb" id="Snippetgraphicsmmpathgeometrycomplexmultiexample":::
 
  ]]></format>
     </remarks>
@@ -266,7 +266,7 @@
  The following example shows how to use the <xref:System.Windows.Media.PolyLineSegment.Points%2A> property to set the segment points of a <xref:System.Windows.Media.PolyLineSegment>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyLineSegment/Overview/GeometryExamples.cs" id="Snippetgraphicsmmpathgeometrycomplexmultiexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometryOverviewSamples_procedural_snip/visualbasic/geometryexamples.vb" id="Snippetgraphicsmmpathgeometrycomplexmultiexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyLineSegment/Overview/geometryexamples.vb" id="Snippetgraphicsmmpathgeometrycomplexmultiexample":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/PolyQuadraticBezierSegment.xml b/xml/System.Windows.Media/PolyQuadraticBezierSegment.xml
index e854522bb15..250e8816ca8 100644
--- a/xml/System.Windows.Media/PolyQuadraticBezierSegment.xml
+++ b/xml/System.Windows.Media/PolyQuadraticBezierSegment.xml
@@ -37,7 +37,7 @@
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/PolyQuadraticBezierSegmentExample.xaml" id="Snippetpolyquadraticbeziersegmentexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/PolyQuadraticBezierSegmentExample.cs" id="Snippetpolyquadraticbeziersegmentcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/polyquadraticbeziersegmentexample.vb" id="Snippetpolyquadraticbeziersegmentcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/polyquadraticbeziersegmentexample.vb" id="Snippetpolyquadraticbeziersegmentcodeexamplewholepage":::
 
  ]]></format>
     </remarks>
@@ -266,7 +266,7 @@
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/PolyQuadraticBezierSegmentExample.xaml" id="Snippetpolyquadraticbeziersegmentexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/PolyQuadraticBezierSegmentExample.cs" id="Snippetpolyquadraticbeziersegmentcodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/polyquadraticbeziersegmentexample.vb" id="Snippetpolyquadraticbeziersegmentcodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/polyquadraticbeziersegmentexample.vb" id="Snippetpolyquadraticbeziersegmentcodeexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/RenderCapability.xml b/xml/System.Windows.Media/RenderCapability.xml
index 00eca327aa7..58415a58564 100644
--- a/xml/System.Windows.Media/RenderCapability.xml
+++ b/xml/System.Windows.Media/RenderCapability.xml
@@ -312,7 +312,7 @@
  The following example shows how to return the rendering tier for the current thread.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrendercapability1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrendercapability1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrendercapability1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/RenderOptions.xml b/xml/System.Windows.Media/RenderOptions.xml
index 806d7e8dd90..a9000c39459 100644
--- a/xml/System.Windows.Media/RenderOptions.xml
+++ b/xml/System.Windows.Media/RenderOptions.xml
@@ -575,7 +575,7 @@
  The following example shows how to get the <xref:System.Windows.Media.BitmapScalingMode> for an image object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet1":::
 
  ]]></format>
         </remarks>
@@ -625,7 +625,7 @@
  The following example shows how to retrieve the caching hint values for a <xref:System.Windows.Media.DrawingBrush>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet4":::
 
  ]]></format>
         </remarks>
@@ -676,7 +676,7 @@
  The following example shows how to retrieve the caching hint values for a <xref:System.Windows.Media.DrawingBrush>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet4":::
 
  ]]></format>
         </remarks>
@@ -727,7 +727,7 @@
  The following example shows how to retrieve the caching hint values for a <xref:System.Windows.Media.DrawingBrush>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet4":::
 
  ]]></format>
         </remarks>
@@ -920,7 +920,7 @@
  The following example shows how to set the <xref:System.Windows.Media.BitmapScalingMode> for an <xref:System.Windows.Controls.Image> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet2":::
 
  ]]></format>
         </remarks>
@@ -970,7 +970,7 @@
  The following example shows how to use the caching hint option for a <xref:System.Windows.Media.DrawingBrush>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet3":::
 
  ]]></format>
         </remarks>
@@ -1021,7 +1021,7 @@
  The following example shows how to use the caching hint option for a <xref:System.Windows.Media.DrawingBrush>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet3":::
 
  ]]></format>
         </remarks>
@@ -1078,7 +1078,7 @@
  The following example shows how to use the caching hint option for a <xref:System.Windows.Media.DrawingBrush>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/BitmapScalingMode/Overview/Window1.xaml.cs" id="Snippetrenderoptionssnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RenderOptions/visualbasic/window1.xaml.vb" id="Snippetrenderoptionssnippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/BitmapScalingMode/Overview/window1.xaml.vb" id="Snippetrenderoptionssnippet3":::
 
  ]]></format>
         </remarks>
@@ -1162,7 +1162,7 @@
  The following example shows how to use the <xref:System.Windows.Media.RenderOptions.SetEdgeMode%2A> method to set the edge mode for a visual object to <xref:System.Windows.Media.EdgeMode.Aliased>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Snippets.cs" id="Snippetsetedgemode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/snippets.vb" id="Snippetsetedgemode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/snippets.vb" id="Snippetsetedgemode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/StreamGeometryContext.xml b/xml/System.Windows.Media/StreamGeometryContext.xml
index 50213eafb8a..9cf0628de1e 100644
--- a/xml/System.Windows.Media/StreamGeometryContext.xml
+++ b/xml/System.Windows.Media/StreamGeometryContext.xml
@@ -88,7 +88,7 @@
  The following example shows how to draw an arc using the <xref:System.Windows.Media.StreamGeometryContext.ArcTo%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/StreamGeometryArcToExample.cs" id="Snippetstreamgeometryarctoexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometryarctoexample.vb" id="Snippetstreamgeometryarctoexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometryarctoexample.vb" id="Snippetstreamgeometryarctoexamplewholepage":::  
   
  ]]></format>
         </remarks>
@@ -198,7 +198,7 @@
  The following example shows how to draw a Bezier curve using the <xref:System.Windows.Media.StreamGeometryContext.BezierTo%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/StreamGeometryBezierToExample.cs" id="Snippetstreamgeometrybeziertoexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrybeziertoexample.vb" id="Snippetstreamgeometrybeziertoexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrybeziertoexample.vb" id="Snippetstreamgeometrybeziertoexamplewholepage":::  
   
  ]]></format>
         </remarks>
@@ -299,7 +299,7 @@
  The following example shows how to draw a triangle using the <xref:System.Windows.Media.StreamGeometryContext.LineTo%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/StreamGeometryTriangleExample.cs" id="Snippetstreamgeometrytriangleexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrytriangleexample.vb" id="Snippetstreamgeometrytriangleexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrytriangleexample.vb" id="Snippetstreamgeometrytriangleexamplewholepage":::  
   
  ]]></format>
         </remarks>
@@ -357,7 +357,7 @@
  The following example shows how to draw multiple connected Bezier curves using the <xref:System.Windows.Media.StreamGeometryContext.PolyBezierTo%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/StreamGeometryPolyBezierToExample.cs" id="Snippetstreamgeometrypolybeziertoexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolybeziertoexample.vb" id="Snippetstreamgeometrypolybeziertoexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolybeziertoexample.vb" id="Snippetstreamgeometrypolybeziertoexamplewholepage":::  
   
  ]]></format>
         </remarks>
@@ -416,7 +416,7 @@
  The following example shows how to draw a triangle using the <xref:System.Windows.Media.StreamGeometryContext.PolyLineTo%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/StreamGeometryPolyLineToExample.cs" id="Snippetstreamgeometrypolylinetoexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolylinetoexample.vb" id="Snippetstreamgeometrypolylinetoexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolylinetoexample.vb" id="Snippetstreamgeometrypolylinetoexamplewholepage":::  
   
  ]]></format>
         </remarks>
@@ -472,7 +472,7 @@
  The following example shows how to draw multiple connected quadratic Bezier curves using the <xref:System.Windows.Media.StreamGeometryContext.PolyQuadraticBezierTo%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/StreamGeometryPolyQuadraticBezierToExample.cs" id="Snippetstreamgeometrypolyquadraticbeziertoexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometrypolyquadraticbeziertoexample.vb" id="Snippetstreamgeometrypolyquadraticbeziertoexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometrypolyquadraticbeziertoexample.vb" id="Snippetstreamgeometrypolyquadraticbeziertoexamplewholepage":::  
   
  ]]></format>
         </remarks>
@@ -535,7 +535,7 @@
  The following example shows how to draw a quadratic Bezier curve using the <xref:System.Windows.Media.StreamGeometryContext.QuadraticBezierTo%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/PolyBezierSegment/Overview/StreamGeometryQuadraticBezierToExample.cs" id="Snippetstreamgeometryquadraticbeziertoexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_procedural_snip/visualbasic/streamgeometryquadraticbeziertoexample.vb" id="Snippetstreamgeometryquadraticbeziertoexamplewholepage":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/PolyBezierSegment/Overview/streamgeometryquadraticbeziertoexample.vb" id="Snippetstreamgeometryquadraticbeziertoexamplewholepage":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/TextEffect.xml b/xml/System.Windows.Media/TextEffect.xml
index 75bac308552..b8462835c5f 100644
--- a/xml/System.Windows.Media/TextEffect.xml
+++ b/xml/System.Windows.Media/TextEffect.xml
@@ -94,7 +94,7 @@
  The following code example shows how to create a <xref:System.Windows.Media.TextEffect>, set its properties, and add it to the <xref:System.Windows.Media.TextEffectCollection> of the specified text object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/TextEffect/.ctor/TextEffect.xaml.cs" id="Snippettexteffectsnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/texteffect.xaml.vb" id="Snippettexteffectsnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/texteffect.xaml.vb" id="Snippettexteffectsnippet1":::
 
  ]]></format>
         </remarks>
@@ -140,7 +140,7 @@
  The following code example shows how to call the <xref:System.Windows.Media.TextEffect.%23ctor%2A> constructor. Notice that in this case, the `transform` and `clip` parameters are set to `null`, since those parameters values are not needed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/TextEffect/.ctor/TextEffect.xaml.cs" id="Snippettexteffectsnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/texteffect.xaml.vb" id="Snippettexteffectsnippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/texteffect.xaml.vb" id="Snippettexteffectsnippet3":::
 
  ]]></format>
         </remarks>
@@ -364,7 +364,7 @@
  The following code example shows how to create an animatable <xref:System.Windows.Media.Brush> and set it as the <xref:System.Windows.Media.TextEffect.Foreground%2A> property value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/TextEffect/.ctor/TextEffect.xaml.cs" id="Snippettexteffectsnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/texteffect.xaml.vb" id="Snippettexteffectsnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/texteffect.xaml.vb" id="Snippettexteffectsnippet1":::
 
  ]]></format>
         </remarks>
@@ -442,7 +442,7 @@
  The following code example shows how you can set <xref:System.Windows.Media.TextEffect.PositionCount%2A> value to the maximum <xref:System.Int32> value to ensure that all characters in the text are affected.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/TextEffect/.ctor/TextEffect.xaml.cs" id="Snippettexteffectsnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextOverview/visualbasic/texteffect.xaml.vb" id="Snippettexteffectsnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/TextEffect/.ctor/texteffect.xaml.vb" id="Snippettexteffectsnippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/TileBrush.xml b/xml/System.Windows.Media/TileBrush.xml
index 76e33528e5e..f670f3b0b87 100644
--- a/xml/System.Windows.Media/TileBrush.xml
+++ b/xml/System.Windows.Media/TileBrush.xml
@@ -638,7 +638,7 @@ Similar TileBrush but with tiling and a different Viewport setting
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/BrushOverviewExamples_snip/XAML/ViewboxExample.xaml" id="Snippetgraphicsmmtilebrushviewboxwithstretchtiling":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/TileBrush/Viewbox/ViewboxExample.cs" id="Snippetgraphicsmmtilebrushviewboxwithstretchtiling":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BrushOverviewExamples_procedural_snip/visualbasic/viewboxexample.vb" id="Snippetgraphicsmmtilebrushviewboxwithstretchtiling":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/TileBrush/Viewbox/viewboxexample.vb" id="Snippetgraphicsmmtilebrushviewboxwithstretchtiling":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/Typeface.xml b/xml/System.Windows.Media/Typeface.xml
index 76159e73335..170d8f914aa 100644
--- a/xml/System.Windows.Media/Typeface.xml
+++ b/xml/System.Windows.Media/Typeface.xml
@@ -32,7 +32,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet102":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet102":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet102":::  
   
  ]]></format>
     </remarks>
@@ -77,7 +77,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet105":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet105":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet105":::  
   
  ]]></format>
         </remarks>
@@ -119,7 +119,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet105":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet105":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet105":::  
   
  ]]></format>
         </remarks>
@@ -168,7 +168,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet105":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet105":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet105":::  
   
  ]]></format>
         </remarks>
@@ -446,7 +446,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet108":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet108":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet108":::  
   
  ]]></format>
         </remarks>
@@ -563,7 +563,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet109":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet109":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet109":::  
   
  ]]></format>
         </remarks>
@@ -723,7 +723,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippet110":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippet110":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippet110":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/Visual.xml b/xml/System.Windows.Media/Visual.xml
index 7e998ba1320..42219a0cee2 100644
--- a/xml/System.Windows.Media/Visual.xml
+++ b/xml/System.Windows.Media/Visual.xml
@@ -147,7 +147,7 @@ Visual class hierarchy
 > Although it is possible to use <xref:System.Windows.Media.VisualCollection> to create parent-child relationships between visual objects, it is more efficient to provide your own custom storage implementation when only one child is linked to a parent.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/Visual/AddVisualChild/Window1.xaml.cs" id="Snippetaddvisualchild01":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/window1.xaml.vb" id="Snippetaddvisualchild01":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/window1.xaml.vb" id="Snippetaddvisualchild01":::
 
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@ Visual class hierarchy
  The following example defines an overridden implementation of <xref:System.Windows.Media.Visual.GetVisualChild%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/Window1.xaml.cs" id="Snippet102b":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb" id="Snippet102b":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb" id="Snippet102b":::
 
  ]]></format>
         </remarks>
@@ -293,7 +293,7 @@ Visual class hierarchy
  The following example shows how to override the <xref:System.Windows.Media.Visual.HitTestCore%28System.Windows.Media.GeometryHitTestParameters%29> method. One reason you might want to override this method is to provide additional functionality during the hit testing process.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/GeometryHitTest.cs" id="Snippethittestingoverviewsnippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/geometryhittest.vb" id="Snippethittestingoverviewsnippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/geometryhittest.vb" id="Snippethittestingoverviewsnippet13":::
 
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@ Visual class hierarchy
  The following example shows how to override the <xref:System.Windows.Media.Visual.HitTestCore%28System.Windows.Media.PointHitTestParameters%29> method. One reason you might want to override this method is to provide additional functionality during the hit testing process.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet107":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet107":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet107":::
 
  ]]></format>
         </remarks>
@@ -519,7 +519,7 @@ Visual class hierarchy
  The following example defines an overridden implementation of <xref:System.Windows.Media.Visual.OnVisualParentChanged%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Window1.xaml.cs" id="Snippetvisualsnippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb" id="Snippetvisualsnippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb" id="Snippetvisualsnippet10":::
 
  ]]></format>
         </remarks>
@@ -647,7 +647,7 @@ Visual class hierarchy
 > Although it is possible to use <xref:System.Windows.Media.VisualCollection> to create parent-child relationships between visual objects, it is more efficient to provide your own custom storage implementation when only one child is linked to a parent.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/Visual/AddVisualChild/Window1.xaml.cs" id="Snippetaddvisualchild01":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/AddVisualChild/visualbasic/window1.xaml.vb" id="Snippetaddvisualchild01":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/Visual/AddVisualChild/window1.xaml.vb" id="Snippetaddvisualchild01":::
 
  ]]></format>
         </remarks>
@@ -731,7 +731,7 @@ Visual class hierarchy
  Alternatively, you can use the <xref:System.Windows.Media.VisualTreeHelper.GetOffset%2A?displayProperty=nameWithType> method to retrieve the offset of a visual object relative to its parent. The offset values are contained within the returned <xref:System.Windows.Vector> value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Window1.xaml.cs" id="Snippetvisualsnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb" id="Snippetvisualsnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb" id="Snippetvisualsnippet2":::
 
 
 
@@ -743,7 +743,7 @@ Visual class hierarchy
  The following code example shows how to use the <xref:System.Windows.Media.Visual.TransformToAncestor%2A> method to retrieve the offset of the <xref:System.Windows.Controls.TextBlock> relative to the containing <xref:System.Windows.Window>. The offset values are contained in the returned <xref:System.Windows.Media.GeneralTransform>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Window1.xaml.cs" id="Snippetvisualsnippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb" id="Snippetvisualsnippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb" id="Snippetvisualsnippet5":::
 
  The offset takes into account the <xref:System.Windows.FrameworkElement.Margin%2A> values for all objects within the containing <xref:System.Windows.Window>. In this case, <xref:System.Windows.Vector.X%2A> is 28, and <xref:System.Windows.Vector.Y%2A> is 28.
 
@@ -796,7 +796,7 @@ Visual class hierarchy
  The following code example shows how to use the <xref:System.Windows.Media.Visual.TransformToDescendant%2A> method to retrieve the offset of the <xref:System.Windows.Controls.StackPanel> relative to its child <xref:System.Windows.Controls.TextBlock>. The offset values are contained within the returned <xref:System.Windows.Media.GeneralTransform> value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Window1.xaml.cs" id="Snippetvisualsnippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb" id="Snippetvisualsnippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb" id="Snippetvisualsnippet9":::
 
  The offset takes into account the <xref:System.Windows.FrameworkElement.Margin%2A> values for all objects. In this case, <xref:System.Windows.Vector.X%2A> is -4, and <xref:System.Windows.Vector.Y%2A> is -4. The offset values are negative values because the parent object is negatively offset relative to its child object.
 
@@ -853,7 +853,7 @@ Visual class hierarchy
  The following code example shows how to use the <xref:System.Windows.Media.Visual.TransformToVisual%2A> method to retrieve the offset of the <xref:System.Windows.Controls.StackPanel> relative to its child <xref:System.Windows.Controls.TextBlock>. The offset values are contained within the returned <xref:System.Windows.Media.GeneralTransform> value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Window1.xaml.cs" id="Snippetvisualsnippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb" id="Snippetvisualsnippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb" id="Snippetvisualsnippet8":::
 
  The offset takes into account the <xref:System.Windows.FrameworkElement.Margin%2A> values for all objects. In this case, <xref:System.Windows.Vector.X%2A> is -4, and <xref:System.Windows.Vector.Y%2A> is -4. The offset values are negative values because the parent object is negatively offset relative to its child object.
 
@@ -1045,7 +1045,7 @@ Visual class hierarchy
  The following example defines an overridden implementation of <xref:System.Windows.Media.Visual.VisualChildrenCount%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/Window1.xaml.cs" id="Snippet102a":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb" id="Snippet102a":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb" id="Snippet102a":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Media/VisualBrush.xml b/xml/System.Windows.Media/VisualBrush.xml
index c7e11d9425e..a8f1285026a 100644
--- a/xml/System.Windows.Media/VisualBrush.xml
+++ b/xml/System.Windows.Media/VisualBrush.xml
@@ -153,7 +153,7 @@
  The following example shows the effects of the <xref:System.Windows.Media.VisualBrush.AutoLayoutContent%2A> property on a non-parented <xref:System.Windows.UIElement>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/VisualBrush/AutoLayoutContent/AutoLayoutContentExample.cs" id="Snippetautolayoutcontentnonparenteduielementexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/autolayoutcontentexample.vb" id="Snippetautolayoutcontentnonparenteduielementexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/autolayoutcontentexample.vb" id="Snippetautolayoutcontentnonparenteduielementexample":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/visualbrush_markup_snip/XAML/AutoLayoutContentExample.xaml" id="Snippetautolayoutcontentnonparenteduielementexample":::
 
  The following illustration shows the example's output:
@@ -163,7 +163,7 @@
  The next example shows the effects of the <xref:System.Windows.Media.VisualBrush.AutoLayoutContent%2A> property on a parented <xref:System.Windows.UIElement>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/VisualBrush/AutoLayoutContent/AutoLayoutContentExample.cs" id="Snippetautolayoutcontentparenteduielementexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/visualbrush_markup_snip/visualbasic/autolayoutcontentexample.vb" id="Snippetautolayoutcontentparenteduielementexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/VisualBrush/AutoLayoutContent/autolayoutcontentexample.vb" id="Snippetautolayoutcontentparenteduielementexample":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/visualbrush_markup_snip/XAML/AutoLayoutContentExample.xaml" id="Snippetautolayoutcontentparenteduielementexample":::
 
  The following illustration shows the example's output:
diff --git a/xml/System.Windows.Media/VisualCollection.xml b/xml/System.Windows.Media/VisualCollection.xml
index 1ccd06edb0f..1c7523b2520 100644
--- a/xml/System.Windows.Media/VisualCollection.xml
+++ b/xml/System.Windows.Media/VisualCollection.xml
@@ -41,7 +41,7 @@
  The following example shows how to create a <xref:System.Windows.Media.VisualCollection> and add members to it.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/Window1.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb" id="Snippet100":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb" id="Snippet100":::
 
 > [!NOTE]
 > For the complete sample, see [Hit Test Using DrawingVisuals Sample](https://go.microsoft.com/fwlink/?LinkID=159994).
@@ -123,7 +123,7 @@
  The following example shows how to create a <xref:System.Windows.Media.VisualCollection> and add members to it.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingContext/Overview/Window1.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DrawingVisualSample/visualbasic/window1.xaml.vb" id="Snippet100":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingContext/Overview/window1.xaml.vb" id="Snippet100":::
 
 > [!NOTE]
 > For the complete sample, see [Hit Test Using DrawingVisuals Sample](https://go.microsoft.com/fwlink/?LinkID=159994).
diff --git a/xml/System.Windows.Media/VisualTreeHelper.xml b/xml/System.Windows.Media/VisualTreeHelper.xml
index 9af5e1b92e4..9ddd59d7a07 100644
--- a/xml/System.Windows.Media/VisualTreeHelper.xml
+++ b/xml/System.Windows.Media/VisualTreeHelper.xml
@@ -36,7 +36,7 @@
  The following example shows how to enumerate all the descendants of a visual object, which is a technique you might want to use if you were interested in serializing all the rendering information of a visual object hierarchy.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/VisualTreeHelper/Overview/Window1.xaml.cs" id="Snippet101":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml.vb" id="Snippet101":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml.vb" id="Snippet101":::
 
  ]]></format>
     </remarks>
@@ -184,7 +184,7 @@
  The following example shows how to enumerate all the descendants of a visual object. This is a technique you might use if you are interested in serializing all the rendering information of a visual object hierarchy or are performing analysis or alternative rendering.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/VisualTreeHelper/Overview/Window1.xaml.cs" id="Snippet101":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml.vb" id="Snippet101":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml.vb" id="Snippet101":::
 
  ]]></format>
         </remarks>
@@ -233,7 +233,7 @@
  The following example shows how to enumerate all the descendants of a visual object. This is a technique you might use if you are interested in serializing all the rendering information of a visual object hierarchy or are performing analysis or alternative rendering.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/VisualTreeHelper/Overview/Window1.xaml.cs" id="Snippet101":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml.vb" id="Snippet101":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml.vb" id="Snippet101":::
 
  ]]></format>
         </remarks>
@@ -363,7 +363,7 @@
  The following example shows how to retrieve the bounding rectangle of a <xref:System.Windows.Media.Visual> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/VisualTreeHelper/Overview/Window1.xaml.cs" id="Snippet102":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml.vb" id="Snippet102":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml.vb" id="Snippet102":::
 
  ]]></format>
         </remarks>
@@ -459,7 +459,7 @@
  The following example shows how to retrieve the union of bounding rectangles for the descendants of a <xref:System.Windows.Media.Visual>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/VisualTreeHelper/Overview/Window1.xaml.cs" id="Snippet102":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml.vb" id="Snippet102":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml.vb" id="Snippet102":::
 
  ]]></format>
         </remarks>
@@ -532,7 +532,7 @@
  The following example shows how to retrieve the <xref:System.Windows.Media.DrawingGroup> from a visual object by using the <xref:System.Windows.Media.VisualTreeHelper.GetDrawing%2A> method. A hit test is then performed on the geometry of each drawing in the <xref:System.Windows.Media.DrawingGroup> to determine which geometry was hit.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/VisualTreeHelper/Overview/Window1.xaml.cs" id="Snippetvisualsoverviewsnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualsOverview/visualbasic/window1.xaml.vb" id="Snippetvisualsoverviewsnippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/VisualTreeHelper/Overview/window1.xaml.vb" id="Snippetvisualsoverviewsnippet4":::
 
  ]]></format>
         </remarks>
@@ -662,7 +662,7 @@
  The following code example shows how to use the <xref:System.Windows.Media.VisualTreeHelper.GetOffset%2A> method to retrieve the offset of the <xref:System.Windows.Controls.TextBlock>. The offset values are contained within the returned <xref:System.Windows.Vector> value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Window1.xaml.cs" id="Snippetvisualsnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb" id="Snippetvisualsnippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb" id="Snippetvisualsnippet2":::
 
  The offset takes into account the <xref:System.Windows.FrameworkElement.Margin%2A> value. In this case, <xref:System.Windows.Vector.X%2A> is 4, and <xref:System.Windows.Vector.Y%2A> is 4.
 
@@ -827,7 +827,7 @@
  Alternatively, you can use the <xref:System.Windows.Media.Visual.TransformToAncestor%2A> method to return a transform value for the ancestor of a <xref:System.Windows.Media.Visual>. This method always returns a valid transform. The following code example shows how to use <xref:System.Windows.Media.Visual.TransformToAncestor%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Window1.xaml.cs" id="Snippetvisualsnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb" id="Snippetvisualsnippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb" id="Snippetvisualsnippet3":::
 
 
 
@@ -835,7 +835,7 @@
  The following code example shows how to use the <xref:System.Windows.Media.VisualTreeHelper.GetTransform%2A> method to retrieve the transform for the specified visual object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/DrawingVisual/Drawing/Window1.xaml.cs" id="Snippetvisualsnippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VisualSnippets/visualbasic/window1.xaml.vb" id="Snippetvisualsnippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/DrawingVisual/Drawing/window1.xaml.vb" id="Snippetvisualsnippet6":::
 
  Your code should test for `null` before using the returned value. To return the offset of the returned transform, use the <xref:System.Windows.Media.GeneralTransform.Transform%2A> method. The offset value is relative to the parent of the <xref:System.Windows.Media.Visual>.
 
@@ -1000,7 +1000,7 @@
  The following example shows how to use the <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> method to hit test the objects within a <xref:System.Windows.Controls.Canvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet100":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet100":::
 
  ]]></format>
         </remarks>
@@ -1103,9 +1103,9 @@
  The following example shows how to use the <xref:System.Windows.Media.VisualTreeHelper.HitTest%2A> method to hit test the objects within a <xref:System.Windows.Controls.Canvas>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet101":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet101":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet101":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/GeometryHitTestParameters/Overview/Window1.xaml.cs" id="Snippet102":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HitTestingOverview/visualbasic/window1.xaml.vb" id="Snippet102":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/GeometryHitTestParameters/Overview/window1.xaml.vb" id="Snippet102":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Navigation/CustomContentState.xml b/xml/System.Windows.Navigation/CustomContentState.xml
index 3aa852f8368..ac9c98388a9 100644
--- a/xml/System.Windows.Navigation/CustomContentState.xml
+++ b/xml/System.Windows.Navigation/CustomContentState.xml
@@ -76,7 +76,7 @@
  The following is an example of a <xref:System.Windows.Navigation.CustomContentState> implementation that overrides <xref:System.Windows.Navigation.CustomContentState.JournalEntryName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/CustomContentState/Overview/MyCustomContentState.cs" id="Snippetmycustomcontentstatecode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CustomContentStateSnippets/visualbasic/mycustomcontentstate.vb" id="Snippetmycustomcontentstatecode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/CustomContentState/Overview/mycustomcontentstate.vb" id="Snippetmycustomcontentstatecode":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Navigation/JournalEntry.xml b/xml/System.Windows.Navigation/JournalEntry.xml
index b43930572cc..717691b3bf5 100644
--- a/xml/System.Windows.Navigation/JournalEntry.xml
+++ b/xml/System.Windows.Navigation/JournalEntry.xml
@@ -69,7 +69,7 @@
  The following example shows how to retrieve the most recent <xref:System.Windows.Navigation.JournalEntry> object from the back navigation stack to get the <xref:System.Windows.Navigation.JournalEntry.Name%2A> and <xref:System.Windows.Navigation.JournalEntry.Source%2A> property values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/JournalEntry/Overview/DatePage.xaml.cs" id="Snippetgetjournalentrycodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/JournalEntrySnippets/visualbasic/datepage.xaml.vb" id="Snippetgetjournalentrycodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/JournalEntry/Overview/datepage.xaml.vb" id="Snippetgetjournalentrycodebehind":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Navigation/NavigatingCancelEventArgs.xml b/xml/System.Windows.Navigation/NavigatingCancelEventArgs.xml
index 2282acbc217..ff7bc870cbc 100644
--- a/xml/System.Windows.Navigation/NavigatingCancelEventArgs.xml
+++ b/xml/System.Windows.Navigation/NavigatingCancelEventArgs.xml
@@ -58,7 +58,7 @@
  <xref:System.Windows.Navigation.NavigationService.Navigating>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindownavigatingcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindownavigatingcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindownavigatingcode":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Navigation/NavigationService.xml b/xml/System.Windows.Navigation/NavigationService.xml
index 4670d123ef0..48d23d03a38 100644
--- a/xml/System.Windows.Navigation/NavigationService.xml
+++ b/xml/System.Windows.Navigation/NavigationService.xml
@@ -349,7 +349,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to handle <xref:System.Windows.Navigation.NavigationService.FragmentNavigation> to provide custom fragment navigation behavior. In this case, the example opens an error XAML page if the fragment in the source XAML page is not found.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindowfragmentnavigationcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowfragmentnavigationcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindowfragmentnavigationcode":::
 
  ]]></format>
         </remarks>
@@ -420,9 +420,9 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how a <xref:System.Windows.Controls.UserControl> can retrieve a navigation service by calling <xref:System.Windows.Navigation.NavigationService.GetNavigationService%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigationService/GetNavigationService/ContentUserControl.xaml.cs" id="Snippetgetnavigationservicecode1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/contentusercontrol.xaml.vb" id="Snippetgetnavigationservicecode1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/contentusercontrol.xaml.vb" id="Snippetgetnavigationservicecode1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigationService/GetNavigationService/ContentUserControl.xaml.cs" id="Snippetgetnavigationservicecode2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NSGetNavigationServiceSnippets/visualbasic/contentusercontrol.xaml.vb" id="Snippetgetnavigationservicecode2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigationService/GetNavigationService/contentusercontrol.xaml.vb" id="Snippetgetnavigationservicecode2":::
 
  ]]></format>
         </remarks>
@@ -466,7 +466,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example navigates to the most recent entry in back navigation history, if one exists.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindowbackcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowbackcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindowbackcode":::
 
  ]]></format>
         </remarks>
@@ -513,7 +513,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example navigates to the most recent entry in forward navigation history, if one exists.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindowforwardcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowforwardcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindowforwardcode":::
 
  ]]></format>
         </remarks>
@@ -572,7 +572,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to handle <xref:System.Windows.Navigation.NavigationService.LoadCompleted>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindowloadcompletedcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowloadcompletedcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindowloadcompletedcode":::
 
  ]]></format>
         </remarks>
@@ -650,7 +650,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to navigate to a <xref:System.Windows.Controls.Page> object containing the source content tree.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindownavigateobjectcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindownavigateobjectcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindownavigateobjectcode":::
 
  ]]></format>
         </remarks>
@@ -721,7 +721,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to navigate to a URI.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindownavigatecode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindownavigatecode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindownavigatecode":::
 
  ]]></format>
         </remarks>
@@ -775,7 +775,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to navigate to a <xref:System.Windows.Controls.Page> object containing the source content, and passing navigation state.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigationService/Navigate/MainWindow.xaml.cs" id="Snippetmainwindowcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateObjectStateSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow.xaml.vb" id="Snippetmainwindowcode":::
 
  ]]></format>
         </remarks>
@@ -841,7 +841,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example demonstrates navigating to a URI and passing navigation state.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigationService/Navigate/MainWindow1.xaml.cs" id="Snippetmainwindowcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceNavigateUriStateSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigationService/Navigate/mainwindow1.xaml.vb" id="Snippetmainwindowcode":::
 
  ]]></format>
         </remarks>
@@ -958,7 +958,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to handle <xref:System.Windows.Navigation.NavigationService.Navigated>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindownavigatedcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindownavigatedcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindownavigatedcode":::
 
  ]]></format>
         </remarks>
@@ -1028,7 +1028,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  <xref:System.Windows.Navigation.NavigationService.Navigating>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindownavigatingcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindownavigatingcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindownavigatingcode":::
 
  ]]></format>
         </remarks>
@@ -1090,7 +1090,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to handle <xref:System.Windows.Navigation.NavigationService.NavigationFailed>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindownavigationfailedcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindownavigationfailedcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindownavigationfailedcode":::
 
  ]]></format>
         </remarks>
@@ -1152,7 +1152,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to handle <xref:System.Windows.Navigation.NavigationService.NavigationProgress>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindownavigationprogresscode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindownavigationprogresscode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindownavigationprogresscode":::
 
  ]]></format>
         </remarks>
@@ -1209,7 +1209,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to handle <xref:System.Windows.Navigation.NavigationService.NavigationStopped>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindownavigationstoppedcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindownavigationstoppedcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindownavigationstoppedcode":::
 
  ]]></format>
         </remarks>
@@ -1385,7 +1385,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example demonstrates how to stop loading.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/MainWindow.xaml.cs" id="Snippetmainwindowstoploadingcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/NavigationServiceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowstoploadingcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/NavigatingCancelEventArgs/Overview/mainwindow.xaml.vb" id="Snippetmainwindowstoploadingcode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Navigation/NavigationUIVisibility.xml b/xml/System.Windows.Navigation/NavigationUIVisibility.xml
index 56dc7e9d9ea..1c845ab9b0b 100644
--- a/xml/System.Windows.Navigation/NavigationUIVisibility.xml
+++ b/xml/System.Windows.Navigation/NavigationUIVisibility.xml
@@ -28,7 +28,7 @@
  The following example shows how always show the navigation chrome of a <xref:System.Windows.Controls.Frame> by setting <xref:System.Windows.Navigation.NavigationUIVisibility> to <xref:System.Windows.Navigation.NavigationUIVisibility>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/NavigationUIVisibility/Window1.xaml.cs" id="Snippetsetnavigationuivisibility":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/visualbasic/window1.xaml.vb" id="Snippetsetnavigationuivisibility":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/NavigationUIVisibility/window1.xaml.vb" id="Snippetsetnavigationuivisibility":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/FrameNavigationUIVisibilitySnippets/XAML/Window1.xaml" id="Snippetsetnavigationuivisibility":::  
   
  ]]></format>
diff --git a/xml/System.Windows.Navigation/NavigationWindow.xml b/xml/System.Windows.Navigation/NavigationWindow.xml
index 99d0babe204..126a8e3ca01 100644
--- a/xml/System.Windows.Navigation/NavigationWindow.xml
+++ b/xml/System.Windows.Navigation/NavigationWindow.xml
@@ -790,7 +790,7 @@
  The following example shows how to navigate to content that is contained by an object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/Navigate/MainWindow.xaml.cs" id="Snippetnavigatetopageobjcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetnavigatetopageobjcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb" id="Snippetnavigatetopageobjcode":::
 
  ]]></format>
         </remarks>
@@ -847,7 +847,7 @@
  The following example shows how to use the <xref:System.Windows.Navigation.NavigationWindow.Navigate%2A> method to navigate to a uniform resource identifier (URI).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/Navigate/MainWindow.xaml.cs" id="Snippetnavigatetopagenavcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetnavigatetopagenavcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb" id="Snippetnavigatetopagenavcode":::
 
  ]]></format>
         </remarks>
@@ -1342,7 +1342,7 @@
  The following example shows how to call the <xref:System.Windows.Navigation.NavigationWindow.Refresh%2A> method to reload the content in a <xref:System.Windows.Navigation.NavigationWindow>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/Navigate/MainWindow.xaml.cs" id="Snippetnavigaterefreshcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetnavigaterefreshcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb" id="Snippetnavigaterefreshcode":::
 
  ]]></format>
         </remarks>
@@ -1634,7 +1634,7 @@
  The following example shows how to navigate to a uniform resource identifier (URI) by setting the <xref:System.Windows.Navigation.NavigationWindow.Source%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/Navigate/MainWindow.xaml.cs" id="Snippetnavigatetopagesrccode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetnavigatetopagesrccode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb" id="Snippetnavigatetopagesrccode":::
 
  ]]></format>
         </remarks>
@@ -1709,7 +1709,7 @@
  The following example shows how to call the <xref:System.Windows.Navigation.NavigationWindow.StopLoading%2A> method to stop navigation to content before it has finished being downloaded.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Controls/Frame/Navigate/MainWindow.xaml.cs" id="Snippetnavigatestoploadingcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTONavigationSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetnavigatestoploadingcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Controls/Frame/Navigate/mainwindow.xaml.vb" id="Snippetnavigatestoploadingcode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Navigation/PageFunction`1.xml b/xml/System.Windows.Navigation/PageFunction`1.xml
index 1805184a364..85b2588ffa9 100644
--- a/xml/System.Windows.Navigation/PageFunction`1.xml
+++ b/xml/System.Windows.Navigation/PageFunction`1.xml
@@ -134,7 +134,7 @@
  The following example shows how to call <xref:System.Windows.Navigation.PageFunction%601.OnReturn%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/PageFunctionT/OnReturn/GetStringPageFunction.xaml.cs" id="Snippetcallonreturncode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunction.xaml.vb" id="Snippetcallonreturncode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunction.xaml.vb" id="Snippetcallonreturncode":::
 
  ]]></format>
         </remarks>
@@ -185,7 +185,7 @@
  The following example shows how to handle the <xref:System.Windows.Navigation.PageFunction%601.Return> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Navigation/PageFunctionT/OnReturn/GetStringPageFunctionCaller.xaml.cs" id="Snippethandlepagefunctionreturncode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PageFunctionMembersSnippets/visualbasic/getstringpagefunctioncaller.xaml.vb" id="Snippethandlepagefunctionreturncode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Navigation/PageFunctionT/OnReturn/getstringpagefunctioncaller.xaml.vb" id="Snippethandlepagefunctionreturncode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Shapes/Shape.xml b/xml/System.Windows.Shapes/Shape.xml
index 7d07786f5e3..17791ba4d58 100644
--- a/xml/System.Windows.Shapes/Shape.xml
+++ b/xml/System.Windows.Shapes/Shape.xml
@@ -168,7 +168,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Shapes/Shape/Fill/SetBackgroundColorOfShapeExample.xaml" id="Snippetsetbackgroundcolorofshapeexamplewholepage":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Media/Color/FromArgb/SetBackgroundColorOfShapeExample.cs" id="Snippetsetbackgroundcolorofshapecodeexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BrushesMiscSnippets_procedural_snip/visualbasic/setbackgroundcolorofshapeexample.vb" id="Snippetsetbackgroundcolorofshapecodeexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Media/Color/FromArgb/setbackgroundcolorofshapeexample.vb" id="Snippetsetbackgroundcolorofshapecodeexamplewholepage":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Shell/TaskbarItemInfo.xml b/xml/System.Windows.Shell/TaskbarItemInfo.xml
index e84e7ff7a78..87acaae5329 100644
--- a/xml/System.Windows.Shell/TaskbarItemInfo.xml
+++ b/xml/System.Windows.Shell/TaskbarItemInfo.xml
@@ -54,7 +54,7 @@ Windows Taskbar Enhanced Features
  :::code language="xaml" source="~/snippets/csharp/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml" id="Snippet001":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.cs" id="Snippet100":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/mainwindow.xaml.vb" id="Snippet100":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.vb" id="Snippet100":::  
   
  ]]></format>
     </remarks>
@@ -238,7 +238,7 @@ Windows Taskbar Overlay
  The following example shows how to set the <xref:System.Windows.Shell.TaskbarItemInfo.Overlay%2A> property in code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.cs" id="Snippet121":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/mainwindow.xaml.vb" id="Snippet121":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.vb" id="Snippet121":::  
   
  ]]></format>
         </remarks>
@@ -313,7 +313,7 @@ Windows Taskbar Progress Indicator
  The following example shows how to set the <xref:System.Windows.Shell.TaskbarItemInfo.ProgressState%2A> property in code. The state is set in the handler of a <xref:System.ComponentModel.BackgroundWorker.RunWorkerCompleted?displayProperty=nameWithType> event to indicate whether the background task was stopped by the user, ended with an error, or completed normally. This example is part of a larger example provided for the <xref:System.Windows.Shell.TaskbarItemInfo> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.cs" id="Snippet120":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/mainwindow.xaml.vb" id="Snippet120":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.vb" id="Snippet120":::  
   
  ]]></format>
         </remarks>
@@ -388,7 +388,7 @@ Windows Taskbar Progress Indicator
  The following example shows how to set the <xref:System.Windows.Shell.TaskbarItemInfo.ProgressValue%2A> property in code. The value is set in the handler of a <xref:System.ComponentModel.BackgroundWorker.ProgressChanged?displayProperty=nameWithType> event to indicate the current progress of the background task. This example is part of a larger example provided for the <xref:System.Windows.Shell.TaskbarItemInfo> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.cs" id="Snippet130":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/shell_taskbaritemsample/vb/mainwindow.xaml.vb" id="Snippet130":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Shell/TaskbarItemInfo/Overview/mainwindow.xaml.vb" id="Snippet130":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Threading/Dispatcher.xml b/xml/System.Windows.Threading/Dispatcher.xml
index 1eb69240558..ba27f66dd28 100644
--- a/xml/System.Windows.Threading/Dispatcher.xml
+++ b/xml/System.Windows.Threading/Dispatcher.xml
@@ -53,12 +53,12 @@
  First, a delegate is created that accepts no arguments.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/Overview/Window1.xaml.cs" id="Snippetthreadingprimenumberinit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/mainwindow.xaml.vb" id="Snippetthreadingprimenumberinit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/mainwindow.xaml.vb" id="Snippetthreadingprimenumberinit":::
 
  Next, <xref:System.Windows.Threading.Dispatcher.BeginInvoke%28System.Windows.Threading.DispatcherPriority%2CSystem.Delegate%29> is called.  This call to <xref:System.Windows.Threading.Dispatcher.BeginInvoke%28System.Windows.Threading.DispatcherPriority%2CSystem.Delegate%29> takes two parameters: the priority, which is set to <xref:System.Windows.Threading.DispatcherPriority.Normal?displayProperty=nameWithType>, and the callback, which is passed in through an instance of the delegate `NextPrimeDelegate`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/Overview/Window1.xaml.cs" id="Snippetthreadingprimenumberbegininvoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/mainwindow.xaml.vb" id="Snippetthreadingprimenumberbegininvoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/mainwindow.xaml.vb" id="Snippetthreadingprimenumberbegininvoke":::
 
  ]]></format>
     </remarks>
@@ -245,12 +245,12 @@
  First, a delegate is created that accepts no arguments.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/Overview/Window1.xaml.cs" id="Snippetthreadingprimenumberinit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/mainwindow.xaml.vb" id="Snippetthreadingprimenumberinit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/mainwindow.xaml.vb" id="Snippetthreadingprimenumberinit":::
 
  Next, <xref:System.Windows.Threading.Dispatcher.BeginInvoke%28System.Windows.Threading.DispatcherPriority%2CSystem.Delegate%29> is called.  Because every <xref:System.Windows.Threading.DispatcherObject> has a property that returns the <xref:System.Windows.Threading.Dispatcher> it is associated with, the desired <xref:System.Windows.Threading.Dispatcher> is obtained by querying the <xref:System.Windows.Threading.DispatcherObject>, in this case a <xref:System.Windows.Controls.Button> named `startStopButton`.   The call to <xref:System.Windows.Threading.Dispatcher.BeginInvoke%28System.Windows.Threading.DispatcherPriority%2CSystem.Delegate%29> takes two parameters: the priority, which is set to <xref:System.Windows.Threading.DispatcherPriority.Normal?displayProperty=nameWithType>, and the callback, which is passed in through an instance of the delegate `NextPrimeDelegate`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/Overview/Window1.xaml.cs" id="Snippetthreadingprimenumberbegininvoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ThreadingPrimeNumbers/visualbasic/mainwindow.xaml.vb" id="Snippetthreadingprimenumberbegininvoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/Overview/mainwindow.xaml.vb" id="Snippetthreadingprimenumberbegininvoke":::
 
  ]]></format>
         </remarks>
@@ -410,12 +410,12 @@
  First, a delegate is created that accepts one argument, in this case a string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/BeginInvoke/Window1.xaml.cs" id="Snippetthreadingweatherdelegates":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/window1.xaml.vb" id="Snippetthreadingweatherdelegates":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/window1.xaml.vb" id="Snippetthreadingweatherdelegates":::
 
  Next, <xref:System.Windows.Threading.Dispatcher.BeginInvoke%28System.Windows.Threading.DispatcherPriority%2CSystem.Delegate%2CSystem.Object%29> is called.  Because every <xref:System.Windows.Threading.DispatcherObject> has a property that returns the <xref:System.Windows.Threading.Dispatcher> it is associated with, the desired <xref:System.Windows.Threading.Dispatcher> is obtained by querying the <xref:System.Windows.Threading.DispatcherObject>, in this case a <xref:System.Windows.Controls.Grid> named `tomorrowsWeather`. The call to <xref:System.Windows.Threading.Dispatcher.BeginInvoke%28System.Windows.Threading.DispatcherPriority%2CSystem.Delegate%2CSystem.Object%29> takes three parameters: the priority, which is set to <xref:System.Windows.Threading.DispatcherPriority.Normal?displayProperty=nameWithType>; the callback, which is passed in through an instance of the delegate `OneArgDelegate`; and a string named `weather`, which is the argument for the callback.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/BeginInvoke/Window1.xaml.cs" id="Snippetthreadingweatherdispatcheronearge":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/window1.xaml.vb" id="Snippetthreadingweatherdispatcheronearge":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/window1.xaml.vb" id="Snippetthreadingweatherdispatcheronearge":::
 
  ]]></format>
         </remarks>
@@ -612,7 +612,7 @@
  The following example uses <xref:System.Windows.Threading.Dispatcher.CheckAccess%2A> to determine whether a thread has access to a <xref:System.Windows.Controls.Button>.  The <xref:System.Windows.Threading.Dispatcher.CheckAccess%2A> method on the <xref:System.Windows.Threading.Dispatcher> associated with the <xref:System.Windows.Controls.Button> is called to verify access to the thread.  If the calling thread has access to the <xref:System.Windows.Threading.Dispatcher>, the <xref:System.Windows.Controls.Button> is updated by accessing the members of the <xref:System.Windows.Controls.Button>; otherwise, a delegate, which accepts a <xref:System.Windows.Controls.Button> as an argument, is placed onto the <xref:System.Windows.Threading.Dispatcher>.  The <xref:System.Windows.Threading.Dispatcher> will delegate the work of updating the <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/CheckAccess/Window1.xaml.cs" id="Snippetdispatcheraccesscheckaccess":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/window1.xaml.vb" id="Snippetdispatcheraccesscheckaccess":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/window1.xaml.vb" id="Snippetdispatcheraccesscheckaccess":::
 
  ]]></format>
         </remarks>
@@ -702,7 +702,7 @@
  The following example shows how to disable dispatcher processing and re-enable dispatcher processing.  <xref:System.Windows.Threading.Dispatcher.DisableProcessing%2A> is called in a **using** statement.  <xref:System.Windows.Threading.Dispatcher.DisableProcessing%2A> returns a <xref:System.Windows.Threading.DispatcherProcessingDisabled> structure that is used as the object to be disposed when the **using** block finishes.  When <xref:System.Windows.Threading.DispatcherProcessingDisabled.Dispose%2A> is called on the <xref:System.Windows.Threading.DispatcherProcessingDisabled> structure, dispatcher processing is re-enabled.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/DisableProcessing/Window1.xaml.cs" id="Snippetdispatcherdisableprocessing":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml.vb" id="Snippetdispatcherdisableprocessing":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml.vb" id="Snippetdispatcherdisableprocessing":::
 
  ]]></format>
         </remarks>
@@ -945,7 +945,7 @@
  The following example places a delegate onto a <xref:System.Windows.Threading.Dispatcher> at <xref:System.Windows.Threading.DispatcherPriority.Normal> using <xref:System.Windows.Threading.Dispatcher.Invoke%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/Invoke/Window1.xaml.cs" id="Snippetsystemtimerdispatcherinvoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/window1.xaml.vb" id="Snippetsystemtimerdispatcherinvoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/window1.xaml.vb" id="Snippetsystemtimerdispatcherinvoke":::
 
  ]]></format>
         </remarks>
@@ -1124,7 +1124,7 @@ The default priority is `DispatcherPriority.Send`.
  The following example places a delegate onto a <xref:System.Windows.Threading.Dispatcher> at <xref:System.Windows.Threading.DispatcherPriority.Normal> using <xref:System.Windows.Threading.Dispatcher.Invoke%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/Invoke/Window1.xaml.cs" id="Snippetsystemtimerdispatcherinvoke":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithSystemTimer/visualbasic/window1.xaml.vb" id="Snippetsystemtimerdispatcherinvoke":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/Invoke/window1.xaml.vb" id="Snippetsystemtimerdispatcherinvoke":::
 
  ]]></format>
         </remarks>
@@ -2257,7 +2257,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to use a <xref:System.Windows.Threading.DispatcherFrame> to achieve similar results as the Windows Forms <xref:System.Windows.Forms.Application.DoEvents%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/DisableProcessing/Window1.xaml.cs" id="Snippetdispatcherdispatcherframedoevents":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml.vb" id="Snippetdispatcherdispatcherframedoevents":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml.vb" id="Snippetdispatcherdispatcherframedoevents":::
 
  ]]></format>
         </remarks>
@@ -2622,7 +2622,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  If the calling thread does not have access, an <xref:System.InvalidOperationException> is thrown.  This example catches the exception and pushes a delegate, which accepts a <xref:System.Windows.Controls.Button> as an argument, onto the <xref:System.Windows.Threading.Dispatcher> of the <xref:System.Windows.Controls.Button>.  This <xref:System.Windows.Threading.Dispatcher> will do the work of updating the <xref:System.Windows.Controls.Button>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/CheckAccess/Window1.xaml.cs" id="Snippetdispatcheraccessverifyaccess":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherAccessSample/visualbasic/window1.xaml.vb" id="Snippetdispatcheraccessverifyaccess":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/CheckAccess/window1.xaml.vb" id="Snippetdispatcheraccessverifyaccess":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Threading/DispatcherFrame.xml b/xml/System.Windows.Threading/DispatcherFrame.xml
index cdab59e0b61..b70fab57383 100644
--- a/xml/System.Windows.Threading/DispatcherFrame.xml
+++ b/xml/System.Windows.Threading/DispatcherFrame.xml
@@ -43,7 +43,7 @@
  The following example shows how to use a <xref:System.Windows.Threading.DispatcherFrame> to achieve similar results as the Windows Forms <xref:System.Windows.Forms.Application.DoEvents%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/DisableProcessing/Window1.xaml.cs" id="Snippetdispatcherdispatcherframedoevents":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml.vb" id="Snippetdispatcherdispatcherframedoevents":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml.vb" id="Snippetdispatcherdispatcherframedoevents":::
 
  ]]></format>
     </remarks>
@@ -183,7 +183,7 @@ At application shutdown, all frames are requested to exit.
  The following example shows how to use a <xref:System.Windows.Threading.DispatcherFrame> to achieve similar results as the Windows Forms <xref:System.Windows.Forms.Application.DoEvents%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/DisableProcessing/Window1.xaml.cs" id="Snippetdispatcherdispatcherframedoevents":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml.vb" id="Snippetdispatcherdispatcherframedoevents":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml.vb" id="Snippetdispatcherdispatcherframedoevents":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Threading/DispatcherObject.xml b/xml/System.Windows.Threading/DispatcherObject.xml
index 47ae52c7ce1..cc2db25ca40 100644
--- a/xml/System.Windows.Threading/DispatcherObject.xml
+++ b/xml/System.Windows.Threading/DispatcherObject.xml
@@ -118,7 +118,7 @@
  The following example uses <xref:System.Windows.Threading.DispatcherObject.CheckAccess%2A> to determine whether a thread has access to the thread that a <xref:System.Windows.Controls.Button> was created on.  The <xref:System.Windows.Threading.DispatcherObject.CheckAccess%2A> method on the <xref:System.Windows.Controls.Button> is called to verify access to the thread.  If the calling thread has access, the <xref:System.Windows.Controls.Button> is updated by just accessing the members of the <xref:System.Windows.Controls.Button>; otherwise, a delegate, which accepts a <xref:System.Windows.Controls.Button> as an argument, is posted onto the <xref:System.Windows.Threading.Dispatcher> of the <xref:System.Windows.Controls.Button>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/DispatcherObject/CheckAccess/Window1.xaml.cs" id="Snippetdispatcherobjectaccesscheckaccess":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/window1.xaml.vb" id="Snippetdispatcherobjectaccesscheckaccess":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/window1.xaml.vb" id="Snippetdispatcherobjectaccesscheckaccess":::  
   
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
  The following example uses <xref:System.Windows.Threading.DispatcherObject.VerifyAccess%2A> to determine whether a thread has access to the thread that a <xref:System.Windows.Controls.Button> was created on.  If the calling thread does not have access, an <xref:System.InvalidOperationException> is thrown.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/DispatcherObject/CheckAccess/Window1.xaml.cs" id="Snippetdispatcherobjectaccessverifyaccess":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherObjectAccessSample/visualbasic/window1.xaml.vb" id="Snippetdispatcherobjectaccessverifyaccess":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/DispatcherObject/CheckAccess/window1.xaml.vb" id="Snippetdispatcherobjectaccessverifyaccess":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Threading/DispatcherPriority.xml b/xml/System.Windows.Threading/DispatcherPriority.xml
index 4d502e00116..5c5b9db5a04 100644
--- a/xml/System.Windows.Threading/DispatcherPriority.xml
+++ b/xml/System.Windows.Threading/DispatcherPriority.xml
@@ -35,7 +35,7 @@
  The following example calls the <xref:System.Windows.Threading.Dispatcher.BeginInvoke%2A?displayProperty=nameWithType> method and passes it a delegate with one argument. The priority is set to `Normal`.
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/BeginInvoke/Window1.xaml.cs" id="Snippetthreadingweatherdispatcheronearge":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ThreadingWeatherForecast/visualbasic/window1.xaml.vb" id="Snippetthreadingweatherdispatcheronearge":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/BeginInvoke/window1.xaml.vb" id="Snippetthreadingweatherdispatcheronearge":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Threading/DispatcherProcessingDisabled.xml b/xml/System.Windows.Threading/DispatcherProcessingDisabled.xml
index c25219b5192..d3011055e39 100644
--- a/xml/System.Windows.Threading/DispatcherProcessingDisabled.xml
+++ b/xml/System.Windows.Threading/DispatcherProcessingDisabled.xml
@@ -50,7 +50,7 @@
  The following example shows how to disable dispatcher processing and re-enable dispatcher processing.  <xref:System.Windows.Threading.Dispatcher.DisableProcessing%2A> is called in a **using** statement.  <xref:System.Windows.Threading.Dispatcher.DisableProcessing%2A> returns a <xref:System.Windows.Threading.DispatcherProcessingDisabled> structure which is used as the object to be disposed when the **using** block finishes.  Calling <xref:System.Windows.Threading.DispatcherProcessingDisabled.Dispose%2A> on the <xref:System.Windows.Threading.DispatcherProcessingDisabled> structure re-enables dispatcher processing.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Threading/Dispatcher/DisableProcessing/Window1.xaml.cs" id="Snippetdispatcherdisableprocessing":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DispatcherSnippets/visualbasic/window1.xaml.vb" id="Snippetdispatcherdisableprocessing":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Threading/Dispatcher/DisableProcessing/window1.xaml.vb" id="Snippetdispatcherdisableprocessing":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Threading/DispatcherTimer.xml b/xml/System.Windows.Threading/DispatcherTimer.xml
index 9c9358f39d0..6a5dd16b8d3 100644
--- a/xml/System.Windows.Threading/DispatcherTimer.xml
+++ b/xml/System.Windows.Threading/DispatcherTimer.xml
@@ -40,12 +40,12 @@
  A <xref:System.Windows.Threading.DispatcherTimer> object named `dispatcherTimer` is created.  The event handler `dispatcherTimer_Tick` is added to the <xref:System.Windows.Threading.DispatcherTimer.Tick> event of `dispatcherTimer`.  The <xref:System.Windows.Threading.DispatcherTimer.Interval%2A> is set to 1 second using a <xref:System.Windows.Duration.TimeSpan%2A> object, and the timer is started.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/CanExecuteRoutedEventArgs/Parameter/Window1.xaml.cs" id="Snippetinvalidatesampledispatchertimerinit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimerinit":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimerinit":::  
   
  The <xref:System.Windows.Threading.DispatcherTimer.Tick> event handler updates a <xref:System.Windows.Controls.Label> that displays the current second, and it calls <xref:System.Windows.Input.CommandManager.InvalidateRequerySuggested%2A> on the <xref:System.Windows.Input.CommandManager>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/CanExecuteRoutedEventArgs/Parameter/Window1.xaml.cs" id="Snippetinvalidatesampledispatchertimer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimer":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimer":::  
   
  ]]></format>
     </remarks>
@@ -288,7 +288,7 @@
  The following example creates a <xref:System.Windows.Threading.DispatcherTimer>.  A new <xref:System.Windows.Threading.DispatcherTimer> object named `dispatcherTimer` is created.  The event handler `dispatcherTimer_Tick` is added to the <xref:System.Windows.Threading.DispatcherTimer.Tick> event.  The <xref:System.Windows.Threading.DispatcherTimer.Interval%2A> is set to 1 second using a <xref:System.TimeSpan> object.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/CanExecuteRoutedEventArgs/Parameter/Window1.xaml.cs" id="Snippetinvalidatesampledispatchertimerinit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimerinit":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimerinit":::  
   
  ]]></format>
         </remarks>
@@ -342,7 +342,7 @@
  The following example creates a <xref:System.Windows.Threading.DispatcherTimer>.  A new <xref:System.Windows.Threading.DispatcherTimer> object named `dispatcherTimer` is created.  The event handler `dispatcherTimer_Tick` is added to the <xref:System.Windows.Threading.DispatcherTimer.Tick> event.  The <xref:System.Windows.Threading.DispatcherTimer.Interval%2A> is set to 1 second using a <xref:System.TimeSpan> object.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/CanExecuteRoutedEventArgs/Parameter/Window1.xaml.cs" id="Snippetinvalidatesampledispatchertimerinit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimerinit":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimerinit":::  
   
  ]]></format>
         </remarks>
@@ -391,7 +391,7 @@
  The following example creates a <xref:System.Windows.Threading.DispatcherTimer>.  A new <xref:System.Windows.Threading.DispatcherTimer> object named `dispatcherTimer` is created.  The event handler `dispatcherTimer_Tick` is added to the <xref:System.Windows.Threading.DispatcherTimer.Tick> event.  The <xref:System.Windows.Threading.DispatcherTimer.Interval%2A> is set to 1 second using a <xref:System.Windows.Duration.TimeSpan%2A> object.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/CanExecuteRoutedEventArgs/Parameter/Window1.xaml.cs" id="Snippetinvalidatesampledispatchertimerinit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimerinit":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimerinit":::  
   
  ]]></format>
         </remarks>
@@ -506,7 +506,7 @@
  The following example creates a <xref:System.Windows.Threading.DispatcherTimer.Tick> event handler.  The event handler updates a <xref:System.Windows.Controls.Label> that displays the current second, and it calls <xref:System.Windows.Input.CommandManager.InvalidateRequerySuggested%2A> on the <xref:System.Windows.Input.CommandManager>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Input/CanExecuteRoutedEventArgs/Parameter/Window1.xaml.cs" id="Snippetinvalidatesampledispatchertimer":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InvalidateRequeryWithDispatcherTimer/visualbasic/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimer":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Input/CommandManager/InvalidateRequerySuggested/window1.xaml.vb" id="Snippetinvalidatesampledispatchertimer":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Xps.Packaging/IXpsFixedDocumentReader.xml b/xml/System.Windows.Xps.Packaging/IXpsFixedDocumentReader.xml
index d86247bd100..c929c0d5d5b 100644
--- a/xml/System.Windows.Xps.Packaging/IXpsFixedDocumentReader.xml
+++ b/xml/System.Windows.Xps.Packaging/IXpsFixedDocumentReader.xml
@@ -31,12 +31,12 @@
  The following example shows how to obtain a reference to an object that implements this interface.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::  
   
  The following example shows how to use an <xref:System.Windows.Xps.Packaging.IXpsFixedDocumentReader> to obtain an <xref:System.Windows.Xps.Packaging.IXpsFixedDocumentReader> collection in order to access each page in a <xref:System.Windows.Documents.FixedDocument>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents.DocumentStructures/FigureStructure/Overview/Window1.xaml.cs" id="Snippetdocstrucfixeddoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
   
  ]]></format>
     </remarks>
@@ -198,7 +198,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.Packaging.IXpsFixedDocumentReader.FixedPages%2A> property to obtain an <xref:System.Windows.Xps.Packaging.IXpsFixedDocumentReader> collection in order to access the individual pages in a <xref:System.Windows.Documents.FixedDocument>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents.DocumentStructures/FigureStructure/Overview/Window1.xaml.cs" id="Snippetdocstrucfixeddoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
   
  ]]></format>
         </remarks>
@@ -392,7 +392,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.Packaging.IXpsFixedDocumentReader.Uri%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/ReadingAndWritingXps.cs" id="Snippetiteratexpspackageparts":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/readingandwritingxps.vb" id="Snippetiteratexpspackageparts":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/readingandwritingxps.vb" id="Snippetiteratexpspackageparts":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Xps.Packaging/IXpsFixedDocumentSequenceReader.xml b/xml/System.Windows.Xps.Packaging/IXpsFixedDocumentSequenceReader.xml
index 582ae277ce0..7143735c11e 100644
--- a/xml/System.Windows.Xps.Packaging/IXpsFixedDocumentSequenceReader.xml
+++ b/xml/System.Windows.Xps.Packaging/IXpsFixedDocumentSequenceReader.xml
@@ -27,12 +27,12 @@
  The following example shows how to obtain a reference to an object that implements this interface.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::  
   
  The following example shows how to obtain a <xref:System.Windows.Xps.Packaging.XpsDocument.FixedDocumentSequenceReader%2A> in order to access <xref:System.Windows.Documents.FixedDocument> parts in an <xref:System.Windows.Xps.Packaging.XpsDocument>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents.DocumentStructures/FigureStructure/Overview/Window1.xaml.cs" id="Snippetdocstrucfixeddoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
   
  ]]></format>
     </remarks>
@@ -70,7 +70,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.Packaging.IXpsFixedDocumentSequenceReader.FixedDocuments%2A> property to obtain a collection of <xref:System.Windows.Documents.FixedDocument> readers.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents.DocumentStructures/FigureStructure/Overview/Window1.xaml.cs" id="Snippetdocstrucfixeddoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Xps.Packaging/IXpsFixedPageReader.xml b/xml/System.Windows.Xps.Packaging/IXpsFixedPageReader.xml
index 5cb7a82e570..cb9931409a8 100644
--- a/xml/System.Windows.Xps.Packaging/IXpsFixedPageReader.xml
+++ b/xml/System.Windows.Xps.Packaging/IXpsFixedPageReader.xml
@@ -31,7 +31,7 @@
  The following example shows how to obtain an <xref:System.Windows.Xps.Packaging.IXpsFixedPageReader> collection from an <xref:System.Windows.Xps.Packaging.IXpsFixedDocumentReader>. The sample also shows how to use the fixed-page reader to add a new <xref:System.Windows.Documents.DocumentStructures.StoryFragment> that defines the document structure of the page.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents.DocumentStructures/FigureStructure/Overview/Window1.xaml.cs" id="Snippetdocstrucfixeddoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Xps.Packaging/XpsDigSigPartAlteringRestrictions.xml b/xml/System.Windows.Xps.Packaging/XpsDigSigPartAlteringRestrictions.xml
index 6c8066fa3ec..3a5d0ba3dbe 100644
--- a/xml/System.Windows.Xps.Packaging/XpsDigSigPartAlteringRestrictions.xml
+++ b/xml/System.Windows.Xps.Packaging/XpsDigSigPartAlteringRestrictions.xml
@@ -45,7 +45,7 @@
  The following example shows how to use this enumeration to digitally sign an XPS document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDefinitionsAndSigning.cs" id="Snippetsignxpsdocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Xps.Packaging/XpsDigitalSignature.xml b/xml/System.Windows.Xps.Packaging/XpsDigitalSignature.xml
index e0f1bb4af7d..e8f832fc32a 100644
--- a/xml/System.Windows.Xps.Packaging/XpsDigitalSignature.xml
+++ b/xml/System.Windows.Xps.Packaging/XpsDigitalSignature.xml
@@ -137,7 +137,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.Packaging.XpsDigitalSignature.Id%2A> property to display and update signature information.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDefinitionsAndSigning.cs" id="Snippetiteratesignaturedefinitions":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinitionsandsigning.vb" id="Snippetiteratesignaturedefinitions":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinitionsandsigning.vb" id="Snippetiteratesignaturedefinitions":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Xps.Packaging/XpsDocument.xml b/xml/System.Windows.Xps.Packaging/XpsDocument.xml
index b207814f020..9f8852003d0 100644
--- a/xml/System.Windows.Xps.Packaging/XpsDocument.xml
+++ b/xml/System.Windows.Xps.Packaging/XpsDocument.xml
@@ -607,7 +607,7 @@
  The following example shows how to get a <xref:System.Windows.Xps.Packaging.XpsDocument.FixedDocumentSequenceReader%2A> in order to access <xref:System.Windows.Documents.FixedDocument> parts in an <xref:System.Windows.Xps.Packaging.XpsDocument>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents.DocumentStructures/FigureStructure/Overview/Window1.xaml.cs" id="Snippetdocstrucfixeddoc":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DocumentStructure/visualbasic/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/window1.xaml.vb" id="Snippetdocstrucfixeddoc":::
 
  ]]></format>
         </remarks>
@@ -820,7 +820,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.Packaging.XpsDocument.SignDigitally%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDefinitionsAndSigning.cs" id="Snippetsignxpsdocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::
 
  ]]></format>
         </remarks>
@@ -872,7 +872,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.Packaging.XpsDocument.SignDigitally%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDefinitionsAndSigning.cs" id="Snippetsignxpsdocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::
 
  ]]></format>
         </remarks>
@@ -926,7 +926,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.Packaging.XpsDocument.SignDigitally%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDefinitionsAndSigning.cs" id="Snippetsignxpsdocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::
 
  ]]></format>
         </remarks>
@@ -985,7 +985,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.Packaging.XpsDocument.SignDigitally%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDefinitionsAndSigning.cs" id="Snippetsignxpsdocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedefinitionsandsigning.vb" id="Snippetsignxpsdocument":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Xps.Packaging/XpsImageType.xml b/xml/System.Windows.Xps.Packaging/XpsImageType.xml
index 83b786c9b2d..2aad0e01f8b 100644
--- a/xml/System.Windows.Xps.Packaging/XpsImageType.xml
+++ b/xml/System.Windows.Xps.Packaging/XpsImageType.xml
@@ -33,7 +33,7 @@
  The following example shows how to use this enumeration when you add images to an XML Paper Specification (XPS) document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/ReadingAndWritingXps.cs" id="Snippetcreateandwritetoxpsdocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/readingandwritingxps.vb" id="Snippetcreateandwritetoxpsdocument":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/readingandwritingxps.vb" id="Snippetcreateandwritetoxpsdocument":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows.Xps.Packaging/XpsSignatureDefinition.xml b/xml/System.Windows.Xps.Packaging/XpsSignatureDefinition.xml
index 0a75e2565e8..b8cfa8bb27b 100644
--- a/xml/System.Windows.Xps.Packaging/XpsSignatureDefinition.xml
+++ b/xml/System.Windows.Xps.Packaging/XpsSignatureDefinition.xml
@@ -36,7 +36,7 @@
  The following example shows how to create and set the properties of an <xref:System.Windows.Xps.Packaging.XpsSignatureDefinition>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
 
  ]]></format>
     </remarks>
@@ -73,7 +73,7 @@
  The following example shows how to use this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
 
  ]]></format>
         </remarks>
@@ -202,7 +202,7 @@
  The following example shows how to set this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
 
  ]]></format>
         </remarks>
@@ -253,7 +253,7 @@
  The following example shows how to set this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
 
  ]]></format>
         </remarks>
@@ -302,7 +302,7 @@
  The following example shows how to set this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
 
  ]]></format>
         </remarks>
@@ -355,7 +355,7 @@
  The following example shows how to set this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
 
  ]]></format>
         </remarks>
@@ -404,7 +404,7 @@
  The following example shows how to set this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/SignatureDialog.xaml.cs" id="Snippetsignaturedefinitioncommandhandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsReadWriteSign/visualbasic/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Xps.Packaging/IXpsFixedDocumentReader/Overview/signaturedialog.xaml.vb" id="Snippetsignaturedefinitioncommandhandler":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Xps/VisualsToXpsDocument.xml b/xml/System.Windows.Xps/VisualsToXpsDocument.xml
index ebcd0c45839..28f4f0fcffa 100644
--- a/xml/System.Windows.Xps/VisualsToXpsDocument.xml
+++ b/xml/System.Windows.Xps/VisualsToXpsDocument.xml
@@ -38,7 +38,7 @@
  The following example shows how to create a visuals collator and use it to write to an XML Paper Specification (XPS) document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetcreateandwritetovisualscollator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
   
  ]]></format>
     </remarks>
@@ -260,7 +260,7 @@
  The following example shows how to use this method to write to an XML Paper Specification (XPS) document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetcreateandwritetovisualscollator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows.Xps/XpsDocumentWriter.xml b/xml/System.Windows.Xps/XpsDocumentWriter.xml
index cb24d88f573..31757dfe082 100644
--- a/xml/System.Windows.Xps/XpsDocumentWriter.xml
+++ b/xml/System.Windows.Xps/XpsDocumentWriter.xml
@@ -34,7 +34,7 @@
  The following example shows how to create an instance of the <xref:System.Windows.Xps.XpsDocumentWriter> class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetcreatexpsdocumentwriter":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetcreatexpsdocumentwriter":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetcreatexpsdocumentwriter":::  
   
  ]]></format>
     </remarks>
@@ -94,7 +94,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.XpsDocumentWriter.CreateVisualsCollator%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetcreateandwritetovisualscollator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
   
  ]]></format>
         </remarks>
@@ -144,7 +144,7 @@
  The following example shows how to use the <xref:System.Windows.Xps.XpsDocumentWriter.CreateVisualsCollator%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetcreateandwritetovisualscollator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetcreateandwritetovisualscollator":::  
   
  ]]></format>
         </remarks>
@@ -419,7 +419,7 @@ By design, this `Write` method does not raise the <xref:System.Windows.Xps.XpsDo
  The following example shows how to use the <xref:System.Windows.Xps.XpsDocumentWriter.Write%2A> method to write to an XPS document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwritetoxpswithdocumentpaginator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwritetoxpswithdocumentpaginator":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwritetoxpswithdocumentpaginator":::  
   
  ]]></format>
         </remarks>
@@ -471,7 +471,7 @@ By design, this `Write` method does not raise the <xref:System.Windows.Xps.XpsDo
  The following example shows how to use this method to write to an XPS document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwritetoxpswithfixeddocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwritetoxpswithfixeddocument":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwritetoxpswithfixeddocument":::  
   
  ]]></format>
         </remarks>
@@ -523,7 +523,7 @@ By design, this `Write` method does not raise the <xref:System.Windows.Xps.XpsDo
  The following example shows how to use the <xref:System.Windows.Xps.XpsDocumentWriter.Write%2A> method to write a sequence of XPS documents.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwritetoxpswithfixeddocumentsequence":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwritetoxpswithfixeddocumentsequence":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwritetoxpswithfixeddocumentsequence":::  
   
  ]]></format>
         </remarks>
@@ -612,7 +612,7 @@ By design, this `Write` method does not raise the <xref:System.Windows.Xps.XpsDo
  The following example shows how to use the <xref:System.Windows.Xps.XpsDocumentWriter.Write%2A> method to write a <xref:System.Windows.Media.Visual> to an XPS document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwritetoxpswithvisual":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwritetoxpswithvisual":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwritetoxpswithvisual":::  
   
  ]]></format>
         </remarks>
@@ -1012,7 +1012,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to use this method to write to an XPS document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwriteasynctoxpswithdocumentpaginator":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwriteasynctoxpswithdocumentpaginator":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwriteasynctoxpswithdocumentpaginator":::
 
 ]]></format>
         </remarks>
@@ -1064,7 +1064,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to use this method to write to an XPS document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwriteasynctoxpswithfixeddocument":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwriteasynctoxpswithfixeddocument":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwriteasynctoxpswithfixeddocument":::
 
 ]]></format>
         </remarks>
@@ -1117,7 +1117,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to use this method to write to an XPS document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwriteasynctoxpswithfixeddocumentsequence":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwriteasynctoxpswithfixeddocumentsequence":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwriteasynctoxpswithfixeddocumentsequence":::
 
 ]]></format>
         </remarks>
@@ -1206,7 +1206,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to use this method to write a <xref:System.Windows.Media.Visual> to an XPS document.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwriteasynctoxpswithvisual":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwriteasynctoxpswithvisual":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwriteasynctoxpswithvisual":::
 
 ]]></format>
         </remarks>
@@ -2046,7 +2046,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to use the <xref:System.Windows.Xps.XpsDocumentWriter.WritingCompleted> event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwritingevents":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwritingevents":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwritingevents":::  
   
  ]]></format>
         </remarks>
@@ -2108,12 +2108,12 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to use the <xref:System.Windows.Xps.XpsDocumentWriter.WritingPrintTicketRequired> event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetprintmultiplefixedcontentdocuments":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetprintmultiplefixedcontentdocuments":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetprintmultiplefixedcontentdocuments":::  
   
  The event handler is created in the following example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Printing/LocalPrintServer/Overview/XpsPrintHelper.cs" id="Snippetmultiplefixedcontentdocuments_writingprintticketrequired":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsPrint/visualbasic/xpsprinthelper.vb" id="Snippetmultiplefixedcontentdocuments_writingprintticketrequired":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Printing/LocalPrintServer/Overview/xpsprinthelper.vb" id="Snippetmultiplefixedcontentdocuments_writingprintticketrequired":::  
   
  ]]></format>
         </remarks>
@@ -2160,7 +2160,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following example shows how to create and use a <xref:System.Windows.Xps.XpsDocumentWriter.WritingProgressChanged> event handler.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows.Documents/DocumentPaginator/PageSize/XpsSaveHelper.cs" id="Snippetwritingevents":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/XpsSave/visualbasic/xpssavehelper.vb" id="Snippetwritingevents":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows.Documents/DocumentPaginator/PageSize/xpssavehelper.vb" id="Snippetwritingevents":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/Application.xml b/xml/System.Windows/Application.xml
index d7dd279cfbe..888c8426c85 100644
--- a/xml/System.Windows/Application.xml
+++ b/xml/System.Windows/Application.xml
@@ -63,14 +63,14 @@
  The following example shows how a standard application is defined using only code:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Overview/AppCode.cs" id="Snippetapplicationcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/appcode.vb" id="Snippetapplicationcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Overview/appcode.vb" id="Snippetapplicationcode":::
 
  The following example shows how a standard application is defined using a combination of markup and code-behind.
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Overview/App.xaml" id="Snippetapplicationxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Overview/App.xaml.cs" id="Snippetapplicationcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSnippets/visualbasic/application.xaml.vb" id="Snippetapplicationcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Overview/application.xaml.vb" id="Snippetapplicationcodebehind":::
 
  ]]></format>
     </remarks>
@@ -171,7 +171,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Activated/App.xaml" id="Snippetdetectactivationstatexaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Activated/App.xaml.cs" id="Snippetdetectactivationstatecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/application.xaml.vb" id="Snippetdetectactivationstatecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Activated/application.xaml.vb" id="Snippetdetectactivationstatecodebehind":::
 
  ]]></format>
         </remarks>
@@ -271,7 +271,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Activated/App.xaml" id="Snippetdetectactivationstatexaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Activated/App.xaml.cs" id="Snippetdetectactivationstatecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationActivationSnippets/visualbasic/application.xaml.vb" id="Snippetdetectactivationstatecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Activated/application.xaml.vb" id="Snippetdetectactivationstatecodebehind":::
 
  ]]></format>
         </remarks>
@@ -341,7 +341,7 @@
  The following example shows how to process unhandled exceptions by handling the <xref:System.Windows.Application.DispatcherUnhandledException> event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/DispatcherUnhandledException/App.xaml.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationDispatcherUnhandledExceptionSnippets/visualbasic/application.xaml.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/DispatcherUnhandledException/application.xaml.vb":::
 
  ]]></format>
         </remarks>
@@ -413,7 +413,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Exit/App.xaml" id="Snippethandleexitxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Exit/App.xaml.cs" id="Snippethandleexitcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationExitSnippets/visualbasic/application.xaml.vb" id="Snippethandleexitcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Exit/application.xaml.vb" id="Snippethandleexitcodebehind":::
 
  ]]></format>
         </remarks>
@@ -470,7 +470,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to use <xref:System.Windows.Application.FindResource%2A> to find a resource, and to handle <xref:System.Windows.ResourceReferenceKeyNotFoundException> if the resource is not found.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/FindResource/MainWindow.xaml.cs" id="Snippetapplicationcallfindresourcecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationFindResourceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetapplicationcallfindresourcecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/FindResource/mainwindow.xaml.vb" id="Snippetapplicationcallfindresourcecodebehind":::
 
  ]]></format>
         </remarks>
@@ -946,7 +946,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to find the main application window.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/MainWindow/App.xaml.cs" id="Snippetgetapplicationmainwindowcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationMainWindowSnippets/visualbasic/application.xaml.vb" id="Snippetgetapplicationmainwindowcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/MainWindow/application.xaml.vb" id="Snippetgetapplicationmainwindowcode":::
 
  The following example shows how to set <xref:System.Windows.Application.MainWindow%2A> using XAML.
 
@@ -955,7 +955,7 @@ For more information about XBAP support, see [Frequently asked questions about W
  The following example shows how to instantiate the <xref:System.Windows.Application.MainWindow%2A> in code during application startup.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/MainWindow/App1.xaml.cs" id="Snippetfirstwindowusingcodecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/application.xaml.vb" id="Snippetfirstwindowusingcodecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/MainWindow/application1.xaml.vb" id="Snippetfirstwindowusingcodecodebehind":::
 
  ]]></format>
         </remarks>
@@ -1759,13 +1759,13 @@ For more information about XBAP support, see [Frequently asked questions about W
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Properties/App.xaml" id="Snippethandlestartupxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Properties/App.xaml.cs" id="Snippethandlestartupcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/application.xaml.vb" id="Snippethandlestartupcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Properties/application.xaml.vb" id="Snippethandlestartupcodebehind":::
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Properties/MainWindow.xaml" id="Snippetmainwindowgetpropertyxaml1":::
 :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Properties/MainWindow.xaml" id="Snippetmainwindowgetpropertyxaml2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Properties/MainWindow.xaml.cs" id="Snippetmainwindowgetpropertycodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationPropertiesSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowgetpropertycodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Properties/mainwindow.xaml.vb" id="Snippetmainwindowgetpropertycodebehind":::
 
  ]]></format>
         </remarks>
@@ -1896,14 +1896,14 @@ This example illustrates how to use XAML together with application-scope resourc
  The following example shows how to set an application resource in code and XAML (in the App.xaml file in a C# WPF project or the Application.xaml file in a Visual Basic WPF project).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Resources/ApplicationPropertiesSnippet.xaml.cs" id="Snippetsetapplicationscoperesourcecode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/applicationpropertiessnippet.xaml.vb" id="Snippetsetapplicationscoperesourcecode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Resources/applicationpropertiessnippet.xaml.vb" id="Snippetsetapplicationscoperesourcecode":::
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Resources/App.xaml?highlight=8-10":::
 
  The following example shows how to get an application resource in code.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Resources/ApplicationPropertiesSnippet.xaml.cs" id="Snippetgetapplicationscoperesourcecode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTOApplicationModelSnippets/visualbasic/applicationpropertiessnippet.xaml.vb" id="Snippetgetapplicationscoperesourcecode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Resources/applicationpropertiessnippet.xaml.vb" id="Snippetgetapplicationscoperesourcecode":::
 
  ]]></format>
         </remarks>
@@ -2088,7 +2088,7 @@ This example illustrates how to use XAML together with application-scope resourc
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/SessionEnding/App.xaml" id="Snippethandlingsessionendingxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/SessionEnding/App.xaml.cs" id="Snippethandlingsessionendingcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationSessionEndingSnippets/visualbasic/application.xaml.vb" id="Snippethandlingsessionendingcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/SessionEnding/application.xaml.vb" id="Snippethandlingsessionendingcodebehind":::
 
  ]]></format>
         </remarks>
@@ -2390,7 +2390,7 @@ This example illustrates how to use XAML together with application-scope resourc
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Startup/App.xaml" id="Snippethandlestartupxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Startup/App.xaml.cs" id="Snippethandlestartupcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationStartupSnippets/visualbasic/application.xaml.vb" id="Snippethandlestartupcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Startup/application.xaml.vb" id="Snippethandlestartupcodebehind":::
 
  XAML browser applications (XBAPs) cannot retrieve and process command-line arguments because they are launched with ClickOnce deployment (see [Deploying a WPF Application (WPF)](/dotnet/framework/wpf/app-development/deploying-a-wpf-application-wpf)). However, they can retrieve and process query string parameters from the URLs that are used to launch them.
 
@@ -2593,9 +2593,9 @@ This example illustrates how to use XAML together with application-scope resourc
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/TryFindResource/App.xaml" id="Snippetapplicationcalltryfindresourcexaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/TryFindResource/MainWindow.xaml.cs" id="Snippetapplicationcalltryfindresourcecodebehind1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetapplicationcalltryfindresourcecodebehind1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/TryFindResource/mainwindow.xaml.vb" id="Snippetapplicationcalltryfindresourcecodebehind1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/TryFindResource/MainWindow.xaml.cs" id="Snippetapplicationcalltryfindresourcecodebehind2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationTryFindResourceSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetapplicationcalltryfindresourcecodebehind2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/TryFindResource/mainwindow.xaml.vb" id="Snippetapplicationcalltryfindresourcecodebehind2":::
 
  ]]></format>
         </remarks>
@@ -2643,14 +2643,14 @@ This example illustrates how to use XAML together with application-scope resourc
  The following example demonstrates how to enumerate the <xref:System.Windows.Application.Windows%2A> property to build a top-level Windows menu, which is common to multiple-document interface (MDI) applications like Microsoft Excel, or multiple-instance Single Document Interface (SDI) applications like Microsoft Word.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Windows/WindowMenuItem.cs" id="Snippetwindowmenuitemcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/windowmenuitem.vb" id="Snippetwindowmenuitemcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Windows/windowmenuitem.vb" id="Snippetwindowmenuitemcode":::
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Application/Windows/MainWindow.xaml" id="Snippetmainwindowsetwindowsxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Windows/MainWindow.xaml.cs" id="Snippetmainwindowsetwindowscodebehind1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowsetwindowscodebehind1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Windows/mainwindow.xaml.vb" id="Snippetmainwindowsetwindowscodebehind1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/Windows/MainWindow.xaml.cs" id="Snippetmainwindowsetwindowscodebehind2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ApplicationWindowsSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetmainwindowsetwindowscodebehind2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/Windows/mainwindow.xaml.vb" id="Snippetmainwindowsetwindowscodebehind2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/Clipboard.xml b/xml/System.Windows/Clipboard.xml
index 6bde44ff696..0dc495f4775 100644
--- a/xml/System.Windows/Clipboard.xml
+++ b/xml/System.Windows/Clipboard.xml
@@ -60,7 +60,7 @@
  The following example shows how to add data to the system Clipboard.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_setdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_setdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_setdata":::
 
  ]]></format>
     </remarks>
@@ -196,7 +196,7 @@
  The following example demonstrates the use of this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_containsdatagetdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_containsdatagetdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_containsdatagetdata":::
 
  ]]></format>
         </remarks>
@@ -512,7 +512,7 @@
  The following example demonstrates the use of this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_containsdatagetdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_containsdatagetdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_containsdatagetdata":::
 
  ]]></format>
         </remarks>
@@ -801,7 +801,7 @@
  The following example demonstrates the use of this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_setdataobjectiscurrent":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_setdataobjectiscurrent":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_setdataobjectiscurrent":::
 
  ]]></format>
         </remarks>
@@ -957,7 +957,7 @@
  The following example demonstrates the use of this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_setdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_setdata":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_setdata":::
 
  ]]></format>
         </remarks>
@@ -1113,7 +1113,7 @@
  The following example demonstrates the use of this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_setdataobjectiscurrent":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_setdataobjectiscurrent":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_setdataobjectiscurrent":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/CoerceValueCallback.xml b/xml/System.Windows/CoerceValueCallback.xml
index ccbdf0c6638..c16d70e0ed8 100644
--- a/xml/System.Windows/CoerceValueCallback.xml
+++ b/xml/System.Windows/CoerceValueCallback.xml
@@ -59,7 +59,7 @@
  The following example includes an implementation of this callback to coerce the stored value of a dependency property based on other inputs, such as another property's value. In this case, the callback checks to see whether the `ShirtType` property corresponds to a type of shirt that has buttons; if so it establishes a starting default color for the `ButtonColor`, if the shirt type has no buttons, it coerces the `ButtonColor` value back to a starting value, which causes the UI (not shown) to remove that dropdown from the effective choices.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/CoerceValueCallback/Overview/default.xaml.cs" id="Snippetcoercevaluecallback":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/default.xaml.vb" id="Snippetcoercevaluecallback":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/default.xaml.vb" id="Snippetcoercevaluecallback":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/ComponentResourceKey.xml b/xml/System.Windows/ComponentResourceKey.xml
index ff5690b3f51..fa9ed2e02dd 100644
--- a/xml/System.Windows/ComponentResourceKey.xml
+++ b/xml/System.Windows/ComponentResourceKey.xml
@@ -135,7 +135,7 @@
  The following example creates a <xref:System.Windows.ComponentResourceKey> that is then exposed as a static key of a control class to provide a style customization entry point.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetcrkcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetcrkcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetcrkcode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/ContentElement.xml b/xml/System.Windows/ContentElement.xml
index 1d7eaafd83b..b4acd7e0f39 100644
--- a/xml/System.Windows/ContentElement.xml
+++ b/xml/System.Windows/ContentElement.xml
@@ -201,7 +201,7 @@
  The following example implements a handler invoked on the <xref:System.Windows.FrameworkElement.Initialized> event on a page that attaches a defined handler to one of the named elements on the page using `handledEventsToo` `true`. This handler would be invoked even if another element along the route marked the shared event data as handled before reaching the handling element in the route.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AddHandler/page2.xaml.cs" id="Snippetaddhandlerhandledtoo":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/page2.xaml.vb" id="Snippetaddhandlerhandledtoo":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/AddHandler/page2.xaml.vb" id="Snippetaddhandlerhandledtoo":::
 
  ]]></format>
         </remarks>
@@ -815,7 +815,7 @@
  The following example captures the mouse or releases capture, based on whether the mouse is already captured by the element. Note that this example casts the prospective capture target element to the <xref:System.Windows.IInputElement> interface, and is thus initially calling the <xref:System.Windows.IInputElement.CaptureMouse%2A?displayProperty=nameWithType> method. Casting to <xref:System.Windows.IInputElement> is a technique that is useful if you are unsure whether the element you want to have capture the mouse is a <xref:System.Windows.UIElement> or a <xref:System.Windows.ContentElement>. The interface cast and the interface method call then calls the appropriate type-specific CaptureMouse implementation internally without requiring a trial cast to either <xref:System.Windows.UIElement> or <xref:System.Windows.ContentElement>. This same casting technique works for other members that <xref:System.Windows.IInputElement> defines, for instance many of the input-related events, and other input-related methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetismousecaptured":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetismousecaptured":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetismousecaptured":::
 
  ]]></format>
         </remarks>
@@ -1369,7 +1369,7 @@
  The following example is a page-loaded event handler that finds a specified named paragraph in the document and sets focus to it. Paragraphs are not focusable by default; this particular paragraph had a style applied (not shown) that used a style <xref:System.Windows.Setter> to make it focusable.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetfocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetfocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetfocus":::
 
  ]]></format>
         </remarks>
@@ -1428,7 +1428,7 @@
 When you derive from <xref:System.Windows.ContentElement>, consider whether you want your element to be focusable, because by default it will not be focusable. If you want your element to be focusable, override the metadata for this property in your derived class static constructor as follows:
 
 :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetuielementshortoverride":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetuielementshortoverride":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetuielementshortoverride":::
 
 where `myElement` is the class name of the type that you are overriding the metadata value on.
 
@@ -2744,7 +2744,7 @@ The default implementation of this property caches the value and also calculates
  The following example turns the mouse capture state on or off based on whether the mouse is already captured by the element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetismousecaptured":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetismousecaptured":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetismousecaptured":::
 
  ]]></format>
         </remarks>
@@ -11670,7 +11670,7 @@ Note that by default a <xref:System.Windows.ContentElement.Focusable> is not foc
  The following example creates event data, appends the event identifier to the data, and then uses the event data instance to raise a custom routed event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetraiseevent":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetraiseevent":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetraiseevent":::
 
  ]]></format>
         </remarks>
@@ -11743,7 +11743,7 @@ Note that by default a <xref:System.Windows.ContentElement.Focusable> is not foc
  The following handler captures or releases mouse capture according to mouse button states. The example shows how to use captured mouse movement for alternative purposes other than moving the mouse pointer in the UI.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/Trackball.cs" id="Snippetuielementmousecapture":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/trackball.vb" id="Snippetuielementmousecapture":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/trackball.vb" id="Snippetuielementmousecapture":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/DataObject.xml b/xml/System.Windows/DataObject.xml
index 19ccdb3b777..95adcde8726 100644
--- a/xml/System.Windows/DataObject.xml
+++ b/xml/System.Windows/DataObject.xml
@@ -54,7 +54,7 @@
  The following example shows how to use this class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_typestring":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_typestring":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_typestring":::
 
  ]]></format>
     </remarks>
@@ -138,12 +138,12 @@
  The following example creates a new data object and uses this constructor to initialize the data object with a string.  In this case, an appropriate data format is determined automatically according to the stored data's type, and auto-converting of the stored data is allowed by default.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_simple":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_simple":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_simple":::
 
  The following example is a condensed version of the previous example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_simple_condensed":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_simple_condensed":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_simple_condensed":::
 
  ]]></format>
         </remarks>
@@ -193,12 +193,12 @@
  The following example creates a new data object and uses this constructor to initialize the data object with a string and a specified data format.  In this case, the data format is specified by a string; the <xref:System.Windows.DataFormats> class provides a set of predefined type strings. Auto-converting of the stored data is allowed by default.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_typestring":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_typestring":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_typestring":::
 
  The following example is a condensed version of the previous example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_typestring_condensed":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_typestring_condensed":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_typestring_condensed":::
 
  ]]></format>
         </remarks>
@@ -246,12 +246,12 @@
  The following example creates a new data object and uses this constructor to initialize the data object with a string and a specified data format.  In this case, the data format is specified by a <xref:System.Type> parameter.  Auto-converting of the stored data is allowed by default.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_type":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_type":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_type":::
 
  The following example is a condensed version of the previous example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_type_condensed":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_type_condensed":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_type_condensed":::
 
  ]]></format>
         </remarks>
@@ -302,12 +302,12 @@
  The following example creates a new data object and uses this constructor to initialize the data object with a string and a specified data format.  In this case, the data format is specified by a string; the <xref:System.Windows.DataFormats> class provides a set of predefined type strings.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_autoconvert":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_autoconvert":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_autoconvert":::
 
  The following example is a condensed version of the preceding example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_createdataobject_autoconvert_condensed":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_autoconvert_condensed":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_createdataobject_autoconvert_condensed":::
 
  ]]></format>
         </remarks>
@@ -840,12 +840,12 @@
  The following example uses this method to first check whether a specified data format is available (natively or by auto-convert); if the specified format is available, the example retrieves the data by using the <xref:System.Windows.DataObject.GetData%28System.String%29> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_getspecificdataformat":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_getspecificdataformat":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_getspecificdataformat":::
 
  The following example code uses the <xref:System.Windows.DataObject.GetDataPresent%28System.String%2CSystem.Boolean%29> method to first check if a specified data format is available natively (auto-convertible data formats are filtered); if the specified format is available, the example retrieves the data by using the <xref:System.Windows.DataObject.GetData%28System.String%29> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_getspecificdataformat_native":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_getspecificdataformat_native":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_getspecificdataformat_native":::
 
  ]]></format>
         </remarks>
@@ -999,7 +999,7 @@
  The following example uses this method to query for the presence of a particular data format by descriptor string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_querydataformats_string":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_querydataformats_string":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_querydataformats_string":::
 
  ]]></format>
         </remarks>
@@ -1053,7 +1053,7 @@
  The following example uses this method to query for the presence of a particular data format by type.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_querydataformats_type":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_querydataformats_type":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_querydataformats_type":::
 
  ]]></format>
         </remarks>
@@ -1110,7 +1110,7 @@
  The following example uses this method to query for data by descriptor string, and specifies how to treat auto-convertible data formats.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_querydataformats_autoconvert":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_querydataformats_autoconvert":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_querydataformats_autoconvert":::
 
  ]]></format>
         </remarks>
@@ -1207,7 +1207,7 @@
  The following example uses this method to get an array of strings denoting all data formats available in a data object (both native and auto-convertible).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_getalldataformats":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_getalldataformats":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_getalldataformats":::
 
  ]]></format>
         </remarks>
@@ -1258,7 +1258,7 @@
  The following example uses this method to get an array of strings denoting only data formats available in a data object (auto-convertible data formats are filtered).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Clipboard/Overview/Window1.xaml.cs" id="Snippet_dragdrop_getalldataformats_nativeonly":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DragDrop_DragDropMiscCode/visualbasic/window1.xaml.vb" id="Snippet_dragdrop_getalldataformats_nativeonly":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Clipboard/Overview/window1.xaml.vb" id="Snippet_dragdrop_getalldataformats_nativeonly":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/DependencyObject.xml b/xml/System.Windows/DependencyObject.xml
index 35d9748d427..17391d46fda 100644
--- a/xml/System.Windows/DependencyObject.xml
+++ b/xml/System.Windows/DependencyObject.xml
@@ -139,7 +139,7 @@
  The following example iterates all properties that have local values set on an object, then calls <xref:System.Windows.DependencyObject.ClearValue%2A> to clear the values of each such property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyObject/ClearValue/Default.xaml.cs" id="Snippetiteratelocalvaluesandclear":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/default.xaml.vb" id="Snippetiteratelocalvaluesandclear":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/Default.xaml.vb" id="Snippetiteratelocalvaluesandclear":::
 
  ]]></format>
         </remarks>
@@ -417,7 +417,7 @@
  The following example iterates all properties that have local values set on an object, then calls <xref:System.Windows.DependencyObject.ClearValue%2A> to clear the values of each such property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyObject/ClearValue/Default.xaml.cs" id="Snippetiteratelocalvaluesandclear":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/default.xaml.vb" id="Snippetiteratelocalvaluesandclear":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/Default.xaml.vb" id="Snippetiteratelocalvaluesandclear":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/DependencyObjectType.xml b/xml/System.Windows/DependencyObjectType.xml
index 60001235c10..bcb34f1a48c 100644
--- a/xml/System.Windows/DependencyObjectType.xml
+++ b/xml/System.Windows/DependencyObjectType.xml
@@ -110,7 +110,7 @@
  The following example calls <xref:System.Windows.DependencyObjectType.FromSystemType%2A> , creating a <xref:System.Windows.DependencyObjectType> based on the type of the <xref:System.Windows.Window> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyObjectType/FromSystemType/page3.xaml.cs" id="Snippetdotfromsystemtype":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page3.xaml.vb" id="Snippetdotfromsystemtype":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page3.xaml.vb" id="Snippetdotfromsystemtype":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/DependencyProperty.xml b/xml/System.Windows/DependencyProperty.xml
index fbe67c69cb7..f216a278a7f 100644
--- a/xml/System.Windows/DependencyProperty.xml
+++ b/xml/System.Windows/DependencyProperty.xml
@@ -260,9 +260,9 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpdefaultvalue":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpdefaultvalue":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpdefaultvalue":::
 
  ]]></format>
         </remarks>
@@ -360,7 +360,7 @@
  The following example gets metadata for a dependency property based on its type. The type is obtained by using a `typeof` operator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/default.xaml.cs" id="Snippetgetmetadatatype":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/default.xaml.vb" id="Snippetgetmetadatatype":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/default.xaml.vb" id="Snippetgetmetadatatype":::
 
  ]]></format>
         </remarks>
@@ -409,7 +409,7 @@
  The following example gets metadata for a dependency property based on a specific <xref:System.Windows.DependencyObject> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/default.xaml.cs" id="Snippetgetmetadatadoinstance":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/default.xaml.vb" id="Snippetgetmetadatadoinstance":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/default.xaml.vb" id="Snippetgetmetadatadoinstance":::
 
  ]]></format>
         </remarks>
@@ -456,7 +456,7 @@
  The following example gets metadata for a dependency property based on its <xref:System.Windows.DependencyObjectType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/default.xaml.cs" id="Snippetgetmetadatadotype":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/default.xaml.vb" id="Snippetgetmetadatadotype":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/default.xaml.vb" id="Snippetgetmetadatadotype":::
 
  ]]></format>
         </remarks>
@@ -541,7 +541,7 @@
  The following example uses <xref:System.Windows.DependencyProperty.IsValidType%2A> as a check before calling <xref:System.Windows.DependencyObject.SetValue%2A> on the dependency property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippettrysetvalue":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippettrysetvalue":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippettrysetvalue":::
 
  ]]></format>
         </remarks>
@@ -593,7 +593,7 @@
  The following example uses <xref:System.Windows.DependencyProperty.IsValidValue%2A> as a check before calling <xref:System.Windows.DependencyObject.SetValue%2A> on the dependency property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippettrysetvaluewithvalidate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippettrysetvaluewithvalidate":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippettrysetvaluewithvalidate":::
 
  ]]></format>
         </remarks>
@@ -645,7 +645,7 @@
  The following example queries various characteristics of a dependency property identifier, including the <xref:System.Windows.DependencyProperty.Name%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpprops":::
 
  ]]></format>
         </remarks>
@@ -800,7 +800,7 @@
  The following example gets the owner type based on a dependency property identifier `dp`, and then gets metadata on the owner type for that same identifier. This operation is actually equivalent to getting <xref:System.Windows.DependencyProperty.DefaultMetadata%2A> on `dp`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 
  ]]></format>
         </remarks>
@@ -849,7 +849,7 @@
  The following example queries various characteristics of a dependency property identifier, including the <xref:System.Windows.DependencyProperty.PropertyType%2A>. The type name string of the <xref:System.Windows.DependencyProperty.PropertyType%2A> is obtained from the returned <xref:System.Type>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpprops":::
 
  ]]></format>
         </remarks>
@@ -897,7 +897,7 @@
  The following example obtains the default metadata and the dependency property identifier properties from various dependency property fields, and uses the information to populate a table to implement a "metadata browser".
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpprops":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpprops":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/DependencyPropertyChangedEventArgs.xml b/xml/System.Windows/DependencyPropertyChangedEventArgs.xml
index daa2b0bc4ae..ee9b4584f48 100644
--- a/xml/System.Windows/DependencyPropertyChangedEventArgs.xml
+++ b/xml/System.Windows/DependencyPropertyChangedEventArgs.xml
@@ -36,7 +36,7 @@
  The following example uses the <xref:System.Windows.DependencyPropertyChangedEventArgs> class in the context of a <xref:System.Windows.PropertyChangedCallback> for a particular property of a custom class that also defines events. The callback takes the results of old and new values from the property system as communicated by <xref:System.Windows.DependencyPropertyChangedEventArgs>, and repackages these into a different events arguments class <xref:System.Windows.RoutedPropertyChangedEventArgs%601>. The new arguments are then used as the data for a "ValueChanged" event defined by and raised by the custom class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyPropertyChangedEventArgs/Overview/NumericUpDown.cs" id="Snippetdependencypropertychangedeventargs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/numericupdown.vb" id="Snippetdependencypropertychangedeventargs":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/numericupdown.vb" id="Snippetdependencypropertychangedeventargs":::  
   
  ]]></format>
     </remarks>
@@ -237,7 +237,7 @@
  The following example uses the <xref:System.Windows.DependencyPropertyChangedEventArgs> class in the context of a <xref:System.Windows.PropertyChangedCallback> for a particular property of a custom class that also defines events. The callback takes the results of old and new values from the property system as communicated by <xref:System.Windows.DependencyPropertyChangedEventArgs>, and repackages these into a different events arguments class <xref:System.Windows.RoutedPropertyChangedEventArgs%601>. The new arguments are then used as the data for a "ValueChanged" event defined by and raised by the custom class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyPropertyChangedEventArgs/Overview/NumericUpDown.cs" id="Snippetdependencypropertychangedeventargs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/numericupdown.vb" id="Snippetdependencypropertychangedeventargs":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/numericupdown.vb" id="Snippetdependencypropertychangedeventargs":::  
   
  ]]></format>
         </remarks>
@@ -280,7 +280,7 @@
  The following example uses the <xref:System.Windows.DependencyPropertyChangedEventArgs> class in the context of a <xref:System.Windows.PropertyChangedCallback> for a particular property of a custom class that also defines events. The callback takes the results of old and new values from the property system as communicated by <xref:System.Windows.DependencyPropertyChangedEventArgs>, and repackages these into a different events arguments class <xref:System.Windows.RoutedPropertyChangedEventArgs%601>. The new arguments are then used as the data for a "ValueChanged" event defined by and raised by the custom class.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyPropertyChangedEventArgs/Overview/NumericUpDown.cs" id="Snippetdependencypropertychangedeventargs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDownOneProject/visualbasic/numericupdown.vb" id="Snippetdependencypropertychangedeventargs":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyPropertyChangedEventArgs/Overview/numericupdown.vb" id="Snippetdependencypropertychangedeventargs":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/DragDrop.xml b/xml/System.Windows/DragDrop.xml
index 2b93d10bdca..a2325fb79c4 100644
--- a/xml/System.Windows/DragDrop.xml
+++ b/xml/System.Windows/DragDrop.xml
@@ -635,7 +635,7 @@
  The following example shows how to initiate a drag-and-drop operation from the <xref:System.Windows.UIElement.MouseMove> event handler of an <xref:System.Windows.Shapes.Ellipse> element to make it a drag source. The transferred data is the string representation of the ellipse's <xref:System.Windows.Shapes.Shape.Fill%2A> property. The data is passed to the <xref:System.Windows.DragDrop.DoDragDrop%2A> method as a string and is automatically wrapped in a <xref:System.Windows.DataObject>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.cs" id="Snippetdodragdrop":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml.vb" id="Snippetdodragdrop":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.vb" id="Snippetdodragdrop":::
 
  ]]></format>
         </remarks>
@@ -687,7 +687,7 @@
  The following example shows the <xref:System.Windows.DragDrop.DragEnter> event handler for an <xref:System.Windows.Shapes.Ellipse> element. This code previews the effects of the drag-and-drop operation by saving the current <xref:System.Windows.Shapes.Shape.Fill%2A> brush. It then checks to see if the <xref:System.Windows.DataObject> being dragged over the ellipse contains string data that can be converted to a <xref:System.Windows.Media.Brush>. If so, the <xref:System.Windows.Media.Brush> is applied to the ellipse. The change is reverted in the <xref:System.Windows.DragDrop.DragLeave> event handler. If the data cannot be converted to a <xref:System.Windows.Media.Brush>, no action is performed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.cs" id="Snippetdragenter":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml.vb" id="Snippetdragenter":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.vb" id="Snippetdragenter":::
 
  ]]></format>
         </remarks>
@@ -780,7 +780,7 @@
  The following example shows the <xref:System.Windows.DragDrop.DragLeave> event handler for an <xref:System.Windows.Shapes.Ellipse> element. This code undoes the preview performed in the <xref:System.Windows.DragDrop.DragEnter> event handler by applying the saved <xref:System.Windows.Media.Brush> to the ellipse.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.cs" id="Snippetdragleave":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml.vb" id="Snippetdragleave":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.vb" id="Snippetdragleave":::
 
  ]]></format>
         </remarks>
@@ -873,7 +873,7 @@
  The following example shows the <xref:System.Windows.DragDrop.DragOver> event handler for an <xref:System.Windows.Shapes.Ellipse> element. This code checks to see if the <xref:System.Windows.DataObject> being dragged over the ellipse contains string data that can be converted to a <xref:System.Windows.Media.Brush>. If so, it sets the <xref:System.Windows.DragEventArgs.Effects%2A?displayProperty=nameWithType> property to <xref:System.Windows.DragDropEffects.Copy>. This indicates to the drag source that the data can be copied to the ellipse. If the data cannot be converted to a <xref:System.Windows.Media.Brush>, the <xref:System.Windows.DragEventArgs.Effects%2A?displayProperty=nameWithType> property is set to <xref:System.Windows.DragDropEffects.None>. This indicates to the drag source that the ellipse is not a valid drop target for the data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.cs" id="Snippetdragover":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml.vb" id="Snippetdragover":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.vb" id="Snippetdragover":::
 
  ]]></format>
         </remarks>
@@ -966,7 +966,7 @@
  The following example shows the <xref:System.Windows.DragDrop.Drop> event handler for an <xref:System.Windows.Shapes.Ellipse> element. This code applies the effects of the drag-and-drop operation. It checks to see if the <xref:System.Windows.DataObject> being dragged over the ellipse contains string data that can be converted to a <xref:System.Windows.Media.Brush>. If so, the <xref:System.Windows.Media.Brush> is applied to the ellipse. If the data cannot be converted to a <xref:System.Windows.Media.Brush>, no action is performed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.cs" id="Snippetdrop":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/dragdropsnippets/vb/mainwindow.xaml.vb" id="Snippetdrop":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DragDrop/DoDragDrop/mainwindow.xaml.vb" id="Snippetdrop":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/EventManager.xml b/xml/System.Windows/EventManager.xml
index 6ea8c6f699f..0a55d2242bc 100644
--- a/xml/System.Windows/EventManager.xml
+++ b/xml/System.Windows/EventManager.xml
@@ -36,7 +36,7 @@
  The following example show how to use this class to register a new routed event as a class member, along with the routed event "wrapper" technique of overriding the add and remove implementations for a CLR event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/CoerceValueCallback/Overview/default.xaml.cs" id="Snippeteventmanagerclass":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/default.xaml.vb" id="Snippeteventmanagerclass":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/default.xaml.vb" id="Snippeteventmanagerclass":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/EventSetter.xml b/xml/System.Windows/EventSetter.xml
index 5e0ca8ebd22..c1befcb83b4 100644
--- a/xml/System.Windows/EventSetter.xml
+++ b/xml/System.Windows/EventSetter.xml
@@ -50,7 +50,7 @@
  The following shows the example event handlers:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AddHandler/page2.xaml.cs" id="Snippeteventsetterref":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/page2.xaml.vb" id="Snippeteventsetterref":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/AddHandler/page2.xaml.vb" id="Snippeteventsetterref":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/ExceptionRoutedEventArgs.xml b/xml/System.Windows/ExceptionRoutedEventArgs.xml
index 516d676a7da..11a7ed860fc 100644
--- a/xml/System.Windows/ExceptionRoutedEventArgs.xml
+++ b/xml/System.Windows/ExceptionRoutedEventArgs.xml
@@ -63,7 +63,7 @@
  The following example creates a simple event handler for <xref:System.Windows.ExceptionRoutedEventArgs>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ExceptionRoutedEventArgs/ErrorException/PlaybackExample.cs" id="Snippetexceptionroutedeventargs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/PlaybackExample.vb" id="Snippetexceptionroutedeventargs":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/PlaybackExample.vb" id="Snippetexceptionroutedeventargs":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/FigureHorizontalAnchor.xml b/xml/System.Windows/FigureHorizontalAnchor.xml
index e81895e991f..59f635e906d 100644
--- a/xml/System.Windows/FigureHorizontalAnchor.xml
+++ b/xml/System.Windows/FigureHorizontalAnchor.xml
@@ -32,7 +32,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.HorizontalOffset%2A> property programmatically.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/FigureVerticalAnchor.xml b/xml/System.Windows/FigureVerticalAnchor.xml
index 4cf39de0620..bedcc518afc 100644
--- a/xml/System.Windows/FigureVerticalAnchor.xml
+++ b/xml/System.Windows/FigureVerticalAnchor.xml
@@ -37,7 +37,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.VerticalAnchor%2A> property programmatically.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/FlowDirection.xml b/xml/System.Windows/FlowDirection.xml
index 1944bdb2f17..dfda92c93e4 100644
--- a/xml/System.Windows/FlowDirection.xml
+++ b/xml/System.Windows/FlowDirection.xml
@@ -43,7 +43,7 @@
  The following example shows how to use the <xref:System.Windows.FlowDirection> enumeration programmatically.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FlowDirection/Overview/Window1.xaml.cs" id="Snippet_block_flowdirection":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BlockSnippets/visualbasic/window1.xaml.vb" id="Snippet_block_flowdirection":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FlowDirection/Overview/window1.xaml.vb" id="Snippet_block_flowdirection":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/FontStyles.xml b/xml/System.Windows/FontStyles.xml
index 0a211b90375..176a4da8eac 100644
--- a/xml/System.Windows/FontStyles.xml
+++ b/xml/System.Windows/FontStyles.xml
@@ -91,7 +91,7 @@ Example of font styles
  In the following code example, the <xref:System.Windows.FontStyles.Italic%2A> property is used to return a <xref:System.Windows.FontStyle>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontStyleSnippets.xaml.cs" id="Snippetfontstylesnippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontstylesnippets.xaml.vb" id="Snippetfontstylesnippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontstylesnippets.xaml.vb" id="Snippetfontstylesnippet3":::  
   
  ]]></format>
         </remarks>
@@ -134,7 +134,7 @@ Example of font styles
  In the following code example, the <xref:System.Windows.FontStyles.Normal%2A> property is used to return a <xref:System.Windows.FontStyle>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontStyleSnippets.xaml.cs" id="Snippetfontstylesnippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontstylesnippets.xaml.vb" id="Snippetfontstylesnippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontstylesnippets.xaml.vb" id="Snippetfontstylesnippet2":::  
   
  ]]></format>
         </remarks>
@@ -177,7 +177,7 @@ Example of font styles
  In the following code example, the <xref:System.Windows.FontStyles.Oblique%2A> property is used to return a <xref:System.Windows.FontStyle>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/FontStyleSnippets.xaml.cs" id="Snippetfontstylesnippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/fontstylesnippets.xaml.vb" id="Snippetfontstylesnippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/fontstylesnippets.xaml.vb" id="Snippetfontstylesnippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/FontWeight.xml b/xml/System.Windows/FontWeight.xml
index 6a5db3bbc53..224ef994f54 100644
--- a/xml/System.Windows/FontWeight.xml
+++ b/xml/System.Windows/FontWeight.xml
@@ -114,7 +114,7 @@
  In the following code example, the <xref:System.Windows.FontWeight.Compare%2A> method is used to evaluate two <xref:System.Windows.FontWeight> objects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FontStyle/Overview/Window1.xaml.cs" id="Snippetfontsnippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FontSnippets/visualbasic/window1.xaml.vb" id="Snippetfontsnippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FontStyles/Italic/window1.xaml.vb" id="Snippetfontsnippet11":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/FrameworkContentElement.xml b/xml/System.Windows/FrameworkContentElement.xml
index 34cc273391e..cbce824ed7a 100644
--- a/xml/System.Windows/FrameworkContentElement.xml
+++ b/xml/System.Windows/FrameworkContentElement.xml
@@ -575,7 +575,7 @@
  The following example implements a handler that changes the cursor over a named region `DisplayArea` (not shown). The comment hints at a <xref:System.Windows.UIElement> usage, but in fact this sample would be identical if `DisplayArea` were a <xref:System.Windows.FrameworkContentElement>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.cs" id="Snippetchangecursorssample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/Window1.xaml.vb" id="Snippetchangecursorssample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.vb" id="Snippetchangecursorssample":::
 
  ]]></format>
         </remarks>
@@ -785,7 +785,7 @@
  The following example sets the cursor to a custom value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.cs" id="Snippetchangecursorssample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/Window1.xaml.vb" id="Snippetchangecursorssample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.vb" id="Snippetchangecursorssample":::
 
  ]]></format>
         </remarks>
@@ -926,7 +926,7 @@
  The following example sets a binding on a <xref:System.Windows.Documents.Paragraph> element, by creating a new custom data object, establishing that object as <xref:System.Windows.FrameworkContentElement.DataContext%2A>, and setting the binding path to a property within it.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetdatacontext":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetdatacontext":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetdatacontext":::
 
  ]]></format>
         </remarks>
@@ -1153,7 +1153,7 @@
  The following example sets a property on an element found by name within a referenced <xref:System.Windows.Documents.FlowDocument> on a page.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetfindname":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetfindname":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetfindname":::
 
  ]]></format>
         </remarks>
@@ -1206,7 +1206,7 @@
  The following example finds a resource as defined in markup and applies it to a certain property of an element in response to a routed event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetfindresource":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetfindresource":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetfindresource":::
 
  ]]></format>
         </remarks>
@@ -1424,7 +1424,7 @@
  The following example retrieves a binding by querying a property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetgetbindingexpression":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetgetbindingexpression":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetgetbindingexpression":::
 
  ]]></format>
         </remarks>
@@ -1663,7 +1663,7 @@
  The following example code uses <xref:System.Windows.FrameworkContentElement.IsLoaded%2A> as a conditional check to assure that a function `displayData` (not shown) will have valid elements loaded on the page to work against, as part of an on-demand handler. That same logic is run as an event handler for <xref:System.Windows.FrameworkContentElement.Loaded>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetisloaded":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetisloaded":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetisloaded":::
 
  ]]></format>
         </remarks>
@@ -2443,7 +2443,7 @@
  The following example checks to see whether the <xref:System.Windows.FrameworkContentElement.Parent%2A> of a <xref:System.Windows.Documents.TextPointer> is of a particular type.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/Parent/Window1.xaml.cs" id="Snippetfceparent":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextPointer_Snippets/visualbasic/window1.xaml.vb" id="Snippetfceparent":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/Parent/window1.xaml.vb" id="Snippetfceparent":::
 
  ]]></format>
         </remarks>
@@ -2700,7 +2700,7 @@
  The following example sets a binding on a <xref:System.Windows.Documents.Paragraph> element, by creating a new custom data object, establishing that object as <xref:System.Windows.FrameworkContentElement.DataContext%2A>, and setting the binding path to a property within it.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetdatacontext":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetdatacontext":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetdatacontext":::
 
  ]]></format>
         </remarks>
@@ -2749,7 +2749,7 @@
  The following example sets a binding on a <xref:System.Windows.Documents.Paragraph> element, by creating a new <xref:System.Windows.Data.Binding> and setting the source to a newly built `DateTime` object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippetsetbinding":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetsetbinding":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippetsetbinding":::
 
  ]]></format>
         </remarks>
@@ -3327,7 +3327,7 @@
  The following example sets the value of the <xref:System.Windows.FrameworkElement.ToolTip%2A> property directly to a string.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/ToolTip/Window1.xaml.cs" id="Snippet_table_rowgroups_maniprows":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TableSnippets2/visualbasic/window1.xaml.vb" id="Snippet_table_rowgroups_maniprows":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/ToolTip/window1.xaml.vb" id="Snippet_table_rowgroups_maniprows":::
 
  ]]></format>
         </remarks>
@@ -3563,7 +3563,7 @@
  The following example finds a resource as defined in markup and applies it to a certain property of an element in response to a routed event.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AllowDrop/page1.xaml.cs" id="Snippettryfindresource":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ContentElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippettryfindresource":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/CaptureMouse/page1.xaml.vb" id="Snippettryfindresource":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/FrameworkElement.xml b/xml/System.Windows/FrameworkElement.xml
index d283ecf0bfb..840e3ee5375 100644
--- a/xml/System.Windows/FrameworkElement.xml
+++ b/xml/System.Windows/FrameworkElement.xml
@@ -163,7 +163,7 @@
  The following example displays various height properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/ActualHeight/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HeightMinHeightMaxHeight/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/ActualHeight/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -245,7 +245,7 @@
  The following example displays various width properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/ActualWidth/Window1.xaml.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WidthMinWidthMaxWidth/VisualBasic/Window1.xaml.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/ActualWidth/Window1.xaml.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -551,7 +551,7 @@
  The following example retrieves a <xref:System.Windows.Media.Animation.Storyboard> from resources, and then runs that <xref:System.Windows.Media.Animation.Storyboard> when an internal event is class handled.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BeginStoryboard/Page1.xaml.cs" id="Snippetfebeginstoryboard":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/page1.xaml.vb" id="Snippetfebeginstoryboard":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/page1.xaml.vb" id="Snippetfebeginstoryboard":::
 
  ]]></format>
         </remarks>
@@ -622,7 +622,7 @@
  The following example retrieves a <xref:System.Windows.Media.Animation.Storyboard> from resources, and then runs that <xref:System.Windows.Media.Animation.Storyboard> when an internal event is class handled.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BeginStoryboard/Page1.xaml.cs" id="Snippetfebeginstoryboard":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/page1.xaml.vb" id="Snippetfebeginstoryboard":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/page1.xaml.vb" id="Snippetfebeginstoryboard":::
 
  ]]></format>
         </remarks>
@@ -752,12 +752,12 @@
  The following example shows the <xref:System.Windows.Controls.ValidationRule> that the previous example uses.  In the <xref:System.Windows.Controls.ValidationRule.Validate%2A> method override, the example gets each source object from the <xref:System.Windows.Data.BindingGroup> and checks whether the properties of the objects are equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window3.xaml.cs" id="Snippetbindinggroupnamevalidationrule":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml.vb" id="Snippetbindinggroupnamevalidationrule":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml.vb" id="Snippetbindinggroupnamevalidationrule":::
 
  To invoke the <xref:System.Windows.Controls.ValidationRule>, call the <xref:System.Windows.Data.BindingGroup.UpdateSources%2A> method.  The following example calls <xref:System.Windows.Data.BindingGroup.UpdateSources%2A> when the click event of the button occurs.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BindingGroup/Window3.xaml.cs" id="Snippetupdatesourcesclick":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BindingGroupSnippets/visualbasic/window3.xaml.vb" id="Snippetupdatesourcesclick":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BindingGroup/window3.xaml.vb" id="Snippetupdatesourcesclick":::
 
  ]]></format>
         </remarks>
@@ -840,7 +840,7 @@
  The following example implements a handler for an application navigation event that responds whenever the uniform resource identifier (URI) being navigated to includes a fragment. The fragment is named in the URI following the hash sign (#), and the implemented behavior causes the element to scroll into view within the frame. <xref:System.Windows.FrameworkElement.BringIntoView%2A> and <xref:System.Windows.FrameworkElement.RequestBringIntoView> request that scrolling behavior in the example.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BringIntoView/MainWindow.xaml.cs" id="Snippetfebringintoview":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FragmentNavigationSample/VisualBasic/MainWindow.xaml.vb" id="Snippetfebringintoview":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/MainWindow.xaml.vb" id="Snippetfebringintoview":::
 
  ]]></format>
         </remarks>
@@ -893,7 +893,7 @@
  :::code language="xaml" source="~/snippets/csharp/System.Windows/FrameworkElement/BringIntoView/Page1.xaml" id="Snippetbringintoviewrectmarkup":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BringIntoView/Page1.xaml.cs" id="Snippetbringintoviewrectcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetbringintoviewrectcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page1.xaml.vb" id="Snippetbringintoviewrectcode":::
 
  ]]></format>
         </remarks>
@@ -1214,7 +1214,7 @@
  The following example shows how to deliberately set the cursor graphic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.cs" id="Snippetchangecursorssample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/cursors/VisualBasic/Window1.xaml.vb" id="Snippetchangecursorssample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkContentElement/ContextMenuClosing/Window1.xaml.vb" id="Snippetchangecursorssample":::
 
  ]]></format>
         </remarks>
@@ -1658,7 +1658,7 @@
  The following example obtains a named resource and casts it to an appropriate type to fill a property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyObjectType/FromSystemType/page3.xaml.cs" id="Snippetresourceproceduralget":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertiesOvwSupport/visualbasic/page3.xaml.vb" id="Snippetresourceproceduralget":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyObjectType/FromSystemType/page3.xaml.vb" id="Snippetresourceproceduralget":::
 
  ]]></format>
         </remarks>
@@ -2186,9 +2186,9 @@
  The following example shows how a custom adorner uses the values declared by a <xref:System.Windows.Media.VisualCollection> that it maintains for its multiple visual children. These values are reported through overrides of <xref:System.Windows.FrameworkElement.VisualChildrenCount%2A> and <xref:System.Windows.FrameworkElement.GetVisualChild%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/GetVisualChild/ResizingAdorner.cs" id="Snippetfevisualoverridespre":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/resizingadorner.vb" id="Snippetfevisualoverridespre":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/resizingadorner.vb" id="Snippetfevisualoverridespre":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/GetVisualChild/ResizingAdorner.cs" id="Snippetfevisualoverrides":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/resizingadorner.vb" id="Snippetfevisualoverrides":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/resizingadorner.vb" id="Snippetfevisualoverrides":::
 
  ]]></format>
         </remarks>
@@ -3387,7 +3387,7 @@
           <para>The following non-compiling code shows this implementation pattern.  <c>VisualChildren</c> represents an enumerable collection property of children that your own element should define. The property can be named anything. <c>VisualChildren</c> is a placeholder name for purposes of this example, <c>VisualChildren</c> is not an API as provided by WPF or a part of a naming pattern.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetfemeasureoverride":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetfemeasureoverride":::</para>
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetfemeasureoverride":::</para>
         </block>
       </Docs>
     </Member>
@@ -3662,7 +3662,7 @@
  The following example implements a handler that handles several possible button inputs. Each button represents a possible <xref:System.Windows.Input.FocusNavigationDirection>. The handler tracks the element with current keyboard focus, and calls <xref:System.Windows.FrameworkElement.MoveFocus%2A> on that element, by specifying the appropriate <xref:System.Windows.Input.FocusNavigationDirection> as initialization for the <xref:System.Windows.Input.TraversalRequest> type parameter provided.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/MoveFocus/Window1.xaml.cs" id="Snippetfocussamplemovefocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml.vb" id="Snippetfocussamplemovefocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml.vb" id="Snippetfocussamplemovefocus":::
 
  ]]></format>
         </remarks>
@@ -3750,7 +3750,7 @@
  The following example sets the <xref:System.Windows.FrameworkElement.Name%2A> property in code, and then registers the name into the newly created <xref:System.Windows.NameScope> by calling <xref:System.Windows.FrameworkElement.RegisterName%2A>. The technique illustrated here is a requirement for animating with storyboards, because storyboards require targeting by the <xref:System.Windows.FrameworkElement.Name%2A>, and cannot be targeted by object reference.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/Name/AnimatedHeightExample.cs" id="Snippetfename":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/animateHeight_procedural/visualbasic/animatedheightexample.vb" id="Snippetfename":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/Name/animatedheightexample.vb" id="Snippetfename":::
 
  ]]></format>
         </remarks>
@@ -4402,7 +4402,7 @@
  The following example shows code that checks for an element's parent, and then uses property values from the parent to set properties on the child element to match. In this case these are properties that affect the rendering size.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/Parent/Window1.xaml.cs" id="Snippetfeparentproperty":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometryDesigner/visualbasic/window1.xaml.vb" id="Snippetfeparentproperty":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/Parent/window1.xaml.vb" id="Snippetfeparentproperty":::
 
  ]]></format>
         </remarks>
@@ -4493,7 +4493,7 @@
  The following example implements a handler that handles several possible button inputs, each button representing a possible <xref:System.Windows.Input.FocusNavigationDirection>. The handler tracks the element with current keyboard focus, and calls <xref:System.Windows.FrameworkElement.PredictFocus%2A> on that element, and specifies the appropriate <xref:System.Windows.Input.FocusNavigationDirection> as initialization for the <xref:System.Windows.Input.TraversalRequest> type parameter provided. Instead of moving to that element as <xref:System.Windows.FrameworkElement.MoveFocus%2A> would do, the handler changes the physical dimensions of the predicted focus destination for visualization purposes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/MoveFocus/Window1.xaml.cs" id="Snippetfepredictfocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FocusSample/visualbasic/window1.xaml.vb" id="Snippetfepredictfocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/MoveFocus/window1.xaml.vb" id="Snippetfepredictfocus":::
 
  ]]></format>
         </remarks>
@@ -4544,7 +4544,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/RegisterName/ScopeExample.cs" id="Snippetnamescopeexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StoryboardBeginAnimation_procedural_snip/visualbasic/scopeexample.vb" id="Snippetnamescopeexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/RegisterName/scopeexample.vb" id="Snippetnamescopeexample":::
 
  ]]></format>
         </remarks>
@@ -4791,7 +4791,7 @@
  The following example sets a binding using a specific path.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BringIntoView/Page1.xaml.cs" id="Snippetsetbindingpath":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetsetbindingpath":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page1.xaml.vb" id="Snippetsetbindingpath":::
 
  ]]></format>
         </remarks>
@@ -5595,7 +5595,7 @@
  The following example creates a <xref:System.Windows.Controls.ToolTip> in code and then sets the <xref:System.Windows.FrameworkElement.ToolTip%2A> property on a <xref:System.Windows.Controls.Primitives.StatusBar> control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/ToolTip/Window1.xaml.cs" id="Snippetmakeprogressbar":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StatusBar/visualbasic/window1.xaml.vb" id="Snippetmakeprogressbar":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/ToolTip/window1.xaml.vb" id="Snippetmakeprogressbar":::
 
  ]]></format>
         </remarks>
@@ -5913,7 +5913,7 @@
  The following example is implemented as a button handler, where the button being clicked sets its background to a resource-defined brush obtained by calling <xref:System.Windows.FrameworkElement.TryFindResource%2A> on itself. This walks the element tree and finds the resource (the resource itself is defined in XAML and is not shown).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BringIntoView/Page1.xaml.cs" id="Snippetfetryfindresource":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BaseElementsSmorgasbord/visualbasic/page1.xaml.vb" id="Snippetfetryfindresource":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BringIntoView/page1.xaml.vb" id="Snippetfetryfindresource":::
 
  ]]></format>
         </remarks>
@@ -6299,9 +6299,9 @@
  The following example shows how a custom adorner uses the values declared by a <xref:System.Windows.Media.VisualCollection> that it maintains for its multiple visual children and reports these values through overrides of <xref:System.Windows.FrameworkElement.VisualChildrenCount%2A> and <xref:System.Windows.FrameworkElement.GetVisualChild%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/GetVisualChild/ResizingAdorner.cs" id="Snippetfevisualoverridespre":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/resizingadorner.vb" id="Snippetfevisualoverridespre":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/resizingadorner.vb" id="Snippetfevisualoverridespre":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/GetVisualChild/ResizingAdorner.cs" id="Snippetfevisualoverrides":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Adorners_ResizingAdorner/visualbasic/resizingadorner.vb" id="Snippetfevisualoverrides":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/GetVisualChild/resizingadorner.vb" id="Snippetfevisualoverrides":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/FrameworkPropertyMetadata.xml b/xml/System.Windows/FrameworkPropertyMetadata.xml
index caadd19c0e8..feffb49c459 100644
--- a/xml/System.Windows/FrameworkPropertyMetadata.xml
+++ b/xml/System.Windows/FrameworkPropertyMetadata.xml
@@ -42,9 +42,9 @@
  The following example gets metadata for a dependency property on a particular owner as the initial base <xref:System.Windows.PropertyMetadata> type. That metadata is cast to <xref:System.Windows.FrameworkPropertyMetadata>. If the cast returned a valid <xref:System.Windows.FrameworkPropertyMetadata>, then various <xref:System.Windows.FrameworkPropertyMetadata> property values are reported through a simple UI (not shown).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetfpmproperties":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetfpmproperties":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetfpmproperties":::
 
  ]]></format>
     </remarks>
@@ -659,9 +659,9 @@
  The following example obtains the default metadata from various dependency property fields, queries the value of various <xref:System.Windows.FrameworkPropertyMetadata> properties on it, and uses the information to populate a table to implement a "metadata browser".
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetfpmproperties":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetfpmproperties":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetfpmproperties":::
 
  ]]></format>
         </remarks>
@@ -715,9 +715,9 @@
  The following example obtains the default metadata from various dependency property fields, queries the value of various <xref:System.Windows.FrameworkPropertyMetadata> properties on it, and uses the information to populate a table to implement a "metadata browser".
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetfpmproperties":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetfpmproperties":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetfpmproperties":::
 
  ]]></format>
         </remarks>
@@ -872,9 +872,9 @@
  The following example obtains the default metadata from various dependency property fields, queries the value of various <xref:System.Windows.FrameworkPropertyMetadata> properties on it, and uses the information to populate a table to implement a "metadata browser".
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetfpmproperties":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetfpmproperties":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetfpmproperties":::
 
  ]]></format>
         </remarks>
@@ -930,9 +930,9 @@
  The following example obtains the default metadata from various dependency property fields, queries the value of various <xref:System.Windows.FrameworkPropertyMetadata> properties on it, and uses the information to populate a table to implement a "metadata browser".
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetfpmproperties":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetfpmproperties":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetfpmproperties":::
 
  ]]></format>
         </remarks>
@@ -1028,9 +1028,9 @@
  The following example obtains the default metadata from various dependency property fields, queries the value of various <xref:System.Windows.FrameworkPropertyMetadata> properties on it, and uses the information to populate a table to implement a "metadata browser".
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetfpmproperties":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetfpmproperties":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetfpmproperties":::
 
  ]]></format>
         </remarks>
@@ -1082,9 +1082,9 @@
  The following example obtains the default metadata from various dependency property fields, queries the value of various <xref:System.Windows.FrameworkPropertyMetadata> properties on it, and uses the information to populate a table to implement a "metadata browser".
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetdpgetmetadatasingle":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetdpgetmetadatasingle":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyProperty/DefaultMetadata/XamlApp/page2.xaml.cs" id="Snippetfpmproperties":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PropertySystemEsoterics/visualbasic/xamlapp/page2.xaml.vb" id="Snippetfpmproperties":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyProperty/DefaultMetadata/page2.xaml.vb" id="Snippetfpmproperties":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/HierarchicalDataTemplate.xml b/xml/System.Windows/HierarchicalDataTemplate.xml
index 872a04f3f60..f8b5669987d 100644
--- a/xml/System.Windows/HierarchicalDataTemplate.xml
+++ b/xml/System.Windows/HierarchicalDataTemplate.xml
@@ -270,7 +270,7 @@
  The following example creates the data that is used in the previous example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/Window1.xaml.cs" id="Snippettreeviewdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml.vb" id="Snippettreeviewdata":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml.vb" id="Snippettreeviewdata":::  
   
  ]]></format>
         </remarks>
@@ -323,12 +323,12 @@
  The following example shows the <xref:System.Windows.Controls.StyleSelector> that is used in the previous example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/Window1.xaml.cs" id="Snippettreeviewitemstyleselector":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml.vb" id="Snippettreeviewitemstyleselector":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml.vb" id="Snippettreeviewitemstyleselector":::  
   
  The following example creates the data that is used in the previous example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/Window1.xaml.cs" id="Snippettreeviewdata":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RecycleItemContainerShippets/visualbasic/window1.xaml.vb" id="Snippettreeviewdata":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/HierarchicalDataTemplate/ItemContainerStyle/window1.xaml.vb" id="Snippettreeviewdata":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/IWeakEventListener.xml b/xml/System.Windows/IWeakEventListener.xml
index 7135251ab57..e2b469c48e5 100644
--- a/xml/System.Windows/IWeakEventListener.xml
+++ b/xml/System.Windows/IWeakEventListener.xml
@@ -78,7 +78,7 @@
  The following example implements <xref:System.Windows.IWeakEventListener.ReceiveWeakEvent%2A> to provide WeakEvent pattern support for two hypothetical events `ClockwiseSpin` and `CounterclockwiseSpin` that each have a dedicated <xref:System.Windows.WeakEventManager> (not shown). This implementation calls class handler stubs for each supported event, casting the event data (in this case the two events share an event data type `SpinEventArgs`). The implementation returns `false` if the event received is not one that is expected.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetiweakeventlistener":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetiweakeventlistener":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetiweakeventlistener":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/LengthConverter.xml b/xml/System.Windows/LengthConverter.xml
index c53b48964b7..1c6f89c0bc0 100644
--- a/xml/System.Windows/LengthConverter.xml
+++ b/xml/System.Windows/LengthConverter.xml
@@ -32,7 +32,7 @@
  The following example shows how to create and use an instance of the <xref:System.Windows.LengthConverter> object. A custom method called `ChangeLeft` is defined, which converts the content of a <xref:System.Windows.Controls.ListBoxItem> (defined in a separate Extensible Application Markup Language (XAML) file) to an instance of <xref:System.Double>, and later into a <xref:System.String>. This method passes the <xref:System.Windows.Controls.ListBoxItem> to a <xref:System.Windows.LengthConverter> object, which converts the <xref:System.Windows.Controls.ListBoxItem> <xref:System.Windows.Controls.ContentControl.Content%2A> to an instance of <xref:System.Double>. Notice that this value has already been converted to a <xref:System.String> by using the <xref:System.Windows.Controls.Control.ToString%2A> method. This value is then passed back to the <xref:System.Windows.Controls.Canvas.SetLeft%2A> method and the <xref:System.Windows.Controls.Canvas.GetLeft%2A> method of the <xref:System.Windows.Controls.Canvas> in order to change the position of the `text1` object.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/LengthConverter/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CanvasPositioningProperties/VisualBasic/Window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/LengthConverter/Overview/Window1.xaml.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/LocalValueEntry.xml b/xml/System.Windows/LocalValueEntry.xml
index c247ab9a37d..6f45560abe3 100644
--- a/xml/System.Windows/LocalValueEntry.xml
+++ b/xml/System.Windows/LocalValueEntry.xml
@@ -36,7 +36,7 @@
  The following example iterates locally set values of a <xref:System.Windows.DependencyObject> and queries <xref:System.Windows.LocalValueEntry> properties.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/DependencyObject/ClearValue/Default.xaml.cs" id="Snippetiteratelocalvaluesandclear":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DPClearValue/VisualBasic/default.xaml.vb" id="Snippetiteratelocalvaluesandclear":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/DependencyObject/ClearValue/Default.xaml.vb" id="Snippetiteratelocalvaluesandclear":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/MessageBox.xml b/xml/System.Windows/MessageBox.xml
index 84b4c4c75b4..f58418ebbe5 100644
--- a/xml/System.Windows/MessageBox.xml
+++ b/xml/System.Windows/MessageBox.xml
@@ -109,7 +109,7 @@
  The following example shows how to use this overload of the <xref:System.Windows.MessageBox.Show%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/MessageBox/Show/Show1Window.xaml.cs" id="Snippetmessageboxshow1code":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show1window.xaml.vb" id="Snippetmessageboxshow1code":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/MessageBox/Show/show1window.xaml.vb" id="Snippetmessageboxshow1code":::  
   
  ]]></format>
         </remarks>
@@ -159,7 +159,7 @@
  The following example shows how to use this overload of the <xref:System.Windows.MessageBox.Show%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/MessageBox/Show/Show2Window.xaml.cs" id="Snippetmessageboxshow2code":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show2window.xaml.vb" id="Snippetmessageboxshow2code":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/MessageBox/Show/show2window.xaml.vb" id="Snippetmessageboxshow2code":::  
   
  ]]></format>
         </remarks>
@@ -260,7 +260,7 @@
  The following example shows how to use this overload of the <xref:System.Windows.MessageBox.Show%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/MessageBox/Show/Show3Window.xaml.cs" id="Snippetmessageboxshow3code":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show3window.xaml.vb" id="Snippetmessageboxshow3code":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/MessageBox/Show/show3window.xaml.vb" id="Snippetmessageboxshow3code":::  
   
  ]]></format>
         </remarks>
@@ -365,7 +365,7 @@
  The following example shows how to use this overload of the <xref:System.Windows.MessageBox.Show%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/MessageBox/Show/Show4Window.xaml.cs" id="Snippetmessageboxshow4code":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show4window.xaml.vb" id="Snippetmessageboxshow4code":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/MessageBox/Show/show4window.xaml.vb" id="Snippetmessageboxshow4code":::  
   
  ]]></format>
         </remarks>
@@ -474,7 +474,7 @@
  The following example shows how to use this overload of the <xref:System.Windows.MessageBox.Show%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/MessageBox/Show/Show5Window.xaml.cs" id="Snippetmessageboxshow5code":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show5window.xaml.vb" id="Snippetmessageboxshow5code":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/MessageBox/Show/show5window.xaml.vb" id="Snippetmessageboxshow5code":::  
   
  ]]></format>
         </remarks>
@@ -587,7 +587,7 @@
  The following example shows how to use this overload of the <xref:System.Windows.MessageBox.Show%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/MessageBox/Show/Show6Window.xaml.cs" id="Snippetmessageboxshow6code":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MessageBoxSnippets/visualbasic/show6window.xaml.vb" id="Snippetmessageboxshow6code":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/MessageBox/Show/show6window.xaml.vb" id="Snippetmessageboxshow6code":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/Point.xml b/xml/System.Windows/Point.xml
index 16dd2639ba4..47b6618877f 100644
--- a/xml/System.Windows/Point.xml
+++ b/xml/System.Windows/Point.xml
@@ -72,7 +72,7 @@
  The following example shows how to check if two <xref:System.Windows.Point> structures are not equal.  It also illustrates how to assign values to a <xref:System.Windows.Point> structure when the structure is being declared and after the structure has been declared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetpointinequalityexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetpointinequalityexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetpointinequalityexample":::
 
  ]]></format>
     </remarks>
@@ -480,7 +480,7 @@
  The following example shows how to add a <xref:System.Windows.Point> to a <xref:System.Windows.Vector> using the overloaded (+) operator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetoverloadedadditionoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetoverloadedadditionoperatorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetoverloadedadditionoperatorexample":::
 
  ]]></format>
         </remarks>
@@ -531,7 +531,7 @@
  The following example shows how to check if two <xref:System.Windows.Point> structures are equal using the overloaded (==) operator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetoverloadedequalityoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetoverloadedequalityoperatorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetoverloadedequalityoperatorexample":::
 
  ]]></format>
         </remarks>
@@ -588,7 +588,7 @@
  The following example shows how to explicitly convert a <xref:System.Windows.Point> into a <xref:System.Windows.Size>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetoverloadedexplicitoperatorsizeexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetoverloadedexplicitoperatorsizeexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetoverloadedexplicitoperatorsizeexample":::
 
  ]]></format>
         </remarks>
@@ -630,7 +630,7 @@
  The following example shows how to explicitly convert a <xref:System.Windows.Point> into a <xref:System.Windows.Vector>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetoverloadedexplicitoperatorvectorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetoverloadedexplicitoperatorvectorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetoverloadedexplicitoperatorvectorexample":::
 
  ]]></format>
         </remarks>
@@ -680,7 +680,7 @@
  The following example shows how to check whether two <xref:System.Windows.Point> structures are not equal, using the overloaded (!=) operator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetoverloadedinequalityoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetoverloadedinequalityoperatorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetoverloadedinequalityoperatorexample":::
 
  ]]></format>
         </remarks>
@@ -724,7 +724,7 @@
  The following example shows how to multiply a <xref:System.Windows.Point> by a <xref:System.Windows.Media.Matrix> using the overloaded (*) operator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetoverloadedmultiplypointbymatrixoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetoverloadedmultiplypointbymatrixoperatorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetoverloadedmultiplypointbymatrixoperatorexample":::
 
  ]]></format>
         </remarks>
@@ -778,7 +778,7 @@
  The following example shows how to subtract a <xref:System.Windows.Point> from another <xref:System.Windows.Point> and return a <xref:System.Windows.Vector> using the overloaded (-) operator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetoverloadedsubtractionoperatorexample2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetoverloadedsubtractionoperatorexample2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetoverloadedsubtractionoperatorexample2":::
 
  ]]></format>
         </remarks>
@@ -823,7 +823,7 @@
  The following example shows how to subtract a <xref:System.Windows.Vector> from a <xref:System.Windows.Point> using the overloaded (-) operator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetoverloadedsubtractionoperatorexample1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetoverloadedsubtractionoperatorexample1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetoverloadedsubtractionoperatorexample1":::
 
  ]]></format>
         </remarks>
@@ -866,7 +866,7 @@
  The following example shows how to use the <xref:System.Windows.Point.Parse%2A> method to convert a <xref:System.String> representation of a point into a <xref:System.Windows.Point> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetparseexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetparseexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetparseexample":::
 
  ]]></format>
         </remarks>
@@ -927,7 +927,7 @@
  The following example shows how to subtract a <xref:System.Windows.Point> from another <xref:System.Windows.Point> using the static <xref:System.Windows.Point.Subtract%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetsubtractexample2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetsubtractexample2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetsubtractexample2":::
 
  ]]></format>
         </remarks>
@@ -972,7 +972,7 @@
  The following example shows how to subtract a <xref:System.Windows.Vector> from a <xref:System.Windows.Point> using the static <xref:System.Windows.Point.Subtract%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetsubtractexample1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetsubtractexample1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetsubtractexample1":::
 
  ]]></format>
         </remarks>
@@ -1078,7 +1078,7 @@
  The following example shows how to use the <xref:System.Windows.Point.ToString%2A> method to get a <xref:System.String> representation of a <xref:System.Windows.Point> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippettostringexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippettostringexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippettostringexample":::
 
  ]]></format>
         </remarks>
@@ -1164,7 +1164,7 @@
  The following example shows how to check if two <xref:System.Windows.Point> structures are not equal.  It also illustrates how to assign values to a <xref:System.Windows.Point> structure when the structure is being declared and after the structure has been declared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetpointinequalityexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetpointinequalityexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetpointinequalityexample":::
 
  ]]></format>
         </remarks>
@@ -1213,7 +1213,7 @@
  The following example shows how to check if two <xref:System.Windows.Point> structures are not equal.  It also illustrates how to assign values to a <xref:System.Windows.Point> structure when the structure is being declared and after the structure has been declared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Point/Overview/PointExample.cs" id="Snippetpointinequalityexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/PointExamples_snip/visualbasic/pointexample.vb" id="Snippetpointinequalityexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Point/Overview/pointexample.vb" id="Snippetpointinequalityexample":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/Rect.xml b/xml/System.Windows/Rect.xml
index 643db309a2b..bb228916353 100644
--- a/xml/System.Windows/Rect.xml
+++ b/xml/System.Windows/Rect.xml
@@ -81,7 +81,7 @@
  The following example shows how to use a <xref:System.Windows.Rect> structure to specify the dimensions and location of a rectangle using XAML.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample.cs" id="Snippetrectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb" id="Snippetrectexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb" id="Snippetrectexamplewholepage":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/RectExample.xaml" id="Snippetrectexamplewholepage":::
 
  The following example shows how to use code to create a rectangle and add it to the page. The example also illustrates how to find size and coordinate information about the new rectangle and render the information in a <xref:System.Windows.Controls.TextBox> below the rectangle.
@@ -868,7 +868,7 @@
  The following example shows how to use a <xref:System.Windows.Rect> structure to specify the dimensions and location of a rectangle using XAML.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample.cs" id="Snippetrectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb" id="Snippetrectexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb" id="Snippetrectexamplewholepage":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/RectExample.xaml" id="Snippetrectexamplewholepage":::
 
  The following example shows how to use code to create a rectangle and add it to the page. The example also illustrates how to find size and coordinate information about the new rectangle and render the information in a <xref:System.Windows.Controls.TextBox> below the rectangle.
@@ -1361,7 +1361,7 @@
  The following example shows how to use a <xref:System.Windows.Rect> structure to specify the dimensions and location of a rectangle using XAML.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample.cs" id="Snippetrectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb" id="Snippetrectexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb" id="Snippetrectexamplewholepage":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/RectExample.xaml" id="Snippetrectexamplewholepage":::
 
  The following example shows how to use code to create a rectangle and add it to the page. The example also illustrates how to find size and coordinate information about the new rectangle and render the information in a <xref:System.Windows.Controls.TextBox> below the rectangle.
@@ -1632,7 +1632,7 @@
  The following example shows how to use the <xref:System.Windows.Rect.op_Equality%2A> operator to determine if two rectangles are exactly equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample1.cs" id="Snippetoverloadedequalityoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/rectexample.vb" id="Snippetoverloadedequalityoperatorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/op_Equality/rectexample.vb" id="Snippetoverloadedequalityoperatorexample":::
 
  ]]></format>
         </remarks>
@@ -1687,7 +1687,7 @@
  The following example shows how to use the <xref:System.Windows.Rect.op_Inequality%2A> operator to determine if two rectangles are not exactly equal.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample1.cs" id="Snippetoverloadedinequalityoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/rectexample.vb" id="Snippetoverloadedinequalityoperatorexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/op_Equality/rectexample.vb" id="Snippetoverloadedinequalityoperatorexample":::
 
  ]]></format>
         </remarks>
@@ -1729,7 +1729,7 @@
  The following example shows how to use the <xref:System.Windows.Rect.Parse%2A> method to convert a string representation of a rectangle into a <xref:System.Windows.Rect> structure.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample1.cs" id="Snippetparseexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RectExamples_snip/visualbasic/rectexample.vb" id="Snippetparseexample":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/op_Equality/rectexample.vb" id="Snippetparseexample":::
 
  ]]></format>
         </remarks>
@@ -1852,7 +1852,7 @@
  The following example shows how to use a <xref:System.Windows.Rect> structure to specify the dimensions and location of a rectangle using XAML.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample.cs" id="Snippetrectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb" id="Snippetrectexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb" id="Snippetrectexamplewholepage":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/RectExample.xaml" id="Snippetrectexamplewholepage":::
 
  The following example shows how to use code to create a rectangle and add it to the page. The example also illustrates how to find size and coordinate information about the new rectangle and render the information in a <xref:System.Windows.Controls.TextBox> below the rectangle.
@@ -2462,7 +2462,7 @@
  The following example shows how to use a <xref:System.Windows.Rect> structure to specify the dimensions and location of a rectangle using XAML.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample.cs" id="Snippetrectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb" id="Snippetrectexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb" id="Snippetrectexamplewholepage":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/RectExample.xaml" id="Snippetrectexamplewholepage":::
 
  The following example shows how to use code to create a rectangle and add it to the page. The example also illustrates how to find size and coordinate information about the new rectangle and render the information in a <xref:System.Windows.Controls.TextBox> below the rectangle.
@@ -2521,7 +2521,7 @@
  The following example shows how to use a <xref:System.Windows.Rect> structure to specify the dimensions and location of a rectangle using XAML.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample.cs" id="Snippetrectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb" id="Snippetrectexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb" id="Snippetrectexamplewholepage":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/RectExample.xaml" id="Snippetrectexamplewholepage":::
 
  The following example shows how to use code to create a rectangle and add it to the page. The example also illustrates how to find size and coordinate information about the new rectangle and render the information in a <xref:System.Windows.Controls.TextBox> below the rectangle.
@@ -2578,7 +2578,7 @@
  The following example shows how to use a <xref:System.Windows.Rect> structure to specify the dimensions and location of a rectangle using XAML.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Rect/Overview/RectExample.cs" id="Snippetrectexamplewholepage":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/visualbasic/rectexample.vb" id="Snippetrectexamplewholepage":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Rect/Overview/rectexample.vb" id="Snippetrectexamplewholepage":::
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/GeometriesMiscSnippets_snip/XAML/RectExample.xaml" id="Snippetrectexamplewholepage":::
 
  The following example shows how to use code to create a rectangle and add it to the page. The example also illustrates how to find size and coordinate information about the new rectangle and render the information in a <xref:System.Windows.Controls.TextBox> below the rectangle.
diff --git a/xml/System.Windows/RoutedEventArgs.xml b/xml/System.Windows/RoutedEventArgs.xml
index 0317e8ef8a6..a6385e2997c 100644
--- a/xml/System.Windows/RoutedEventArgs.xml
+++ b/xml/System.Windows/RoutedEventArgs.xml
@@ -297,7 +297,7 @@
  The following is pseudocode that illustrates a basic pattern that can be used for implementation. Here, `MyRoutedEventHandler` is a subclass of <xref:System.Windows.RoutedEventHandler>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetroutedeventargs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetroutedeventargs":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetroutedeventargs":::  
   
  ]]></format>
         </remarks>
@@ -436,7 +436,7 @@
  The following example creates new routed event data with an initial constructor and then sets the <xref:System.Windows.RoutedEventArgs.RoutedEvent%2A> property as a subsequent operation. You must have <xref:System.Windows.RoutedEventArgs.RoutedEvent%2A> set prior to raising the routed event.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/RoutedEventArgs/RoutedEvent/ColorPicker.cs" id="Snippetroutedeventargsroutedevent":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ColorPicker_v2/visualbasic/colorpicker.vb" id="Snippetroutedeventargsroutedevent":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/RoutedEventArgs/RoutedEvent/colorpicker.vb" id="Snippetroutedeventargsroutedevent":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/RoutedPropertyChangedEventHandler`1.xml b/xml/System.Windows/RoutedPropertyChangedEventHandler`1.xml
index 5f59174ee86..73e7c300b6b 100644
--- a/xml/System.Windows/RoutedPropertyChangedEventHandler`1.xml
+++ b/xml/System.Windows/RoutedPropertyChangedEventHandler`1.xml
@@ -48,10 +48,10 @@
  The handler is based on <xref:System.Windows.RoutedPropertyChangedEventHandler%601>, and is defined in the second segment of the code example, with the type parameter of the generic constrained to <xref:System.Double>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/Window1.xaml.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/window1.xaml.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/window1.xaml.vb" id="Snippet2":::  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/Window1.xaml.cs" id="Snippetroutedpropertychangedevent":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/AutoGrid/visualbasic/window1.xaml.vb" id="Snippetroutedpropertychangedevent":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/RoutedPropertyChangedEventHandlerT/Overview/window1.xaml.vb" id="Snippetroutedpropertychangedevent":::  
   
  This particular example does not use the routed-event characteristic of the event; the event is handled on the same element that it is raised on. This is not always the case. For a routed event, it is possible that the source of the event is a different object than the object where the handler is attached.  
   
diff --git a/xml/System.Windows/StrokeCollectionConverter.xml b/xml/System.Windows/StrokeCollectionConverter.xml
index ff61d281f36..ede0f60fed0 100644
--- a/xml/System.Windows/StrokeCollectionConverter.xml
+++ b/xml/System.Windows/StrokeCollectionConverter.xml
@@ -32,9 +32,9 @@
  The following example demonstrates how to convert a base-64, encoded ISF string to a <xref:System.Windows.Ink.StrokeCollection>. This assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
@@ -188,9 +188,9 @@
  The following example demonstrates how to convert a base-64, encoded Ink Serialized Format (ISF) string to a <xref:System.Windows.Ink.StrokeCollection>. This assumes that there is an <xref:System.Windows.Controls.InkPresenter> called `presenter`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/StrokeCollectionConverter/Overview/InkEraser.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/InkEraser/VisualBasic/InkEraser.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/StrokeCollectionConverter/Overview/InkEraser.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/Style.xml b/xml/System.Windows/Style.xml
index 3ffced4cd11..9c2daef127a 100644
--- a/xml/System.Windows/Style.xml
+++ b/xml/System.Windows/Style.xml
@@ -545,7 +545,7 @@
  The following example shows how to use this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Style/Setters/Pane1.xaml.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/ListBoxItemStyle/VisualBasic/Pane1.xaml.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Style/Setters/Pane1.xaml.vb" id="Snippet1":::
 
  Adding a <xref:System.Windows.SetterBase> child to a <xref:System.Windows.Style> object implicitly adds it to the <xref:System.Windows.SetterBaseCollection> for the <xref:System.Windows.Style> object. The following <xref:System.Windows.EventSetter> is implicitly added to the <xref:System.Windows.SetterBaseCollection> of the style:
 
diff --git a/xml/System.Windows/TemplateVisualStateAttribute.xml b/xml/System.Windows/TemplateVisualStateAttribute.xml
index c7a03027bf6..2e863b2e7fb 100644
--- a/xml/System.Windows/TemplateVisualStateAttribute.xml
+++ b/xml/System.Windows/TemplateVisualStateAttribute.xml
@@ -39,7 +39,7 @@
  The following example shows the class signature for the `NumericUpDown` control.  This example specifies that the `NumericUpDown` control uses four visual states.  Two states, named `Positive` and `Negative`, are in the <xref:System.Windows.VisualStateGroup> named `ValueStates`.  The other two states, name `Focused` and `Unfocused`, are in the <xref:System.Windows.VisualStateGroup> named `FocusedStates`.  For the entire example, see [Creating a Control That Has a Customizable Appearance](/dotnet/framework/wpf/controls/creating-a-control-that-has-a-customizable-appearance).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.cs" id="Snippetclassattributes":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/numericupdown.vb" id="Snippetclassattributes":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.vb" id="Snippetclassattributes":::  
   
  ]]></format>
     </remarks>
@@ -120,7 +120,7 @@
  The following example shows the class signature for the `NumericUpDown` control.  This example specifies that the `NumericUpDown` control uses four visual states.  Two states, named `Positive` and `Negative`, are in the <xref:System.Windows.VisualStateGroup> named `ValueStates`.  The other two states, name `Focused` and `Unfocused`, are in the <xref:System.Windows.VisualStateGroup> named `FocusedStates`.  For the entire example, see [Creating a Control That Has a Customizable Appearance](/dotnet/framework/wpf/controls/creating-a-control-that-has-a-customizable-appearance).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.cs" id="Snippetclassattributes":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/numericupdown.vb" id="Snippetclassattributes":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.vb" id="Snippetclassattributes":::  
   
  ]]></format>
         </remarks>
@@ -172,7 +172,7 @@
  The following example shows the class signature for the `NumericUpDown` control.  This example specifies that the `NumericUpDown` control uses four visual states.  Two states, named `Positive` and `Negative`, are in the <xref:System.Windows.VisualStateGroup> named `ValueStates`.  The other two states, name `Focused` and `Unfocused`, are in the <xref:System.Windows.VisualStateGroup> named `FocusedStates`.  For the entire example, see [Creating a Control That Has a Customizable Appearance](/dotnet/framework/wpf/controls/creating-a-control-that-has-a-customizable-appearance).  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.cs" id="Snippetclassattributes":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/numericupdown.vb" id="Snippetclassattributes":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.vb" id="Snippetclassattributes":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/TextDecoration.xml b/xml/System.Windows/TextDecoration.xml
index d4dd2c48937..48fc2254ebe 100644
--- a/xml/System.Windows/TextDecoration.xml
+++ b/xml/System.Windows/TextDecoration.xml
@@ -98,7 +98,7 @@ Example of an underline styled with a linear gradient brush and dashed pen
  The following code example shows how to create a <xref:System.Windows.TextDecoration> using the parameterless constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets2":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets2":::
 
  ]]></format>
@@ -145,7 +145,7 @@ Example of an underline styled with a linear gradient brush and dashed pen
  The following code example shows how to create a <xref:System.Windows.TextDecoration> by using the `location`, `pen`, `penOffset`, `penOffsetUnit`, and `penThicknessUnit` parameters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets6":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets6":::
 
  ]]></format>
@@ -311,7 +311,7 @@ Example of text decoration types
  In the following code example, a strikethrough text decoration is created with a solid color brush for the pen. The <xref:System.Windows.TextDecoration.Location%2A> property is set to <xref:System.Windows.TextDecorationLocation.Strikethrough>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets1":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets1":::
 
  ]]></format>
@@ -393,7 +393,7 @@ Example of an underline styled with a linear gradient brush and dashed pen
  In the following code example, an underline text decoration is created with a linear gradient brush for the dashed pen.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets3":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets3":::
 
  ]]></format>
@@ -446,7 +446,7 @@ Example of an underline styled with a linear gradient brush and dashed pen
  The following code example shows how to set the <xref:System.Windows.TextDecoration.PenOffset%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets7":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets7":::
 
  ]]></format>
@@ -525,7 +525,7 @@ Example of an underline styled with a linear gradient brush and dashed pen
  The following code example shows how to set the <xref:System.Windows.TextDecoration.PenOffsetUnit%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets7":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets7":::
 
  ]]></format>
@@ -630,7 +630,7 @@ Example of an underline styled with a linear gradient brush and dashed pen
  The following code example shows how to set the <xref:System.Windows.TextDecoration.PenThicknessUnit%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets7":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets7":::
 
  ]]></format>
diff --git a/xml/System.Windows/TextDecorationLocation.xml b/xml/System.Windows/TextDecorationLocation.xml
index 2616f7d657a..272256e0c29 100644
--- a/xml/System.Windows/TextDecorationLocation.xml
+++ b/xml/System.Windows/TextDecorationLocation.xml
@@ -36,7 +36,7 @@ Text decoration types
  The following example creates an underline text decoration and uses a solid color brush for the pen.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets2":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets2":::  
   
  ]]></format>
diff --git a/xml/System.Windows/TextDecorationUnit.xml b/xml/System.Windows/TextDecorationUnit.xml
index eb8b67ba543..c30bf5cf479 100644
--- a/xml/System.Windows/TextDecorationUnit.xml
+++ b/xml/System.Windows/TextDecorationUnit.xml
@@ -28,7 +28,7 @@
  The following example shows how to set the <xref:System.Windows.TextDecoration.PenThicknessUnit%2A> property to Pixel.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets7":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets7":::  
   
  ]]></format>
diff --git a/xml/System.Windows/TextDecorations.xml b/xml/System.Windows/TextDecorations.xml
index 287840355b5..4947773140b 100644
--- a/xml/System.Windows/TextDecorations.xml
+++ b/xml/System.Windows/TextDecorations.xml
@@ -50,7 +50,7 @@ Example of text decoration types
  In the following example, a strikethrough text decoration uses the default font value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets1":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets1":::
 
  You can also specify multiple text decorations for the same text. In the following example, an underline and overline text decoration are used for the same text.
@@ -64,7 +64,7 @@ Example of text decoration types
  You can remove all text decorations from text by using the <xref:System.Windows.TextDecorationCollection.Clear%2A> method. In the following example, the <xref:System.Windows.TextDecorations> collection is cleared.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets5a":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets5a":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets5a":::
 
  By default, <xref:System.Windows.Documents.Hyperlink> uses a <xref:System.Windows.TextDecoration> object to display an underline. The following markup sample shows a <xref:System.Windows.Documents.Hyperlink> defined with and without an underline:
 
@@ -210,7 +210,7 @@ Example of a strikethrough text decoration
  In the following example, a strikethrough text decoration is created by using solid color brush for the pen. The <xref:System.Windows.TextDecoration.Location%2A> property is set to <xref:System.Windows.TextDecorationLocation.Strikethrough>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets1":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets1":::
 
  ]]></format>
@@ -270,7 +270,7 @@ Example of an underline styled with a linear gradient brush and dashed pen
  In the following code example, an underline text decoration is created by using a linear gradient brush for the dashed pen.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml.cs" id="Snippettextdecorationsnippets3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextDecorationSnippets/visualbasic/window1.xaml.vb" id="Snippettextdecorationsnippets3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextDecoration/.ctor/window1.xaml.vb" id="Snippettextdecorationsnippets3":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextDecoration/.ctor/Window1.xaml" id="Snippettextdecorationsnippets3":::
 
  ]]></format>
diff --git a/xml/System.Windows/TextMarkerStyle.xml b/xml/System.Windows/TextMarkerStyle.xml
index d8f1aca2963..9fd8f0c1b50 100644
--- a/xml/System.Windows/TextMarkerStyle.xml
+++ b/xml/System.Windows/TextMarkerStyle.xml
@@ -33,7 +33,7 @@
  The following example shows how to create a <xref:System.Windows.TextMarkerStyle>:  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextMarkerStyle/Overview/window1.xaml.cs" id="Snippettextmarkerstylesnippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextMarkerStyleSnippets/visualbasic/window1.xaml.vb" id="Snippettextmarkerstylesnippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextMarkerStyle/Overview/window1.xaml.vb" id="Snippettextmarkerstylesnippet1":::
  :::code language="xaml" source="~/snippets/csharp/System.Windows/TextMarkerStyle/Overview/window1.xaml" id="Snippettextmarkerstylesnippet1":::  
   
  ]]></format>
diff --git a/xml/System.Windows/TextWrapping.xml b/xml/System.Windows/TextWrapping.xml
index e8e4f3c4f9b..1d93e5bff8a 100644
--- a/xml/System.Windows/TextWrapping.xml
+++ b/xml/System.Windows/TextWrapping.xml
@@ -34,7 +34,7 @@
  The following example demonstrates how to set the value of the <xref:System.Windows.TextWrapping> property of a <xref:System.Windows.Controls.TextBox>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TextWrapping/Overview/Window1.xaml.cs" id="Snippettextboxbase12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBoxBase_Samp/VisualBasic/Window1.xaml.vb" id="Snippettextboxbase12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TextWrapping/Overview/Window1.xaml.vb" id="Snippettextboxbase12":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/UIElement.xml b/xml/System.Windows/UIElement.xml
index 49fe69a91c5..d4617b1eddc 100644
--- a/xml/System.Windows/UIElement.xml
+++ b/xml/System.Windows/UIElement.xml
@@ -229,7 +229,7 @@
  The following example implements a handler invoked on the <xref:System.Windows.FrameworkElement.Initialized> event on a page that attaches a defined handler to one of the named elements on the page using `handledEventsToo` `true`. This handler would be invoked even if another element along the route marked the shared event data as handled before reaching the handling element in the route.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ContentElement/AddHandler/page2.xaml.cs" id="Snippetaddhandlerhandledtoo":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/EventOvwSupport/visualbasic/page2.xaml.vb" id="Snippetaddhandlerhandledtoo":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ContentElement/AddHandler/page2.xaml.vb" id="Snippetaddhandlerhandledtoo":::
 
  ]]></format>
         </remarks>
@@ -423,7 +423,7 @@
  In the following example, a <xref:System.Windows.Shapes.Rectangle> `myAnimatedRectangle` has a particular timing animation applied to it by calling <xref:System.Windows.UIElement.ApplyAnimationClock%2A> .
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/ApplyAnimationClock/ClockControllerSpeedRatioExample.cs" id="Snippetuielementapplyanimationclock":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/clockcontrollerspeedratioexample.vb" id="Snippetuielementapplyanimationclock":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/clockcontrollerspeedratioexample.vb" id="Snippetuielementapplyanimationclock":::
 
  ]]></format>
         </remarks>
@@ -799,7 +799,7 @@
  <xref:System.Windows.UIElement.ArrangeCore%2A> implementations should call the base implementation to return a size, then call the <xref:System.Windows.UIElement.Arrange%2A> method of each visible child element, and reconcile the sizes returned by these <xref:System.Windows.UIElement.Arrange%2A> calls with the size of the base implementation. The logic for the reconciliation aspect of a <xref:System.Windows.UIElement.ArrangeCore%2A> implementation might vary, depending on the layout characteristics of your element. In the following example template, `VisualChildren` is a hypothetical property that your element might define to help enumerate its content; <xref:System.Windows.UIElement> does not define content collections at this level, the WPF framework-level architecture defers content behavior to derived elements such as specific controls or control base classes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetuielementarrangeoverride":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetuielementarrangeoverride":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetuielementarrangeoverride":::
 
  ]]></format>
         </remarks>
@@ -874,7 +874,7 @@
  The following example creates an animation, assigns it, and then calls <xref:System.Windows.UIElement.BeginAnimation%2A> to start it.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/ApplyAnimationClock/GetAnimationBaseValueExample.cs" id="Snippetbeginanimation":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/getanimationbasevalueexample.vb" id="Snippetbeginanimation":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/getanimationbasevalueexample.vb" id="Snippetbeginanimation":::
 
  ]]></format>
         </remarks>
@@ -931,7 +931,7 @@
  The following example implements a handler that obtains an existing animation from a resource and then calls <xref:System.Windows.UIElement.BeginAnimation%2A> with a specified handoff behavior.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/BeginAnimation/SampleViewer.xaml.cs" id="Snippetbeginanimationhandoff":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/BrushesIntroduction/visualbasic/sampleviewer.xaml.vb" id="Snippetbeginanimationhandoff":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/BeginAnimation/sampleviewer.xaml.vb" id="Snippetbeginanimationhandoff":::
 
  ]]></format>
         </remarks>
@@ -1216,7 +1216,7 @@
  The following example implements a pair of handlers for mouse and key input combination that capture (and uncapture) the mouse and enable a special mouse mode for viewing a 3D model.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BeginStoryboard/Trackball.cs" id="Snippetuielementmousecapture":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/trackball.vb" id="Snippetuielementmousecapture":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/trackball.vb" id="Snippetuielementmousecapture":::
 
  ]]></format>
         </remarks>
@@ -1566,7 +1566,7 @@ Image with an Elliptical Clip Region
  The following example does essentially the same thing in code:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/CommandBindings/Window1.xaml.cs" id="Snippetcommandhandlerbindinginit":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CommandHandlerProcedural/visualbasic/window1.xaml.vb" id="Snippetcommandhandlerbindinginit":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/CommandBindings/window1.xaml.vb" id="Snippetcommandhandlerbindinginit":::
 
  ]]></format>
         </remarks>
@@ -2095,7 +2095,7 @@ For this call to be successful, some other element in the application needed to
  The following example sets focus to a <xref:System.Windows.Controls.TextBox> referenced by <xref:System.Windows.FrameworkElement.Name%2A>, and then adjusts the position of the cursor within the <xref:System.Windows.Controls.TextBox>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/Focus/Window1.xaml.cs" id="Snippetuielementfocus":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/TextBox_CursorToEnd/VisualBasic/Window1.xaml.vb" id="Snippetuielementfocus":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/Focus/Window1.xaml.vb" id="Snippetuielementfocus":::
 
  ]]></format>
         </remarks>
@@ -2166,7 +2166,7 @@ For this call to be successful, some other element in the application needed to
           <para>When deriving from <see cref="T:System.Windows.UIElement" /> directly (as opposed to from <see cref="T:System.Windows.Controls.Control" />), consider whether you wish your element to be focusable, because by default the element will not be focusable. If you wish your element to be focusable, override the metadata for this property within your type's static constructor as follows:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetuielementshortoverride":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetuielementshortoverride":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetuielementshortoverride":::
 
 <see langword="myElement" /> should be the class name of the type that you are overriding the metadata value on.</para>
         </block>
@@ -2281,7 +2281,7 @@ For this call to be successful, some other element in the application needed to
  The following example implements a handler that reports the base value of an animated <xref:System.Windows.FrameworkElement.Width%2A> property on a <xref:System.Windows.Controls.Button>, as well as the base value of a transform.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/ApplyAnimationClock/GetAnimationBaseValueExample.cs" id="Snippetgetanimationbasevalue":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/timingbehaviors_procedural_snip/visualbasic/getanimationbasevalueexample.vb" id="Snippetgetanimationbasevalue":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ApplyAnimationClock/getanimationbasevalueexample.vb" id="Snippetgetanimationbasevalue":::
 
  ]]></format>
         </remarks>
@@ -3367,7 +3367,7 @@ For this call to be successful, some other element in the application needed to
  The following example shows a handler on one button that when executed will set <xref:System.Windows.UIElement.IsEnabled%2A> `false` on another named button `b1`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsEnabled/default.xaml.cs" id="Snippethandler":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/RoutedEventAddRemoveHandler/VisualBasic/default.xaml.vb" id="Snippethandler":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsEnabled/default.xaml.vb" id="Snippethandler":::
 
  ]]></format>
         </remarks>
@@ -4092,7 +4092,7 @@ For this call to be successful, some other element in the application needed to
  If mouse capture is elsewhere, the mouse capture is set to that element. If the element had mouse capture, it is cleared by calling <xref:System.Windows.Input.Mouse.Capture%2A?displayProperty=nameWithType> with a null input.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsMouseCaptured/Window1.xaml.cs" id="Snippetismousecaptured":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MouseSnippetSample/visualbasic/window1.xaml.vb" id="Snippetismousecaptured":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/IsMouseCaptured/window1.xaml.vb" id="Snippetismousecaptured":::
 
  ]]></format>
         </remarks>
@@ -5853,7 +5853,7 @@ For this call to be successful, some other element in the application needed to
  The following example shows an event handler for the <xref:System.Windows.UIElement.ManipulationDelta> event. The example uses the <xref:System.Windows.Input.ManipulationDeltaEventArgs.DeltaManipulation%2A> property to move, resize, and rotate a <xref:System.Windows.Shapes.Rectangle>.  The example also checks whether the <xref:System.Windows.UIElement.ManipulationDelta> event occurred during inertia and whether the rectangle is touching the edge of a window.  If those cases are true, the application stops the manipulation to prevent the rectangle from leaving the visible area of the application. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationdelta":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationdelta":::
 
  ]]></format>
         </remarks>
@@ -5933,7 +5933,7 @@ For this call to be successful, some other element in the application needed to
  The following example shows the <xref:System.Windows.UIElement.ManipulationInertiaStarting> event handler and sets the desired deceleration for translation, expansion, and rotation that is used during inertia. This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationinertiastarting":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationinertiastarting":::
 
  ]]></format>
         </remarks>
@@ -6097,7 +6097,7 @@ For this call to be successful, some other element in the application needed to
  The following example shows the event handler for the <xref:System.Windows.UIElement.ManipulationStarting> event and sets the <xref:System.Windows.Input.ManipulationStartingEventArgs.ManipulationContainer%2A> to the parent element that receives the manipulation events so that the coordinates of the manipulation are relative to the parent element.  This example is part of a larger example in [Walkthrough: Creating Your First Touch Application](/dotnet/framework/wpf/advanced/walkthrough-creating-your-first-touch-application).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/IsManipulationEnabled/mainwindow.xaml.cs" id="Snippetmanipulationstarting":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/basicmanipulation/visualbasic/mainwindow.xaml.vb" id="Snippetmanipulationstarting":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/ManipulationDelta/mainwindow.xaml.vb" id="Snippetmanipulationstarting":::
 
  ]]></format>
         </remarks>
@@ -6223,7 +6223,7 @@ For this call to be successful, some other element in the application needed to
  A typical override of <xref:System.Windows.UIElement.MeasureCore%2A> follows this approximate pattern (there is not a built-in collection called `VisualChildren`; `VisualChildren` is a placeholder that represents whatever child collection your element maintains).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ComponentResourceKey/.ctor/corepseudocode.cs" id="Snippetuielementmeasureoverride":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CorePseudocode/visualbasic/corepseudocode.vb" id="Snippetuielementmeasureoverride":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ComponentResourceKey/.ctor/corepseudocode.vb" id="Snippetuielementmeasureoverride":::
 
 - You must call <xref:System.Windows.UIElement.Measure%2A> on each child element.
 
@@ -14469,7 +14469,7 @@ For this call to be successful, some other element in the application needed to
  The following example is the parallel to the example given for <xref:System.Windows.UIElement.CaptureMouse%2A>: it handles mouse button up to release mouse capture and re-enable moving the mouse.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FrameworkElement/BeginStoryboard/Trackball.cs" id="Snippetuielementmousecapture":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/CubeAnimation/visualbasic/trackball.vb" id="Snippetuielementmousecapture":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FrameworkElement/BeginStoryboard/trackball.vb" id="Snippetuielementmousecapture":::
 
  ]]></format>
         </remarks>
@@ -14659,7 +14659,7 @@ For this call to be successful, some other element in the application needed to
  The following example shows how a custom adorner uses the <xref:System.Windows.UIElement.RenderSize%2A> value in order to create and size the rectangle graphic that defines the adorner, as part of its <xref:System.Windows.UIElement.OnRender%2A> implementation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/RenderSize/Window1.xaml.cs" id="Snippetuielementdesiredsize":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/AdornersMiscCode/visualbasic/window1.xaml.vb" id="Snippetuielementdesiredsize":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/RenderSize/window1.xaml.vb" id="Snippetuielementdesiredsize":::
 
  ]]></format>
         </remarks>
@@ -14784,7 +14784,7 @@ For this call to be successful, some other element in the application needed to
  The following example builds up elements in code, applies a <xref:System.Windows.UIElement.RenderTransformOrigin%2A>, and then applies a  <xref:System.Windows.UIElement.RenderTransform%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/RenderTransformOrigin/RotateAboutCenterExample.cs" id="Snippetuielementrendertransformorigin":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/transformanimations_snip/visualbasic/rotateaboutcenterexample.vb" id="Snippetuielementrendertransformorigin":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/RenderTransformOrigin/rotateaboutcenterexample.vb" id="Snippetuielementrendertransformorigin":::
 
  ]]></format>
         </remarks>
@@ -15856,7 +15856,7 @@ For this call to be successful, some other element in the application needed to
  The following example creates a <xref:System.Windows.Input.StylusPlugIns.DynamicRenderer> instance and adds it to the <xref:System.Windows.UIElement.StylusPlugIns%2A> collection for a custom ink handling control.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement/StylusPlugIns/StylusControl.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/StylusPluginSamples/VisualBasic/StylusControl.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement/StylusPlugIns/StylusControl.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -16816,7 +16816,7 @@ For this call to be successful, some other element in the application needed to
  The following example implements a handler that references two different named buttons that are intended to be a mutually exclusive pair in the user interface. Prior to running the actual program logic associated with the button, the button itself is set to be <xref:System.Windows.Visibility.Hidden?displayProperty=nameWithType>, and the other button in the pair is set to <xref:System.Windows.Visibility.Visible?displayProperty=nameWithType>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/ExceptionRoutedEventArgs/ErrorException/PlaybackExample.cs" id="Snippetuielementvisibility":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/MediaElement_snip/VB/PlaybackExample.vb" id="Snippetuielementvisibility":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/ExceptionRoutedEventArgs/ErrorException/PlaybackExample.vb" id="Snippetuielementvisibility":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/UIElement3D.xml b/xml/System.Windows/UIElement3D.xml
index 5bf980a2997..a6a6ef1a668 100644
--- a/xml/System.Windows/UIElement3D.xml
+++ b/xml/System.Windows/UIElement3D.xml
@@ -56,7 +56,7 @@
  The following example shows how to derive from the <xref:System.Windows.UIElement3D> class to create a `Sphere` class:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement3D/Overview/Sphere.cs" id="Snippetsphere":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/sphere.vb" id="Snippetsphere":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement3D/Overview/sphere.vb" id="Snippetsphere":::
 
  ]]></format>
     </remarks>
@@ -1929,7 +1929,7 @@
  The following example shows how to derive from the <xref:System.Windows.UIElement3D> class to create a `Sphere` class:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement3D/Overview/Sphere.cs" id="Snippetsphere":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/sphere.vb" id="Snippetsphere":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement3D/Overview/sphere.vb" id="Snippetsphere":::
 
  ]]></format>
         </remarks>
@@ -8879,7 +8879,7 @@
  The following example shows how to derive from the <xref:System.Windows.UIElement3D> class to create a `Sphere` class:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/UIElement3D/Overview/Sphere.cs" id="Snippetsphere":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/Shapes/visualbasic/sphere.vb" id="Snippetsphere":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/UIElement3D/Overview/sphere.vb" id="Snippetsphere":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/ValidateValueCallback.xml b/xml/System.Windows/ValidateValueCallback.xml
index 39097584742..663c0fafe5a 100644
--- a/xml/System.Windows/ValidateValueCallback.xml
+++ b/xml/System.Windows/ValidateValueCallback.xml
@@ -44,7 +44,7 @@
  The following example includes an implementation of this callback to validate a range of values for a custom dependency property. In this case the property value expects an enumeration, and the validation assures that the provided value evaluates to a member of that enumeration.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/CoerceValueCallback/Overview/default.xaml.cs" id="Snippetvalidatevaluecallback":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/DPCustom/visualbasic/default.xaml.vb" id="Snippetvalidatevaluecallback":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/CoerceValueCallback/Overview/default.xaml.vb" id="Snippetvalidatevaluecallback":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Windows/Vector.xml b/xml/System.Windows/Vector.xml
index 5a056882e05..cf65bdd9120 100644
--- a/xml/System.Windows/Vector.xml
+++ b/xml/System.Windows/Vector.xml
@@ -74,7 +74,7 @@
  The following example shows how to add two <xref:System.Windows.Vector> structures.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/Overview/Window1.xaml.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorSample/visualbasic/window1.xaml.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Overview/window1.xaml.vb" id="Snippet10":::  
   
  ]]></format>
     </remarks>
@@ -634,7 +634,7 @@
  The following example shows how use this property to get the length of a vector.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetlengthexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetlengthexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetlengthexample":::  
   
  ]]></format>
         </remarks>
@@ -677,7 +677,7 @@
  The following example shows how to use this property to get the square of the length of a vector.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetlengthsquaredexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetlengthsquaredexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetlengthsquaredexample":::  
   
  ]]></format>
         </remarks>
@@ -997,7 +997,7 @@
  The following example shows how to use this operator (+) to translate a <xref:System.Windows.Point> structure to a <xref:System.Windows.Vector> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedadditionoperatorexample2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedadditionoperatorexample2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedadditionoperatorexample2":::  
   
  ]]></format>
         </remarks>
@@ -1042,7 +1042,7 @@
  The following example shows how to use this operator (+) to add two <xref:System.Windows.Vector> structures and return a <xref:System.Windows.Vector>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedadditionoperatorexample1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedadditionoperatorexample1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedadditionoperatorexample1":::  
   
  ]]></format>
         </remarks>
@@ -1087,7 +1087,7 @@
  The following example shows how to use this operator (/) to divide a <xref:System.Windows.Vector> structure by a scalar.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadeddivisionoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadeddivisionoperatorexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadeddivisionoperatorexample":::  
   
  ]]></format>
         </remarks>
@@ -1138,7 +1138,7 @@
  The following example shows how to use this operator (==) to check whether two <xref:System.Windows.Vector> structures are equal.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedequalityoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedequalityoperatorexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedequalityoperatorexample":::  
   
  ]]></format>
         </remarks>
@@ -1190,7 +1190,7 @@
  The following example shows how to convert a <xref:System.Windows.Vector> into a <xref:System.Windows.Point>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedexplicitoperatorexample2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedexplicitoperatorexample2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedexplicitoperatorexample2":::  
   
  ]]></format>
         </remarks>
@@ -1232,7 +1232,7 @@
  The following example shows how to explicitly convert a <xref:System.Windows.Vector> into a <xref:System.Windows.Size>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedexplicitoperatorexample1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedexplicitoperatorexample1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedexplicitoperatorexample1":::  
   
  ]]></format>
         </remarks>
@@ -1282,7 +1282,7 @@
  The following example shows how to use this operator (!=) to check whether two <xref:System.Windows.Vector> structures are not equal.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedinequalityoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedinequalityoperatorexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedinequalityoperatorexample":::  
   
  ]]></format>
         </remarks>
@@ -1335,7 +1335,7 @@
  The following example shows how to use this operator (*) to multiply a scalar by a <xref:System.Windows.Vector> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedmultiplicationoperatorexample2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedmultiplicationoperatorexample2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedmultiplicationoperatorexample2":::  
   
  ]]></format>
         </remarks>
@@ -1380,7 +1380,7 @@
  The following example shows how to use this operator (*) to multiply a <xref:System.Windows.Vector> structure by a scalar.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedmultiplicationoperatorexample1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedmultiplicationoperatorexample1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedmultiplicationoperatorexample1":::  
   
  ]]></format>
         </remarks>
@@ -1425,7 +1425,7 @@
  The following example shows how to use this operator (*) to multiply a <xref:System.Windows.Vector> structure by a <xref:System.Windows.Media.Matrix> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedmultiplyvectorbymatrixoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedmultiplyvectorbymatrixoperatorexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedmultiplyvectorbymatrixoperatorexample":::  
   
  ]]></format>
         </remarks>
@@ -1472,7 +1472,7 @@
  The following example shows how to use this operator (*) to multiply a <xref:System.Windows.Vector> structure by a <xref:System.Windows.Vector>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedoperatorgetdotproductexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedoperatorgetdotproductexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedoperatorgetdotproductexample":::  
   
  ]]></format>
         </remarks>
@@ -1517,7 +1517,7 @@
  The following example shows how to use this operator (-) to subtract a <xref:System.Windows.Vector> structure from a <xref:System.Windows.Vector> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadedsubtractionoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadedsubtractionoperatorexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadedsubtractionoperatorexample":::  
   
  ]]></format>
         </remarks>
@@ -1560,7 +1560,7 @@
  The following example shows how to use this negation operator to negate a <xref:System.Windows.Vector> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetoverloadednegationoperatorexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetoverloadednegationoperatorexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetoverloadednegationoperatorexample":::  
   
  ]]></format>
         </remarks>
@@ -1603,7 +1603,7 @@
  The following example shows how to use this method to convert a string representation of a vector into a <xref:System.Windows.Vector> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetparseexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetparseexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetparseexample":::  
   
  ]]></format>
         </remarks>
@@ -1648,7 +1648,7 @@
  The following example shows how to use this method to subtract a <xref:System.Windows.Vector> structure from a <xref:System.Windows.Vector> structure.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetsubtractexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetsubtractexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetsubtractexample":::  
   
  ]]></format>
         </remarks>
@@ -1754,7 +1754,7 @@
  The following example shows how to use this method to get a string representation of a <xref:System.Windows.Vector>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippettostringexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippettostringexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippettostringexample":::  
   
  ]]></format>
         </remarks>
@@ -1842,7 +1842,7 @@
  The following example shows how to check two <xref:System.Windows.Vector> structures for equality.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetvectorequalityexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetvectorequalityexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetvectorequalityexample":::  
   
  ]]></format>
         </remarks>
@@ -1891,7 +1891,7 @@
  The following example shows how to check two <xref:System.Windows.Vector> structures for equality.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Vector/.ctor/VectorExample.cs" id="Snippetvectorequalityexample":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/VectorExamples_snip/visualbasic/vectorexample.vb" id="Snippetvectorequalityexample":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Vector/Length/vectorexample.vb" id="Snippetvectorequalityexample":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/VisualStateManager.xml b/xml/System.Windows/VisualStateManager.xml
index 9ad46f529fc..427fe63d1fb 100644
--- a/xml/System.Windows/VisualStateManager.xml
+++ b/xml/System.Windows/VisualStateManager.xml
@@ -43,7 +43,7 @@
  The following example shows the event handler that is defined in the previous example and calls the <xref:System.Windows.VisualStateManager.GoToElementState%2A> method to transition between states. If the rectangle in the previous example was part of a <xref:System.Windows.Controls.ControlTemplate>, the example would have to call the <xref:System.Windows.VisualStateManager.GoToState%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TemplateVisualStateAttribute/Overview/window1.xaml.cs" id="Snippetgotoelementstate":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/window1.xaml.vb" id="Snippetgotoelementstate":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/window1.xaml.vb" id="Snippetgotoelementstate":::
 
  ]]></format>
     </remarks>
@@ -255,7 +255,7 @@
  The following code shows the logic of the application.  When the user enters a number and clicks the button, the application calls <xref:System.Windows.VisualStateManager.GoToElementState%2A> to transition to `TooHigh`, `TooLow`, or `Correct` to provide feedback to the user about the guess.  To try this example, call the `GenerateNumber` method when the application begins.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/VisualStateManager/GoToElementState/mainwindow.xaml.cs" id="Snippetgotoelementstatecode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/vsmgotoelementstate/visualbasic/mainwindow.xaml.vb" id="Snippetgotoelementstatecode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/VisualStateManager/GoToElementState/mainwindow.xaml.vb" id="Snippetgotoelementstatecode":::
 
  ]]></format>
         </remarks>
@@ -313,7 +313,7 @@
  The following example demonstrates a control that uses the <xref:System.Windows.VisualStateManager.GoToState%2A> method to transition between states. For the entire example, see [Creating a Control That Has a Customizable Appearance](/dotnet/framework/wpf/controls/creating-a-control-that-has-a-customizable-appearance).
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.cs" id="Snippetupdatestates":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/numericupdown.vb" id="Snippetupdatestates":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/numericupdown.vb" id="Snippetupdatestates":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/VisualTransition.xml b/xml/System.Windows/VisualTransition.xml
index bb2fb0be85c..39d056c60e7 100644
--- a/xml/System.Windows/VisualTransition.xml
+++ b/xml/System.Windows/VisualTransition.xml
@@ -240,7 +240,7 @@
  The following example shows the event handler for the <xref:System.Windows.UIElement3D.MouseDown> and <xref:System.Windows.UIElement.MouseUp> events. The example calls the <xref:System.Windows.VisualStateManager.GoToElementState%2A> method to change the <xref:System.Windows.VisualState> of the canvas.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/TemplateVisualStateAttribute/Overview/window1.xaml.cs" id="Snippetvsmeasingfunctionlogic":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/vsmcustomcontrol/visualbasic/window1.xaml.vb" id="Snippetvsmeasingfunctionlogic":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/TemplateVisualStateAttribute/Overview/window1.xaml.vb" id="Snippetvsmeasingfunctionlogic":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/Window.xml b/xml/System.Windows/Window.xml
index 26aeaba36f0..3f0b46b61cd 100644
--- a/xml/System.Windows/Window.xml
+++ b/xml/System.Windows/Window.xml
@@ -94,14 +94,14 @@
  The following example shows how a standard window is defined using only code:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/Overview/CodeOnlyWindow.cs" id="Snippetwindowcodeonly":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/codeonlywindow.vb" id="Snippetwindowcodeonly":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/Overview/codeonlywindow.vb" id="Snippetwindowcodeonly":::
 
  The following example shows how a standard window is defined using a combination of markup and code-behind.
 
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Window/Overview/MainWindow.xaml" id="Snippetwindowxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/Overview/MainWindow.xaml.cs" id="Snippetwindowcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetwindowcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/Overview/mainwindow.xaml.vb" id="Snippetwindowcodebehind":::
 
  ]]></format>
     </remarks>
@@ -447,7 +447,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
 :::code language="xaml" source="~/snippets/csharp/System.Windows/Window/Close/MainWindow.xaml" id="Snippetwindowclosexaml":::
 
 :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/Close/MainWindow.xaml.cs" id="Snippetwindowclosecodebehind":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowCloseSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetwindowclosecodebehind":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/Close/mainwindow.xaml.vb" id="Snippetwindowclosecodebehind":::
 
  ]]></format>
         </remarks>
@@ -547,7 +547,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Window/Closing/DataWindow.xaml" id="Snippetwindowclosingxaml1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/Closing/DataWindow.xaml.cs":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowClosingSnippets/visualbasic/datawindow.xaml.vb":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/Closing/datawindow.xaml.vb":::
 
  ]]></format>
         </remarks>
@@ -720,7 +720,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  :::code language="xaml" source="~/snippets/csharp/System.Windows/Window/DialogResult/DialogBox.xaml" id="Snippetwindowdialogresultxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/DialogResult/DialogBox.xaml.cs" id="Snippetwindowdialogresultcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowDialogResultSnippets/visualbasic/dialogbox.xaml.vb" id="Snippetwindowdialogresultcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/DialogResult/dialogbox.xaml.vb" id="Snippetwindowdialogresultcodebehind":::
 
  ]]></format>
         </remarks>
@@ -832,7 +832,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  The following example shows how to override <xref:System.Windows.UIElement.OnMouseLeftButtonDown%2A> to call <xref:System.Windows.Window.DragMove%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/DragMove/MainWindow.xaml.cs" id="Snippetcallwindowdragmovecodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowDragMoveSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetcallwindowdragmovecodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/DragMove/mainwindow.xaml.vb" id="Snippetcallwindowdragmovecodebehind":::
 
  ]]></format>
         </remarks>
@@ -997,7 +997,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  :::code language="xaml" source="~/snippets/xaml/VS_Snippets_Wpf/WindowIconSnippets/XAML/MainWindow.xaml" id="Snippetwindowiconsetxaml":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/Icon/MainWindow.xaml.cs" id="Snippetsetwindowiconincode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowIconSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetsetwindowiconincode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/Icon/mainwindow.xaml.vb" id="Snippetsetwindowiconincode":::
 
  ]]></format>
         </remarks>
@@ -1880,7 +1880,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  The following example shows how to enumerate <xref:System.Windows.Window.OwnedWindows%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/OwnedWindows/MainWindow.xaml.cs" id="Snippetgetwindowownedwindowscode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetgetwindowownedwindowscode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/OwnedWindows/mainwindow.xaml.vb" id="Snippetgetwindowownedwindowscode":::
 
  ]]></format>
         </remarks>
@@ -1969,7 +1969,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  The following example shows how to establish the owner/owned relationship.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/OwnedWindows/MainWindow.xaml.cs" id="Snippetsetwindowownercode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowOwnerOwnedWindowsSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetsetwindowownercode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/OwnedWindows/mainwindow.xaml.vb" id="Snippetsetwindowownercode":::
 
  ]]></format>
         </remarks>
@@ -2119,9 +2119,9 @@ The following example shows a **File** > **Exit** menu being handled to explicit
 :::code language="xaml" source="~/snippets/csharp/System.Windows/Window/RestoreBounds/MainWindow.xaml" id="Snippetwindowrestoreboundsxaml2":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/RestoreBounds/MainWindow.xaml.cs" id="Snippetwindowrestoreboundscodebehind1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetwindowrestoreboundscodebehind1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/RestoreBounds/mainwindow.xaml.vb" id="Snippetwindowrestoreboundscodebehind1":::
 :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/RestoreBounds/MainWindow.xaml.cs" id="Snippetwindowrestoreboundscodebehind2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowRestoreBoundsSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetwindowrestoreboundscodebehind2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/RestoreBounds/mainwindow.xaml.vb" id="Snippetwindowrestoreboundscodebehind2":::
 
  ]]></format>
         </remarks>
@@ -2165,12 +2165,12 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  Calling <xref:System.Windows.Window.Show%2A> is a synchronous operation that returns only after the <xref:System.Windows.FrameworkElement.Loaded> event on the child window has been raised:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/Show/Window1.xaml.cs" id="Snippetshowsync":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/window1.xaml.vb" id="Snippetshowsync":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/Show/window1.xaml.vb" id="Snippetshowsync":::
 
  Setting <xref:System.Windows.UIElement.Visibility%2A>, however, is an asynchronous operation that returns immediately:
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/Show/Window1.xaml.cs" id="Snippetshowasync":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowShowTimingSnippets/visualbasic/window1.xaml.vb" id="Snippetshowasync":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/Show/window1.xaml.vb" id="Snippetshowasync":::
 
  When setting <xref:System.Windows.UIElement.Visibility%2A>, any window events you register before you set <xref:System.Windows.UIElement.Visibility%2A> may not be raised until after the method in which you set <xref:System.Windows.UIElement.Visibility%2A> has completed execution.
 
@@ -2180,7 +2180,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  The following sample demonstrates how to open a modeless window.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/Show/MainWindow.xaml.cs" id="Snippetwindowshowcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowShowSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetwindowshowcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/Show/mainwindow.xaml.vb" id="Snippetwindowshowcode":::
 
  ]]></format>
         </remarks>
@@ -2244,12 +2244,12 @@ The following example shows a **File** > **Exit** menu being handled to explicit
 
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/ShowActivated/AWindow.xaml.cs" id="Snippetshowunactivatedcodebehind":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/awindow.xaml.vb" id="Snippetshowunactivatedcodebehind":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/ShowActivated/awindow.xaml.vb" id="Snippetshowunactivatedcodebehind":::
 
  The following example shows how to use code to configure a window to be opened without it being activated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/ShowActivated/Window1.xaml.cs" id="Snippetshowunactivatedwindowcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowShowActivatedSnippets/visualbasic/window1.xaml.vb" id="Snippetshowunactivatedwindowcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/ShowActivated/window1.xaml.vb" id="Snippetshowunactivatedwindowcode":::
 
  ]]></format>
         </remarks>
@@ -2335,7 +2335,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  The following sample demonstrates how to open a modal window.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Window/ShowDialog/MainWindow.xaml.cs" id="Snippetwindowshowdialogcode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/WindowShowDialogSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetwindowshowdialogcode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Window/ShowDialog/mainwindow.xaml.vb" id="Snippetwindowshowdialogcode":::
 
  ]]></format>
         </remarks>
@@ -2481,7 +2481,7 @@ The following example shows a **File** > **Exit** menu being handled to explicit
  The following example shows how to set the <xref:System.Windows.Window.SizeToContent%2A> property in code to specify how a window resizes to fit its content.
 
  :::code language="csharp" source="~/snippets/csharp/System.Windows/Application/MainWindow/MainWindow1.xaml.cs" id="Snippetsetwindowsizetocontentpropertycode":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/HOWTOWindowManagementSnippets/visualbasic/mainwindow.xaml.vb" id="Snippetsetwindowsizetocontentpropertycode":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/Application/MainWindow/mainwindow1.xaml.vb" id="Snippetsetwindowsizetocontentpropertycode":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Windows/WrapDirection.xml b/xml/System.Windows/WrapDirection.xml
index 9e2fb380783..9193167b88d 100644
--- a/xml/System.Windows/WrapDirection.xml
+++ b/xml/System.Windows/WrapDirection.xml
@@ -32,7 +32,7 @@
  The following example shows how to set the <xref:System.Windows.Documents.Figure.WrapDirection%2A> property programmatically.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Windows/FigureHorizontalAnchor/Overview/Window1.xaml.cs" id="Snippet_figureprops":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Wpf/FloaterFigureSnippets/visualbasic/window1.xaml.vb" id="Snippet_figureprops":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Windows/FigureHorizontalAnchor/Overview/window1.xaml.vb" id="Snippet_figureprops":::  
   
  ]]></format>
     </remarks>