diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedTypeAttribute Example/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/Format/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedTypeAttribute Example/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/Format/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks IBinarySerialize Samples/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/IBinarySerialize/Read/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks IBinarySerialize Samples/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/IBinarySerialize/Read/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsEnd/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlContext/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsEnd/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlContext/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlContext.WindowsIdentity Sample/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlContext/WindowsIdentity/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlContext.WindowsIdentity Sample/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlContext/WindowsIdentity/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataRecord Samples/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlDataRecord/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataRecord Samples/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlDataRecord/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlFunctionAttribute Sample/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlFunctionAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlFunctionAttribute Sample/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlFunctionAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlMetaData/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlMetaData/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMethodAttribute Sample/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlMethodAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMethodAttribute Sample/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlMethodAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.ExecuteAndSend/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/ExecuteAndSend/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.ExecuteAndSend/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/ExecuteAndSend/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.Send/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/Send/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.Send/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/Send/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsRow/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/SendResultsEnd/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsRow/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/SendResultsEnd/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsStart/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/SendResultsStart/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsStart/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/SendResultsStart/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlProcedureAttribute/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlProcedureAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlProcedureAttribute/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlProcedureAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTriggerAttribute Sample/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlTriggerAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTriggerAttribute Sample/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlTriggerAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTriggerContext Sample/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlTriggerContext/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTriggerContext Sample/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlTriggerContext/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedAggregateAttribute Sample/VB/source.vb b/snippets/visualbasic/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedAggregateAttribute Sample/VB/source.vb
rename to snippets/visualbasic/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlClient.AcceptChangesDuringUpdate/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataAdapter/AcceptChangesDuringUpdate/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlClient.AcceptChangesDuringUpdate/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataAdapter/AcceptChangesDuringUpdate/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.MissingMappingAction Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataAdapter/MissingMappingAction/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.MissingMappingAction Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataAdapter/MissingMappingAction/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.TableMappings Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataAdapter/TableMappings/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.TableMappings Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataAdapter/TableMappings/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataColumnMapping Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMapping/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataColumnMapping Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMapping/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataColumnMapping1 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMapping/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataColumnMapping1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMapping/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.DataColumnMappingCollection Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.DataColumnMappingCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Add Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Clear Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Contains1 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Contains1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Count Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Count/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Count Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Count/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetByDataSetColumn Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/GetByDataSetColumn/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetByDataSetColumn Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/GetByDataSetColumn/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetColumnMappingBySchemaAction Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/GetColumnMappingBySchemaAction/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetColumnMappingBySchemaAction Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/GetColumnMappingBySchemaAction/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/RemoveAt/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/RemoveAt/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataSetTable Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataSetTable Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping1 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping2 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMapping/DataSetTable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMapping/DataSetTable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.GetDataTableBySchemaAction Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMapping/GetDataTableBySchemaAction/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.GetDataTableBySchemaAction Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMapping/GetDataTableBySchemaAction/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ToString Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMapping/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ToString Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMapping/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.DataTableMappingCollection Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.DataTableMappingCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Add Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Clear Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Contains1 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Contains1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Count Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Count/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Count Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Count/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetByDataSetTable Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/GetByDataSetTable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetByDataSetTable Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/GetByDataSetTable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetTableMappingBySchemaAction Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/GetTableMappingBySchemaAction/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetTableMappingBySchemaAction Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/GetTableMappingBySchemaAction/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.RemoveAt Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/RemoveAt/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.RemoveAt Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/RemoveAt/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.RemoveAt1 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/RemoveAt/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.RemoveAt1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DataTableMappingCollection/RemoveAt/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.AppendKeyValuePair/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/AppendKeyValuePair/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.AppendKeyValuePair/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/AppendKeyValuePair/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/Project.vbproj b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/ConnectionString/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/ConnectionString/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/ConnectionString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/ConnectionString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ContainsKey/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/ContainsKey/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ContainsKey/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/ContainsKey/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Count/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Count/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Count/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Count/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.EquivalentTo/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/EquivalentTo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.EquivalentTo/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/EquivalentTo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Item/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Item/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Keys/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Keys/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Keys/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Keys/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.TryGetValue/VB/Project.vbproj b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.TryGetValue/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Remove/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Remove/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/Project.vbproj b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/TryGetValue/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/TryGetValue/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.TryGetValue/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/TryGetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.TryGetValue/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/TryGetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Fill2 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/Fill/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Fill2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/Fill/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Fill3 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/Fill/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Fill3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/Fill/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema1 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema2 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema3/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema3/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update1 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update2 Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update3/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update3/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.UpdateCommand Example/VB/source.vb b/snippets/visualbasic/System.Data.Common/DbDataAdapter/UpdateCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.UpdateCommand Example/VB/source.vb
rename to snippets/visualbasic/System.Data.Common/DbDataAdapter/UpdateCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcCommand/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcCommand/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcCommand/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcCommand/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommandBuilder/VB/mysample.vb b/snippets/visualbasic/System.Data.Odbc/OdbcCommandBuilder/Overview/mysample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommandBuilder/VB/mysample.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcCommandBuilder/Overview/mysample.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.OdbcConnection/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.OdbcConnection/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.OdbcConnection1/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.OdbcConnection1/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/BeginTransaction/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/BeginTransaction/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/BeginTransaction/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/BeginTransaction/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Database/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/ChangeDatabase/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Database/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/ChangeDatabase/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/Close/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/Close/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/Close/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/Close/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.DataSource/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/DataSource/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.DataSource/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/DataSource/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Clear/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Clear/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.ContainsKey/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/ContainsKey/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.ContainsKey/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/ContainsKey/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Item/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Item/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Remove/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Remove/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.TryGetValue/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/TryGetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.TryGetValue/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/TryGetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/Project1.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/Project1.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/Project2.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/Project2.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/Project3.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/Project3.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/DeleteCommand/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/DeleteCommand/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/DeleteCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/DeleteCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/InsertCommand/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/InsertCommand/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/InsertCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/InsertCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/SelectCommand/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/SelectCommand/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/SelectCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/SelectCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/UpdateCommand/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/UpdateCommand/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/UpdateCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/UpdateCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/odbcdatareader_getvalues/vb/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataReader/GetValues/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/odbcdatareader_getvalues/vb/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataReader/GetValues/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcDataReader/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcDataReader/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcError/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcError/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.ToString/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcError/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.ToString/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcError/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcErrorCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcErrorCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcException/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcException/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcException/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcException/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcException.Source/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcException/Source/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcException.Source/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcException/Source/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter1/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter1/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter2/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter2/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter3/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter3/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter4/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter4/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.DbType/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameter/DbType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.DbType/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameter/DbType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcParameter/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameter/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add2/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add2/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add3/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add3/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add4/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add4/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.this1/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.this1/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Count/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Count/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/Project.vbproj b/snippets/visualbasic/System.Data.Odbc/OdbcTransaction/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.Odbc/OdbcTransaction/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/source.vb b/snippets/visualbasic/System.Data.Odbc/OdbcTransaction/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/source.vb
rename to snippets/visualbasic/System.Data.Odbc/OdbcTransaction/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand3/VB/mysample.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/mysample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand3/VB/mysample.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/mysample.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand1 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand2 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Cancel Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/Cancel/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Cancel Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/Cancel/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.CommandText Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/CommandText/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.CommandText Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/CommandText/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Connection Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/Connection/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Connection Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/Connection/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteReader2/VB/mysample.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteReader/mysample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteReader2/VB/mysample.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteReader/mysample.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteReader1 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteReader/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteReader1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteReader/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteScalar/VB/mysample.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteScalar/mysample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteScalar/VB/mysample.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteScalar/mysample.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Parameters Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommand/Parameters/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Parameters Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommand/Parameters/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommandBuilder/VB/mysample.vb b/snippets/visualbasic/System.Data.OleDb/OleDbCommandBuilder/Overview/mysample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommandBuilder/VB/mysample.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbCommandBuilder/Overview/mysample.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.OleDbConnection Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.OleDbConnection Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.OleDbConnection1 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.OleDbConnection1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/BeginTransaction/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/BeginTransaction/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction1 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/BeginTransaction/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/BeginTransaction/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Database Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ChangeDatabase/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Database Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/ChangeDatabase/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.DataSource Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ConnectionString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.DataSource Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/ConnectionString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ConnectionTimeout Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ConnectionTimeout/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ConnectionTimeout Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/ConnectionTimeout/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.GetOleDbSchemaTable Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/GetOleDbSchemaTable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.GetOleDbSchemaTable Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/GetOleDbSchemaTable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Provider Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/Provider/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Provider Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/Provider/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ReleaseObjectPool Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ReleaseObjectPool/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ReleaseObjectPool Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/ReleaseObjectPool/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ServerVersion Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ServerVersion/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ServerVersion Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnection/ServerVersion/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.DataSource/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/DataSource/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.DataSource/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/DataSource/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/Project.vbproj b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Item/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Item/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.OleDbServices/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/OleDbServices/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.OleDbServices/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/OleDbServices/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder/VB/Project.vbproj b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.PersistSecurityInfo/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/PersistSecurityInfo/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.PersistSecurityInfo/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/PersistSecurityInfo/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Remove/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Remove/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.TryGetValue/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/TryGetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.TryGetValue/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/TryGetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter2 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter3 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter1 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.RowUpdated Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/RowUpdated/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.RowUpdated Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/RowUpdated/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.OleDb/OleDbDataReader/GetOrdinal/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataReader/GetOrdinal/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataReader/GetOrdinal/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataReader/GetOrdinal/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/oledbdatareader_getvalues/vb/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataReader/GetValues/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/oledbdatareader_getvalues/vb/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataReader/GetValues/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbDataReader/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbDataReader/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbError/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbError/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.ToString Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbError/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.ToString Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbError/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbErrorCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbErrorCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbException Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbException/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbException Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbException/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter1 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.DbType Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.DbType Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter3 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter4 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter4 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter5 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter5 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source5.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter2 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/DbType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/DbType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/Project.vbproj b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add3 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add4 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add4 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add5 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add5 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add6 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add6 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Count Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Count Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.this1 Example/VB/source.vb b/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.this1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleDataReader/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleDataReader/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleDataReader/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleDataReader/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleException/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleException/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleException/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleException/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter1/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter1/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter2/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter2/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter3/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter3/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter4/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter4/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.DbType/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameter/DbType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.DbType/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameter/DbType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add2/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add2/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add3/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add3/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add4/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add4/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Count/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Count/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.this1/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.this1/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleRowUpdatedEventArgs/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleRowUpdatedEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleRowUpdatedEventArgs/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleRowUpdatedEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleRowUpdatingEventArgs/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleRowUpdatingEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleRowUpdatingEventArgs/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleRowUpdatingEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleTransaction/Commit/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleTransaction/Commit/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction1/VB/source.vb b/snippets/visualbasic/System.Data.OracleClient/OracleTransaction/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction1/VB/source.vb
rename to snippets/visualbasic/System.Data.OracleClient/OracleTransaction/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ConnectionString/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ConnectionString/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.KeepIdentity/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.KeepIdentity/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.BatchSize/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/BatchSize/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.BatchSize/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/BatchSize/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.Timeout/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/BulkCopyTimeout/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.Timeout/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/BulkCopyTimeout/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.OrdersDetails/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/Close/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.OrdersDetails/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/Close/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.Single/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/DestinationTableName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.Single/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/DestinationTableName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.NotifyAfter/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/NotifyAfter/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.NotifyAfter/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/NotifyAfter/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks BulkCopy.Single/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks BulkCopy.Single/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.DataRowState/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.DataRowState/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.DataTable/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.DataTable/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.RowArray/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.RowArray/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingNameOrdinal/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingNameOrdinal/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdinal/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdinal/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdinalName/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdinalName/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationColumn/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/DestinationColumn/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationColumn/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/DestinationColumn/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationOrdinal/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/DestinationOrdinal/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationOrdinal/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/DestinationOrdinal/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollectionOrdinal/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollectionOrdinal/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingColNameIndex/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingColNameIndex/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingIndexColName/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingIndexColName/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdersDetails/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdersDetails/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollection/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollection/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingRemove/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingRemove/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingRemoveAt/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/RemoveAt/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingRemoveAt/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/RemoveAt/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlClientFactory.DataSourceEnumerator/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlClientFactory/CanCreateDataSourceEnumerator/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlClientFactory.DataSourceEnumerator/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlClientFactory/CanCreateDataSourceEnumerator/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand1 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/source.vb
similarity index 58%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/source.vb
index c2a5c6c59aa..8ed4be39509 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand1 Example/VB/source.vb	
+++ b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/source.vb
@@ -1,24 +1,17 @@
-Imports System.Xml
-Imports System.Data
+Imports System.Data
 Imports System.Data.SqlClient
-Imports System.Data.Common
-Imports System.Windows.Forms
 
 
 
-Public Class Form1
-    Inherits Form
-    Protected DataSet1 As DataSet
-    Protected dataGrid1 As DataGrid
-    
-    
-    
+Public Class Class1
+
+
     ' <Snippet1>
     Public Sub CreateCommand()
         Dim queryString As String = "SELECT * FROM Categories ORDER BY CategoryID"
         Dim command As New SqlCommand(queryString)
         command.CommandTimeout = 15
         command.CommandType = CommandType.Text
-    End Sub 
+    End Sub
     ' </Snippet1>
 End Class
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/VB/Form1.Designer.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/Form1.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/VB/Form1.Designer.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/Form1.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/VB/Form1.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/Form1.vb
similarity index 92%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/VB/Form1.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/Form1.vb
index f6453a41011..3331d74b185 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/VB/Form1.vb	
+++ b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/Form1.vb
@@ -1,9 +1,8 @@
 Option Explicit On
 Option Strict On
-
-Imports System.Data
 ' <Snippet1>
 Imports System.Data.SqlClient
+Imports System.Windows.Forms
 
 Public Class Form1
     ' Add this code to the form's class:
@@ -30,7 +29,7 @@ Public Class Form1
         ' If you have not included "Asynchronous Processing=true" in the
         ' connection string, the command is not able
         ' to execute asynchronously.
-        Return "Data Source=(local);Integrated Security=true;" & _
+        Return "Data Source=(local);Integrated Security=true;" &
           "Initial Catalog=AdventureWorks; Asynchronous Processing=true"
     End Function
 
@@ -43,21 +42,21 @@ Public Class Form1
         DisplayStatus("Ready")
     End Sub
 
-    Private Sub Form1_FormClosing(ByVal sender As Object, _
-        ByVal e As System.Windows.Forms.FormClosingEventArgs) _
+    Private Sub Form1_FormClosing(ByVal sender As Object,
+        ByVal e As FormClosingEventArgs) _
         Handles Me.FormClosing
         If isExecuting Then
-            MessageBox.Show(Me, "Cannot close the form until " & _
+            MessageBox.Show(Me, "Cannot close the form until " &
                 "the pending asynchronous command has completed. Please wait...")
             e.Cancel = True
         End If
     End Sub
 
-    Private Sub Button1_Click(ByVal sender As System.Object, _
+    Private Sub Button1_Click(ByVal sender As System.Object,
         ByVal e As System.EventArgs) Handles Button1.Click
         If isExecuting Then
-            MessageBox.Show(Me, _
-               "Already executing. Please wait until the current query " & _
+            MessageBox.Show(Me,
+               "Already executing. Please wait until the current query " &
                 "has completed.")
         Else
             Dim command As SqlCommand
@@ -69,11 +68,11 @@ Public Class Form1
                 ' a few seconds before working with the data.
                 ' This command does not do much, but that's the point--
                 ' it does not change your data, in the long run.
-                Dim commandText As String = _
-                    "WAITFOR DELAY '0:0:05';" & _
-                    "UPDATE Production.Product SET ReorderPoint = ReorderPoint + 1 " & _
-                    "WHERE ReorderPoint Is Not Null;" & _
-                    "UPDATE Production.Product SET ReorderPoint = ReorderPoint - 1 " & _
+                Dim commandText As String =
+                    "WAITFOR DELAY '0:0:05';" &
+                    "UPDATE Production.Product SET ReorderPoint = ReorderPoint + 1 " &
+                    "WHERE ReorderPoint Is Not Null;" &
+                    "UPDATE Production.Product SET ReorderPoint = ReorderPoint - 1 " &
                     "WHERE ReorderPoint Is Not Null"
 
                 command = New SqlCommand(commandText, connection)
@@ -139,7 +138,7 @@ Public Class Form1
 
             ' You can create the delegate instance as you 
             ' invoke it, like this:
-            Me.Invoke(New DisplayInfoDelegate(AddressOf DisplayStatus), _
+            Me.Invoke(New DisplayInfoDelegate(AddressOf DisplayStatus),
                 String.Format("Ready(last error: {0}", ex.Message))
         Finally
             isExecuting = False
diff --git a/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/TesterFormVB.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/TesterFormVB.vbproj
new file mode 100644
index 00000000000..bb613fc18da
--- /dev/null
+++ b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/TesterFormVB.vbproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net9.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQuery/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/source.vb
similarity index 92%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQuery/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/source.vb
index c4768682883..69210ee2e43 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQuery/VB/source.vb	
+++ b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/source.vb
@@ -1,7 +1,5 @@
 Option Explicit On
 Option Strict On
-
-Imports System.Data
 ' <Snippet1>
 Imports System.Data.SqlClient
 
@@ -12,11 +10,11 @@ Module Module1
         ' BeginExecuteNonQuery functionality.
         ' The WAITFOR statement simply adds enough time to prove the 
         ' asynchronous nature of the command.
-        Dim commandText As String = _
-         "UPDATE Production.Product SET ReorderPoint = ReorderPoint + 1 " & _
-         "WHERE ReorderPoint Is Not Null;" & _
-         "WAITFOR DELAY '0:0:3';" & _
-         "UPDATE Production.Product SET ReorderPoint = ReorderPoint - 1 " & _
+        Dim commandText As String =
+         "UPDATE Production.Product SET ReorderPoint = ReorderPoint + 1 " &
+         "WHERE ReorderPoint Is Not Null;" &
+         "WAITFOR DELAY '0:0:3';" &
+         "UPDATE Production.Product SET ReorderPoint = ReorderPoint - 1 " &
          "WHERE ReorderPoint Is Not Null"
 
         RunCommandAsynchronously(commandText, GetConnectionString())
@@ -25,7 +23,7 @@ Module Module1
         Console.ReadLine()
     End Sub
 
-    Private Sub RunCommandAsynchronously( _
+    Private Sub RunCommandAsynchronously(
      ByVal commandText As String, ByVal connectionString As String)
 
         ' Given command text and connection string, asynchronously execute
@@ -46,7 +44,7 @@ Module Module1
                     Threading.Thread.Sleep(100)
                     count += 1
                 End While
-                Console.WriteLine("Command complete. Affected {0} rows.", _
+                Console.WriteLine("Command complete. Affected {0} rows.",
                     command.EndExecuteNonQuery(result))
             Catch ex As SqlException
                 Console.WriteLine("Error ({0}): {1}", ex.Number, ex.Message)
@@ -67,7 +65,7 @@ Module Module1
         ' If you have not included "Asynchronous Processing=true" in the
         ' connection string, the command is not able
         ' to execute asynchronously.
-        Return "Data Source=(local);Integrated Security=SSPI;" & _
+        Return "Data Source=(local);Integrated Security=SSPI;" &
           "Initial Catalog=AdventureWorks; Asynchronous Processing=true"
     End Function
 End Module
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsync/VB/Form1.Designer.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form1.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsync/VB/Form1.Designer.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form1.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/VB/Form1.Designer.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form1.Designer1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/VB/Form1.Designer.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form1.Designer1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsync/VB/Form1.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsync/VB/Form1.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/VB/Form1.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form11.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/VB/Form1.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form11.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/VB/TesterFormVB.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/TesterFormVB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/VB/TesterFormVB.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/TesterFormVB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsync/VB/TesterFormVB.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/TesterFormVB1.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsync/VB/TesterFormVB.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/TesterFormVB1.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReader/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReader/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncSimple/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncSimple/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/Form1.Designer.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/Form1.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/Form1.Designer.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/Form1.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/Form1.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/Form1.vb
similarity index 99%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/Form1.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/Form1.vb
index bd6078c9988..eebc70b91de 100644
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/Form1.vb	
+++ b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/Form1.vb
@@ -4,6 +4,7 @@ Option Strict On
 Imports System.Data
 ' <Snippet1>
 Imports System.Data.SqlClient
+Imports System.Windows.Forms
 Imports System.Xml
 
 Public Class Form1
diff --git a/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/TesterFormVB.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/TesterFormVB.vbproj
new file mode 100644
index 00000000000..bb613fc18da
--- /dev/null
+++ b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/TesterFormVB.vbproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net9.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReader/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReader/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Cancel/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Cancel/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Cancel/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/Cancel/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.CommandText Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/CommandText/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.CommandText Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/CommandText/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Connection/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/Connection/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Connection/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/Connection/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteNonQuery/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteNonQuery/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteNonQuery/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteNonQuery/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/Project1.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/Project1.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/mysample.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/mysample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/mysample.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/mysample.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.ExecuteScalar/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteScalar/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.ExecuteScalar/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteScalar/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteXmlReader/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteXmlReader/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/mysample.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteXmlReader/mysample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/mysample.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteXmlReader/mysample.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParameterCollection.AddWithValue/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Parameters/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParameterCollection.AddWithValue/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/Parameters/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Prepare/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/Prepare/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Prepare/Source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommand/Prepare/Source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommandBuilder/VB/Source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlCommandBuilder/Overview/Source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommandBuilder/VB/Source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlCommandBuilder/Overview/Source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.SqlConnection Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.SqlConnection Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.SqlConnection1 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.SqlConnection1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/Project1.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/Project1.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/Project2.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/Project2.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Database Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ChangeDatabase/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Database Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/ChangeDatabase/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Open Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/Close/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Open Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/Close/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.ConnectionString Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ConnectionString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.ConnectionString Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/ConnectionString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.ConnectionTimeout Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ConnectionTimeout/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.ConnectionTimeout Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/ConnectionTimeout/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/sqlconnection_createcommand/vb/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/CreateCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/sqlconnection_createcommand/vb/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/CreateCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.DataSource Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/DataSource/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.DataSource Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/DataSource/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.PacketSize Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/PacketSize/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.PacketSize Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/PacketSize/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ISqlConnection.ServerVersion Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ServerVersion/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ISqlConnection.ServerVersion Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/ServerVersion/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.WorkstationId Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnection/WorkstationId/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.WorkstationId Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnection/WorkstationId/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ApplicationName/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ApplicationName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ApplicationName/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ApplicationName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Async/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/AsynchronousProcessing/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Async/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/AsynchronousProcessing/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.AttachDBFilename/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/AttachDBFilename/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.AttachDBFilename/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/AttachDBFilename/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Clear/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Clear/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ConnectTimeout/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ConnectTimeout/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ConnectTimeout/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ConnectTimeout/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ContainsKey/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ContainsKey/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ContainsKey/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ContainsKey/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.DataSource/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/DataSource/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.DataSource/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/DataSource/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.InitialCatalog/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/InitialCatalog/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.InitialCatalog/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/InitialCatalog/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Item/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Item/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Keys/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Keys/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Keys/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Keys/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.MARS/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/MultipleActiveResultSets/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.MARS/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/MultipleActiveResultSets/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/dataworks sqlconnectionstringbuilder.password.2/vb/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Password/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/dataworks sqlconnectionstringbuilder.password.2/vb/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Password/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.TryGetValue/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/TryGetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.TryGetValue/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/TryGetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Values/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Values/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Values/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Values/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter1 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter2 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter3 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/DeleteCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/DeleteCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/RowUpdated/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/RowUpdated/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/RowUpdated/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/RowUpdated/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlDataReader/Close/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataReader/Close/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataReader/Close/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataReader/Close/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/Project.vbproj b/snippets/visualbasic/System.Data.SqlClient/SqlDataReader/GetOrdinal/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataReader/GetOrdinal/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataReader/GetOrdinal/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataReader/GetOrdinal/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/sqldatareader_isdbnull/vb/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlDataReader/IsDBNull/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/sqldatareader_isdbnull/vb/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlDataReader/IsDBNull/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlError/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlError/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlException/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlException/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter1 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter2 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter4 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter4 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter5 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter5 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter6 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter6 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source5.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Precision Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameter/Precision/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Precision Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameter/Precision/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add1 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add3 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add5 Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add5 Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Remove Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Remove Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlRowUpdatingEventArgs Example/VB/source.vb b/snippets/visualbasic/System.Data.SqlClient/SqlRowUpdatingEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlRowUpdatingEventArgs Example/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlClient/SqlRowUpdatingEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTypes.IsNull/VB/source.vb b/snippets/visualbasic/System.Data.SqlTypes/INullable/IsNull/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTypes.IsNull/VB/source.vb
rename to snippets/visualbasic/System.Data.SqlTypes/INullable/IsNull/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.AcceptRejectRule/VB/source.vb b/snippets/visualbasic/System.Data/AcceptRejectRule/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.AcceptRejectRule/VB/source.vb
rename to snippets/visualbasic/System.Data/AcceptRejectRule/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.ConstraintName Example/VB/source.vb b/snippets/visualbasic/System.Data/Constraint/ConstraintName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.ConstraintName Example/VB/source.vb
rename to snippets/visualbasic/System.Data/Constraint/ConstraintName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint Example/VB/source.vb b/snippets/visualbasic/System.Data/Constraint/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint Example/VB/source.vb
rename to snippets/visualbasic/System.Data/Constraint/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.SetDataSet Example/VB/source.vb b/snippets/visualbasic/System.Data/Constraint/SetDataSet/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.SetDataSet Example/VB/source.vb
rename to snippets/visualbasic/System.Data/Constraint/SetDataSet/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.Table Example/VB/source.vb b/snippets/visualbasic/System.Data/Constraint/Table/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.Table Example/VB/source.vb
rename to snippets/visualbasic/System.Data/Constraint/Table/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.ToString Example/VB/source.vb b/snippets/visualbasic/System.Data/Constraint/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.ToString Example/VB/source.vb
rename to snippets/visualbasic/System.Data/Constraint/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add1 Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add2 Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Add/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Add/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add3 Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Add/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Add/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add4 Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Add/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add4 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Add/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.AddRange Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/AddRange/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.AddRange Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/AddRange/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.CanRemove Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/CanRemove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.CanRemove Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/CanRemove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Clear Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.CollectionChanged Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/CollectionChanged/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.CollectionChanged Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/CollectionChanged/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Contains Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Contains Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.IndexOf Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/IndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.IndexOf Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/IndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.IndexOf1 Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/IndexOf/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.IndexOf1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/IndexOf/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.this Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.this Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.this1 Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.this1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Remove Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Remove Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Remove1 Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/Remove/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Remove1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/Remove/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.RemoveAt Example/VB/source.vb b/snippets/visualbasic/System.Data/ConstraintCollection/RemoveAt/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.RemoveAt Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ConstraintCollection/RemoveAt/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn4 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/.ctor/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn4 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/.ctor/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.AllowDBNull Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/AllowDBNull/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.AllowDBNull Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/AllowDBNull/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.AutoIncrementSeed Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/AutoIncrement/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.AutoIncrementSeed Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/AutoIncrement/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Caption Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/Caption/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Caption Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/Caption/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ColumnMapping Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/ColumnMapping/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ColumnMapping Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/ColumnMapping/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ColumnName Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/ColumnName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ColumnName Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/ColumnName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataType Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/DataType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataType Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/DataType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DefaultValue Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/DefaultValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DefaultValue Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/DefaultValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ExtendedProperties Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/ExtendedProperties/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ExtendedProperties Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/ExtendedProperties/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Ordinal Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/Ordinal/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Ordinal Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/Ordinal/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ReadOnly Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/ReadOnly/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ReadOnly Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/ReadOnly/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Table Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/Table/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Table Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/Table/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ToString Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ToString Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Unique Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumn/Unique/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Unique Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumn/Unique/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Add/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Add/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add4 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Add/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add4 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Add/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add5 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Add/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add5 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Add/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.CanRemove Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/CanRemove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.CanRemove Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/CanRemove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Clear Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.CollectionChanged Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/CollectionChanged/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.CollectionChanged Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/CollectionChanged/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Contains Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Contains Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.IndexOf Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/IndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.IndexOf Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/IndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.this Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.this Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.this1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.this1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Remove Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Remove Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Remove1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/Remove/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Remove1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/Remove/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.RemoveAt Example/VB/source.vb b/snippets/visualbasic/System.Data/DataColumnCollection/RemoveAt/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.RemoveAt Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataColumnCollection/RemoveAt/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation/VB/datarelation.vb b/snippets/visualbasic/System.Data/DataRelation/.ctor/datarelation.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation/VB/datarelation.vb
rename to snippets/visualbasic/System.Data/DataRelation/.ctor/datarelation.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildColumns Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/ChildColumns/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildColumns Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/ChildColumns/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildKeyConstraint Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/ChildKeyConstraint/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildKeyConstraint Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/ChildKeyConstraint/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildTable Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/ChildTable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildTable Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/ChildTable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataSet Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/DataSet/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataSet Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/DataSet/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentColumns Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/ParentColumns/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentColumns Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/ParentColumns/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentKeyConstraint Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/ParentKeyConstraint/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentKeyConstraint Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/ParentKeyConstraint/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentTable Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/ParentTable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentTable Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/ParentTable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.RelationName Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/RelationName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.RelationName Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/RelationName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ToString Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelation/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ToString Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelation/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelationCollection.Add1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelationCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelationCollection.Add1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelationCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelationCollection.AddRange Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRelationCollection/AddRange/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelationCollection.AddRange Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRelationCollection/AddRange/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.AcceptChanges Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/AcceptChanges/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.AcceptChanges Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/AcceptChanges/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.BeginEdit Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/BeginEdit/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.BeginEdit Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/BeginEdit/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.CancelEdit Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/CancelEdit/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.CancelEdit Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/CancelEdit/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.ClearErrors Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/ClearErrors/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.ClearErrors Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/ClearErrors/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.Delete Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Delete/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.Delete Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Delete/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetChildRows2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetChildRows/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetChildRows2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetChildRows/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetChildRows3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetChildRows/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetChildRows3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetChildRows/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetColumnError/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetColumnError/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetParentRow/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetParentRow/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetParentRow/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetParentRow/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetParentRow/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetParentRow/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetParentRow/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetParentRow/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRows2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetParentRows/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRows2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetParentRows/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRows3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/GetParentRows/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRows3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/GetParentRows/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.HasErrors Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/HasErrors/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.HasErrors Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/HasErrors/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.HasVersion Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/HasVersion/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.HasVersion Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/HasVersion/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/IsNull/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/IsNull/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/IsNull/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/IsNull/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/IsNull/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/IsNull/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Item/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Item/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Item/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Item/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this4 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Item/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this4 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Item/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this5 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Item/source5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this5 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Item/source5.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.ItemArray Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/ItemArray/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.ItemArray Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/ItemArray/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.RowError Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/RowError/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.RowError Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/RowError/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.RowState Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/RowState/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.RowState Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/RowState/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetParentRow1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/SetParentRow/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetParentRow1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/SetParentRow/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.Table Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRow/Table/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.Table Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRow/Table/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventArgs/VB/source.vb b/snippets/visualbasic/System.Data/DataRowChangeEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventArgs/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowChangeEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventHandler/VB/source.vb b/snippets/visualbasic/System.Data/DataRowChangeEventHandler/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventHandler/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowChangeEventHandler/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Add1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Add1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Contains Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Contains Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Contains1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Contains/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Contains1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Contains/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Find Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Find/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Find Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Find/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Find1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Find/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Find1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Find/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.this Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.this Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Add Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Remove Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Remove Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.RemoveAt Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowCollection/RemoveAt/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.RemoveAt Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowCollection/RemoveAt/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowState Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowState/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowState Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowState/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowVersion Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowVersion/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowVersion Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowVersion/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.BeginEdit Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowView/BeginEdit/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.BeginEdit Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowView/BeginEdit/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.DataView Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowView/DataView/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.DataView Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowView/DataView/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.Delete Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowView/Delete/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.Delete Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowView/Delete/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.EndEdit Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowView/EndEdit/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.EndEdit Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowView/EndEdit/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.this Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowView/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.this Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowView/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.this2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowView/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.this2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowView/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataRowView.RowVersion1/VB/source.vb b/snippets/visualbasic/System.Data/DataRowView/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataRowView.RowVersion1/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowView/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.Row Example/VB/source.vb b/snippets/visualbasic/System.Data/DataRowView/Row/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.Row Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataRowView/Row/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSet Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSet Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSet1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSet1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.AcceptChanges/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/AcceptChanges/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.AcceptChanges/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/AcceptChanges/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.CaseSensitive Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/CaseSensitive/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.CaseSensitive Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/CaseSensitive/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Clear Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Clone Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Clone/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Clone Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Clone/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Copy Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Copy/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Copy Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Copy/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.CreateDataReader/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/CreateDataReader/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.CreateDataReader/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/CreateDataReader/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.DataTableReader/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/CreateDataReader/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.DataTableReader/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/CreateDataReader/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.DataTableReaderTables/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/CreateDataReader/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.DataTableReaderTables/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/CreateDataReader/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSetName Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/DataSetName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSetName Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/DataSetName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DefaultViewManager Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/DefaultViewManager/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DefaultViewManager Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/DefaultViewManager/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.EnforceConstraints Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/EnforceConstraints/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.EnforceConstraints Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/EnforceConstraints/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/GetChanges/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/GetChanges/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/GetChanges/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/GetChanges/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetXml Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/GetXml/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetXml Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/GetXml/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetXmlSchema Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/GetXmlSchema/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetXmlSchema Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/GetXmlSchema/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.HasChanges Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/HasChanges/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.HasChanges Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/HasChanges/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.HasErrors Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/HasErrors/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.HasErrors Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/HasErrors/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.Load/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Load/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.Load/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Load/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.LoadString/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Load/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.LoadString/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Load/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.LoadTables/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Load/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.LoadTables/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Load/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Locale Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Locale/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Locale Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Locale/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Merge/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Merge/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Merge/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Merge/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Merge/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Merge/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge4 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Merge/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge4 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Merge/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.MergeFailed Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/MergeFailed/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.MergeFailed Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/MergeFailed/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Namespace Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Namespace/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Namespace Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Namespace/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.OnRemoveTable Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/OnRemoveTable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.OnRemoveTable Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/OnRemoveTable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ReadXml/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ReadXml/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ReadXml/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ReadXml/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ReadXml/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ReadXml/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ReadXml/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ReadXml/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.RejectChanges Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/RejectChanges/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.RejectChanges Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/RejectChanges/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Relations Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Relations/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Relations Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Relations/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ShouldSerializeRelations Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ShouldSerializeRelations/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ShouldSerializeRelations Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ShouldSerializeRelations/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ShouldSerializeTables Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/ShouldSerializeTables/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ShouldSerializeTables Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/ShouldSerializeTables/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Tables Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/Tables/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Tables Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/Tables/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/WriteXml/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/WriteXml/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml6 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/WriteXml/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml6 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/WriteXml/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml7 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/WriteXml/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml7 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/WriteXml/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataTable Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataTable Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataTable1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataTable1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.AcceptChanges Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/AcceptChanges/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.AcceptChanges Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/AcceptChanges/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.CaseSensitive Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/CaseSensitive/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.CaseSensitive Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/CaseSensitive/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ChildRelations Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ChildRelations/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ChildRelations Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ChildRelations/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Clear Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ColumnChanged Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ColumnChanged/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ColumnChanged Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ColumnChanged/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ColumnChanging Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ColumnChanging/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ColumnChanging Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ColumnChanging/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Columns Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Columns/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Columns Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Columns/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Compute Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Compute/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Compute Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Compute/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Constraints Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Constraints/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Constraints Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Constraints/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Copy Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Copy/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Copy Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Copy/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.CreateDataReader/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/CreateDataReader/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.CreateDataReader/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/CreateDataReader/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataSet Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/DataSet/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataSet Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/DataSet/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DefaultView Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/DefaultView/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DefaultView Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/DefaultView/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ExtendedProperties Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ExtendedProperties/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ExtendedProperties Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ExtendedProperties/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetChanges Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/GetChanges/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetChanges Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/GetChanges/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetChanges1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/GetChanges/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetChanges1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/GetChanges/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetErrors Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/GetErrors/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetErrors Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/GetErrors/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.HasErrors Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/HasErrors/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.HasErrors Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/HasErrors/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Load/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Load/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.ErrorEventHandler/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Load/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.ErrorEventHandler/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Load/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.IDataReader/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Load/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.IDataReader/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Load/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.LoadOption/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Load/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.LoadOption/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Load/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.LoadDataRow Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/LoadDataRow/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.LoadDataRow Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/LoadDataRow/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Locale Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Locale/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Locale Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Locale/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.Merge/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Merge/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.Merge/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Merge/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.MergeMissingSchemaAction/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Merge/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.MergeMissingSchemaAction/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Merge/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.MergePreserveChanges/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Merge/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.MergePreserveChanges/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Merge/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableMergeOverload/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Merge/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableMergeOverload/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Merge/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.MinimumCapacity Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/MinimumCapacity/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.MinimumCapacity Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/MinimumCapacity/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.NewRow Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/NewRow/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.NewRow Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/NewRow/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ParentRelations Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ParentRelations/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ParentRelations Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ParentRelations/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.PrimaryKey Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/PrimaryKey/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.PrimaryKey Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/PrimaryKey/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXml/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ReadXml/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXml/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ReadXml/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlString/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ReadXml/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlString/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ReadXml/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlText/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ReadXml/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlText/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ReadXml/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlXmlReader/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ReadXml/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlXmlReader/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ReadXml/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlIOStream/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlIOStream/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchema/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchema/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchemaReader/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchemaReader/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchemaString/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchemaString/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RejectChanges Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/RejectChanges/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RejectChanges Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/RejectChanges/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowChanged Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/RowChanged/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowChanged Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/RowChanged/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowChanging Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/RowChanging/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowChanging Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/RowChanging/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowDeleted Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/RowDeleted/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowDeleted Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/RowDeleted/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowDeleting Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/RowDeleting/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowDeleting Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/RowDeleting/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Rows Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Rows/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Rows Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Rows/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Select/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Select/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Select/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Select/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Select/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Select/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select3 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/Select/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/Select/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.TableName Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/TableName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.TableName Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/TableName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ToString Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/ToString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ToString Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/ToString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXml/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/WriteXml/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXml/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/WriteXml/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlIO/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/WriteXml/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlIO/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/WriteXml/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlOverload/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/WriteXml/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlOverload/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/WriteXml/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlSchema/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/WriteXmlSchema/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlSchema/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/WriteXmlSchema/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlSchemaOverload/VB/source.vb b/snippets/visualbasic/System.Data/DataTable/WriteXmlSchema/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlSchemaOverload/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTable/WriteXmlSchema/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.AddRange Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/AddRange/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.AddRange Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/AddRange/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CanRemove Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/CanRemove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CanRemove Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/CanRemove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Clear Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Clear/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Clear Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Clear/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanged Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/CollectionChanged/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanged Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/CollectionChanged/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanging Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/CollectionChanging/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanging Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/CollectionChanging/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Contains Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Contains/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Contains Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Contains/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/IndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/IndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/IndexOf/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/IndexOf/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.this Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.this Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.this1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.this1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Remove/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Remove/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/Remove/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/Remove/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.RemoveAt/VB/source.vb b/snippets/visualbasic/System.Data/DataTableCollection/RemoveAt/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.RemoveAt/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableCollection/RemoveAt/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/DataViewSamplesVB.vbproj b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/DataViewSamplesVB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/DataViewSamplesVB.vbproj
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/DataViewSamplesVB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.Designer.vb b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.Designer.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.resx b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.resx
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.resx
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.vb b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Application.Designer.vb b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Application.myapp b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Application.myapp
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Resources.resx b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Resources.resx
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Settings.settings b/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/My Project/Settings.settings
rename to snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/LINQtoDataSetExamplesVB.vbproj b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/LINQtoDataSetExamplesVB.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/LINQtoDataSetExamplesVB.vbproj
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/LINQtoDataSetExamplesVB.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/Module1.vb b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/Module1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/Module1.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/Module1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Application.Designer.vb b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Application.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Application.Designer.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Application.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Application.myapp b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Application.myapp
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/AssemblyInfo.vb b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/AssemblyInfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/AssemblyInfo.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/AssemblyInfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Resources.Designer.vb b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Resources.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Resources.Designer.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Resources.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Resources.resx b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Resources.resx
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Settings.Designer.vb b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Settings.Designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Settings.Designer.vb
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Settings.Designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Settings.settings b/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/My Project/Settings.settings
rename to snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/My Project/Settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.ctor/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.ctor/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBoolean/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetBoolean/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBoolean/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetBoolean/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetByte/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetByte/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetByte/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetByte/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBytes/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetBytes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBytes/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetBytes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetChar/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetChar/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetChar/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetChar/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetChars/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetChars/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetChars/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetChars/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDataTypeName/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetDataTypeName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDataTypeName/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetDataTypeName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDateTime/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetDateTime/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDateTime/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetDateTime/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDecimal/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetDecimal/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDecimal/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetDecimal/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDouble/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetDouble/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDouble/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetDouble/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetEnumerator/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetEnumerator/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetEnumerator/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetEnumerator/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetFieldType/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetFieldType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetFieldType/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetFieldType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetFloat/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetFloat/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetFloat/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetFloat/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetGuid/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetGuid/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetGuid/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetGuid/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt16/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetInt16/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt16/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetInt16/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt32/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetInt32/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt32/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetInt32/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt64/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetInt64/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt64/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetInt64/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetName/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetName/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetOrdinal/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetOrdinal/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetOrdinal/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetOrdinal/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetSchemaTable/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetSchemaTable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetSchemaTable/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetSchemaTable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetString/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetString/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValue/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValue/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValueObject/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/GetValues/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValueObject/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/GetValues/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.HasRows/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/HasRows/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.HasRows/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/HasRows/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.IsDbNull/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/IsDBNull/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.IsDbNull/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/IsDBNull/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.Item/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.Item/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.ItemName/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.ItemName/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.NextResult/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/NextResult/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.NextResult/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/NextResult/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.Read/VB/source.vb b/snippets/visualbasic/System.Data/DataTableReader/Read/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.Read/VB/source.vb
rename to snippets/visualbasic/System.Data/DataTableReader/Read/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView2 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AddNew Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/AddNew/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AddNew Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/AddNew/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowDelete Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/AllowDelete/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowDelete Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/AllowDelete/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowEdit Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/AllowEdit/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowEdit Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/AllowEdit/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowNew Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/AllowNew/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowNew Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/AllowNew/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Delete Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/Delete/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Delete Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/Delete/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Find Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/Find/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Find Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/Find/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Find1 Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/Find/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Find1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/Find/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.ListChanged Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/ListChanged/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.ListChanged Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/ListChanged/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.RowFilter Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/RowFilter/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.RowFilter Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/RowFilter/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.RowStateFilter Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/RowStateFilter/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.RowStateFilter Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/RowStateFilter/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Sort Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/Sort/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Sort Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/Sort/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Table Example/VB/source.vb b/snippets/visualbasic/System.Data/DataView/Table/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Table Example/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/Table/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableFiltered/VB/source.vb b/snippets/visualbasic/System.Data/DataView/ToTable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableFiltered/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/ToTable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableNewName/VB/source.vb b/snippets/visualbasic/System.Data/DataView/ToTable/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableNewName/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/ToTable/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableUniqueValues/VB/source.vb b/snippets/visualbasic/System.Data/DataView/ToTable/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableUniqueValues/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/ToTable/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableUniqueValuesName/VB/source.vb b/snippets/visualbasic/System.Data/DataView/ToTable/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableUniqueValuesName/VB/source.vb
rename to snippets/visualbasic/System.Data/DataView/ToTable/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint1 Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint2 Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint3 Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint3 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.DeleteRule Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/AcceptRejectRule/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.DeleteRule Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/AcceptRejectRule/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Columns Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/Columns/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Columns Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/Columns/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Equals Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/Equals/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Equals Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/Equals/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Table Example/VB/source.vb b/snippets/visualbasic/System.Data/ForeignKeyConstraint/Table/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Table Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ForeignKeyConstraint/Table/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/VB/source.vb b/snippets/visualbasic/System.Data/IColumnMapping/DataSetColumn/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IColumnMapping/DataSetColumn/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping Example/VB/source.vb b/snippets/visualbasic/System.Data/IColumnMapping/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IColumnMapping/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/VB/source.vb b/snippets/visualbasic/System.Data/IColumnMappingCollection/IndexOf/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IColumnMappingCollection/IndexOf/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection Example/VB/source.vb b/snippets/visualbasic/System.Data/IColumnMappingCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IColumnMappingCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt1 Example/VB/source.vb b/snippets/visualbasic/System.Data/IColumnMappingCollection/RemoveAt/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt1 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IColumnMappingCollection/RemoveAt/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataAdapter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataAdapter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.IDataAdapter.Update Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataAdapter/Update/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.IDataAdapter.Update Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataAdapter/Update/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Direction Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataParameter/Direction/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Direction Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataParameter/Direction/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.IsNullable Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataParameter/IsNullable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.IsNullable Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataParameter/IsNullable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataParameter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataParameter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.ParameterName Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataParameter/ParameterName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.ParameterName Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataParameter/ParameterName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SourceColumn Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataParameter/SourceColumn/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SourceColumn Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataParameter/SourceColumn/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SourceVersion Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataParameter/SourceVersion/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SourceVersion Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataParameter/SourceVersion/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Value Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataParameter/Value/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Value Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataParameter/Value/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/Project.vbproj b/snippets/visualbasic/System.Data/IDataReader/NextResult/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/Project.vbproj
rename to snippets/visualbasic/System.Data/IDataReader/NextResult/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/source.vb b/snippets/visualbasic/System.Data/IDataReader/NextResult/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/source.vb
rename to snippets/visualbasic/System.Data/IDataReader/NextResult/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/Project.vbproj b/snippets/visualbasic/System.Data/IDataReader/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/Project.vbproj
rename to snippets/visualbasic/System.Data/IDataReader/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataReader/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataReader/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/VB/source.vb b/snippets/visualbasic/System.Data/IDataReader/Read/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataReader/Read/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader.GetOrdinal/VB/source.vb b/snippets/visualbasic/System.Data/IDataRecord/GetOrdinal/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader.GetOrdinal/VB/source.vb
rename to snippets/visualbasic/System.Data/IDataRecord/GetOrdinal/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandText Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbCommand/CommandText/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandText Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbCommand/CommandText/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandTimeout Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbCommand/CommandTimeout/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandTimeout Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbCommand/CommandTimeout/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbCommand/ExecuteNonQuery/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbCommand/ExecuteNonQuery/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteScalar/VB/mysample.vb b/snippets/visualbasic/System.Data/IDbCommand/ExecuteScalar/mysample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteScalar/VB/mysample.vb
rename to snippets/visualbasic/System.Data/IDbCommand/ExecuteScalar/mysample.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/Project.vbproj b/snippets/visualbasic/System.Data/IDbCommand/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data/IDbCommand/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbCommand/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbCommand/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.Parameters Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbCommand/Parameters/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.Parameters Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbCommand/Parameters/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/Project.vbproj b/snippets/visualbasic/System.Data/IDbCommand/Prepare/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data/IDbCommand/Prepare/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbCommand/Prepare/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbCommand/Prepare/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbConnection.ConnectionString Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbConnection/ConnectionString/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbConnection.ConnectionString Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbConnection/ConnectionString/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbConnection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbConnection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.DeleteCommand Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbDataAdapter/DeleteCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.DeleteCommand Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbDataAdapter/DeleteCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.InsertCommand Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbDataAdapter/InsertCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.InsertCommand Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbDataAdapter/InsertCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.SelectCommand Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbDataAdapter/SelectCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.SelectCommand Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbDataAdapter/SelectCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.UpdateCommand Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbDataAdapter/UpdateCommand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.UpdateCommand Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbDataAdapter/UpdateCommand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/Project.vbproj b/snippets/visualbasic/System.Data/IDbTransaction/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Data/IDbTransaction/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb b/snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb
rename to snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ColumnMappings Example/VB/source.vb b/snippets/visualbasic/System.Data/ITableMapping/ColumnMappings/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ColumnMappings Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ITableMapping/ColumnMappings/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/VB/source.vb b/snippets/visualbasic/System.Data/ITableMapping/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/VB/source.vb
rename to snippets/visualbasic/System.Data/ITableMapping/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/system_data_isolationlevel/vb/source.vb b/snippets/visualbasic/System.Data/IsolationLevel/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/system_data_isolationlevel/vb/source.vb
rename to snippets/visualbasic/System.Data/IsolationLevel/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData MappingType Example/VB/source.vb b/snippets/visualbasic/System.Data/MappingType/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData MappingType Example/VB/source.vb
rename to snippets/visualbasic/System.Data/MappingType/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData PropertyCollection Example/VB/source.vb b/snippets/visualbasic/System.Data/PropertyCollection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData PropertyCollection Example/VB/source.vb
rename to snippets/visualbasic/System.Data/PropertyCollection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData RowNotInTableException Example/VB/source.vb b/snippets/visualbasic/System.Data/RowNotInTableException/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData RowNotInTableException Example/VB/source.vb
rename to snippets/visualbasic/System.Data/RowNotInTableException/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData StateChangeEventArgs Example/VB/source.vb b/snippets/visualbasic/System.Data/StateChangeEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData StateChangeEventArgs Example/VB/source.vb
rename to snippets/visualbasic/System.Data/StateChangeEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.UniqueConstraint Example/VB/source.vb b/snippets/visualbasic/System.Data/UniqueConstraint/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.UniqueConstraint Example/VB/source.vb
rename to snippets/visualbasic/System.Data/UniqueConstraint/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.UniqueConstraint2 Example/VB/source.vb b/snippets/visualbasic/System.Data/UniqueConstraint/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.UniqueConstraint2 Example/VB/source.vb
rename to snippets/visualbasic/System.Data/UniqueConstraint/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Columns Example/VB/source.vb b/snippets/visualbasic/System.Data/UniqueConstraint/Columns/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Columns Example/VB/source.vb
rename to snippets/visualbasic/System.Data/UniqueConstraint/Columns/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Equals Example/VB/source.vb b/snippets/visualbasic/System.Data/UniqueConstraint/Equals/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Equals Example/VB/source.vb
rename to snippets/visualbasic/System.Data/UniqueConstraint/Equals/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.IsPrimaryKey Example/VB/source.vb b/snippets/visualbasic/System.Data/UniqueConstraint/IsPrimaryKey/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.IsPrimaryKey Example/VB/source.vb
rename to snippets/visualbasic/System.Data/UniqueConstraint/IsPrimaryKey/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint Example/VB/source.vb b/snippets/visualbasic/System.Data/UniqueConstraint/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint Example/VB/source.vb
rename to snippets/visualbasic/System.Data/UniqueConstraint/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Table Example/VB/source.vb b/snippets/visualbasic/System.Data/UniqueConstraint/Table/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Table Example/VB/source.vb
rename to snippets/visualbasic/System.Data/UniqueConstraint/Table/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData VersionNotFoundException Example/VB/source.vb b/snippets/visualbasic/System.Data/VersionNotFoundException/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData VersionNotFoundException Example/VB/source.vb
rename to snippets/visualbasic/System.Data/VersionNotFoundException/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/VB/TesterFormVB.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/VB/TesterFormVB.vbproj
deleted file mode 100644
index f3c949d7cb5..00000000000
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/VB/TesterFormVB.vbproj	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C019A781-A425-4338-9553-5D623134FD21}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <StartupObject>TesterFormVB.My.MyApplication</StartupObject>
-    <RootNamespace>TesterFormVB</RootNamespace>
-    <AssemblyName>TesterFormVB</AssemblyName>
-    <MyType>WindowsForms</MyType>
-    <OptionStrict>On</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>TesterFormVB.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>TesterFormVB.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Drawing" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Form1.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.vb">
-      <DependentUpon>Form1.vb</DependentUpon>
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/TesterFormVB.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/TesterFormVB.vbproj
deleted file mode 100644
index f3c949d7cb5..00000000000
--- a/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/TesterFormVB.vbproj	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C019A781-A425-4338-9553-5D623134FD21}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <StartupObject>TesterFormVB.My.MyApplication</StartupObject>
-    <RootNamespace>TesterFormVB</RootNamespace>
-    <AssemblyName>TesterFormVB</AssemblyName>
-    <MyType>WindowsForms</MyType>
-    <OptionStrict>On</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>TesterFormVB.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>TesterFormVB.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Drawing" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Form1.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.vb">
-      <DependentUpon>Form1.vb</DependentUpon>
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/xml/Microsoft.SqlServer.Server/Format.xml b/xml/Microsoft.SqlServer.Server/Format.xml
index 1f01f762056..c3207f4a98e 100644
--- a/xml/Microsoft.SqlServer.Server/Format.xml
+++ b/xml/Microsoft.SqlServer.Server/Format.xml
@@ -72,7 +72,7 @@ This enumeration is used by <xref:Microsoft.SqlServer.Server.SqlUserDefinedTypeA
 The following example shows the `UserDefinedType` attribute of the Point UDT.  The UDT is byte-ordered, is named "Point", has a validation method named "ValidatePoint", and uses the native serialization format.  
   
 :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedTypeAttribute Example/CS/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedTypeAttribute Example/VB/source.vb" id="Snippet1":::  
+:::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/Format/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/IBinarySerialize.xml b/xml/Microsoft.SqlServer.Server/IBinarySerialize.xml
index 386fa05cff3..f455d4b613e 100644
--- a/xml/Microsoft.SqlServer.Server/IBinarySerialize.xml
+++ b/xml/Microsoft.SqlServer.Server/IBinarySerialize.xml
@@ -83,7 +83,7 @@
  The following example shows the implementation of the <xref:Microsoft.SqlServer.Server.IBinarySerialize.Read%2A> method of a UDT, which uses a <xref:System.IO.BinaryReader> to de-serialize a previously persisted UDT. This example assumes that the UDT has two data properties: `StringValue` and `DoubleValue`.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks IBinarySerialize Samples/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks IBinarySerialize Samples/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/IBinarySerialize/Read/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -127,7 +127,7 @@
  The following example shows the implementation of the <xref:Microsoft.SqlServer.Server.IBinarySerialize.Write%2A> method of a UDT, which uses a <xref:System.IO.BinaryWriter> to serialize the UDT in the user-defined binary format. The purpose of the null character padding is to ensure that the string value is completely separated from the double value, so that one UDT is compared to another in Transact-SQL code, string bytes are compared to string bytes and double bytes are compared to double bytes.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks IBinarySerialize Samples/CS/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks IBinarySerialize Samples/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/IBinarySerialize/Read/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlContext.xml b/xml/Microsoft.SqlServer.Server/SqlContext.xml
index e06b09b6da8..1d68bcea6ab 100644
--- a/xml/Microsoft.SqlServer.Server/SqlContext.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlContext.xml
@@ -28,7 +28,7 @@
  The following example creates a new <xref:Microsoft.SqlServer.Server.SqlDataRecord> and its <xref:Microsoft.SqlServer.Server.SqlMetaData>. The example then marks the beginning of a result set using the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsStart%2A> method, sends records with example data back to the client using the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsRow%2A> method, and marks the end of the result set with the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsEnd%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsRow/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsRow/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/SendResultsEnd/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -171,7 +171,7 @@
  The following example shows how to get the Windows identity of the calling client and impersonate the client.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlContext.WindowsIdentity Sample/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlContext.WindowsIdentity Sample/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlContext/WindowsIdentity/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlDataRecord.xml b/xml/Microsoft.SqlServer.Server/SqlDataRecord.xml
index 0948686b5c2..c2926c23f2b 100644
--- a/xml/Microsoft.SqlServer.Server/SqlDataRecord.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlDataRecord.xml
@@ -61,7 +61,7 @@
  The following example shows how to create several <xref:Microsoft.SqlServer.Server.SqlMetaData> objects, which describe the column metadata of a record, and creating a <xref:Microsoft.SqlServer.Server.SqlDataRecord>.  The column values of the <xref:Microsoft.SqlServer.Server.SqlDataRecord> are set and the <xref:Microsoft.SqlServer.Server.SqlDataRecord> is sent to the calling program by using the <xref:Microsoft.SqlServer.Server.SqlContext> class.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlDataRecord Samples/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataRecord Samples/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlDataRecord/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -110,7 +110,7 @@
  The following example shows how to create a new <xref:Microsoft.SqlServer.Server.SqlDataRecord> object from two  <xref:Microsoft.SqlServer.Server.SqlMetaData> objects, which indicate the column name and data type.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlDataRecord Samples/CS/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataRecord Samples/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlDataRecord/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlFunctionAttribute.xml b/xml/Microsoft.SqlServer.Server/SqlFunctionAttribute.xml
index 1b0adc5668e..aa83dea2624 100644
--- a/xml/Microsoft.SqlServer.Server/SqlFunctionAttribute.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlFunctionAttribute.xml
@@ -49,7 +49,7 @@
  The following example shows an aggregate function that returns a list of files in the specified directory path.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlFunctionAttribute Sample/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlFunctionAttribute Sample/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlFunctionAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlMetaData.xml b/xml/Microsoft.SqlServer.Server/SqlMetaData.xml
index bc69017d609..16ae58cb48f 100644
--- a/xml/Microsoft.SqlServer.Server/SqlMetaData.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlMetaData.xml
@@ -45,7 +45,7 @@
  The following example shows the creation of several <xref:Microsoft.SqlServer.Server.SqlMetaData> objects, which describe the column metadata of a record, and the creation of a <xref:Microsoft.SqlServer.Server.SqlDataRecord>. The column values of the <xref:Microsoft.SqlServer.Server.SqlDataRecord> are set and the <xref:Microsoft.SqlServer.Server.SqlDataRecord> is sent to the calling program using the <xref:Microsoft.SqlServer.Server.SqlContext> class.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlMetaData/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -123,7 +123,7 @@
  The following example creates a new <xref:Microsoft.SqlServer.Server.SqlMetaData> object by specifying the column name and a column data type of <xref:System.Data.SqlDbType>.`Int`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/CS/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlMetaData/Overview/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@
  The following example creates a new <xref:Microsoft.SqlServer.Server.SqlMetaData> object by specifying the column name, a column data type of <xref:System.Data.SqlDbType>`.NVarChar`, and a maximum length of 12 characters.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/CS/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMetaData Samples/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlMetaData/Overview/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlMethodAttribute.xml b/xml/Microsoft.SqlServer.Server/SqlMethodAttribute.xml
index baa97c8f64e..93888e7065a 100644
--- a/xml/Microsoft.SqlServer.Server/SqlMethodAttribute.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlMethodAttribute.xml
@@ -56,7 +56,7 @@
  The following example shows a UDT method that is attributed to indicate that the method will not be invoked on null instances of the type, that the method will not change the state of the type, and that the method will not be called when `null` parameters are supplied to the method invocation.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlMethodAttribute Sample/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlMethodAttribute Sample/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlMethodAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlPipe.xml b/xml/Microsoft.SqlServer.Server/SqlPipe.xml
index 8cd209f4a2b..36afc2e9467 100644
--- a/xml/Microsoft.SqlServer.Server/SqlPipe.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlPipe.xml
@@ -28,7 +28,7 @@
  The following example uses <xref:System.Data.SqlClient.SqlConnection> and <xref:System.Data.SqlClient.SqlCommand> to select rows from a data source in a stored procedure. The example then uses a <xref:Microsoft.SqlServer.Server.SqlPipe> to execute the command and send the results back to the client.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlPipe/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -74,7 +74,7 @@
  The following example uses <xref:System.Data.SqlClient.SqlConnection> and <xref:System.Data.SqlClient.SqlCommand> to select rows from a data source in a stored procedure. The example then uses a <xref:Microsoft.SqlServer.Server.SqlPipe> to execute the command and send the results back to the client.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlPipe.ExecuteAndSend/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.ExecuteAndSend/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/ExecuteAndSend/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -215,7 +215,7 @@
  The following example uses the <xref:Microsoft.SqlServer.Server.SqlPipe.Send%2A> method to send a message string directly to the client.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlPipe.Send/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.Send/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/Send/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
  The following example creates a new <xref:Microsoft.SqlServer.Server.SqlDataRecord> and its <xref:Microsoft.SqlServer.Server.SqlMetaData>. The example then marks the beginning of a result set using the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsStart%2A> method, sends records with example data back to the client using the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsRow%2A> method, and marks the end of the result set with the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsEnd%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsEnd/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsEnd/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlContext/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -299,7 +299,7 @@
  The following example creates a new <xref:Microsoft.SqlServer.Server.SqlDataRecord> and its <xref:Microsoft.SqlServer.Server.SqlMetaData>. The example then marks the beginning of a result set using the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsStart%2A> method, sends records with example data back to the client using the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsRow%2A> method, and marks the end of the result set with the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsEnd%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsRow/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsRow/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/SendResultsEnd/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -349,7 +349,7 @@
  The following example creates a new <xref:Microsoft.SqlServer.Server.SqlDataRecord> and its <xref:Microsoft.SqlServer.Server.SqlMetaData>. The example then marks the beginning of a result set using the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsStart%2A> method, sends records with example data back to the client using the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsRow%2A> method, and marks the end of the result set with the <xref:Microsoft.SqlServer.Server.SqlPipe.SendResultsEnd%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsStart/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlPipe.SendResultsStart/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlPipe/SendResultsStart/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlProcedureAttribute.xml b/xml/Microsoft.SqlServer.Server/SqlProcedureAttribute.xml
index b7e488ac706..83055b3223a 100644
--- a/xml/Microsoft.SqlServer.Server/SqlProcedureAttribute.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlProcedureAttribute.xml
@@ -41,7 +41,7 @@
  The following example shows a method declaration in an assembly that has been attributed as a stored procedure. The <xref:Microsoft.SqlServer.Server.SqlProcedureAttribute> property has been set to the name of the stored procedure.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlProcedureAttribute/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlProcedureAttribute/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlProcedureAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlTriggerAttribute.xml b/xml/Microsoft.SqlServer.Server/SqlTriggerAttribute.xml
index fe6bf7933e1..ca4ec060dab 100644
--- a/xml/Microsoft.SqlServer.Server/SqlTriggerAttribute.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlTriggerAttribute.xml
@@ -39,7 +39,7 @@
  The following example shows the <xref:Microsoft.SqlServer.Server.SqlTriggerAttribute> specifying the name of the trigger, the target table, and the event that will fire the trigger. See <xref:Microsoft.SqlServer.Server.SqlTriggerContext> for the full trigger example.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlTriggerAttribute Sample/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTriggerAttribute Sample/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlTriggerAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlTriggerContext.xml b/xml/Microsoft.SqlServer.Server/SqlTriggerContext.xml
index cab49e1633c..a02858dec43 100644
--- a/xml/Microsoft.SqlServer.Server/SqlTriggerContext.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlTriggerContext.xml
@@ -31,7 +31,7 @@
  The following example shows a <xref:Microsoft.SqlServer.Server.SqlTriggerContext> object being used to determine if an <xref:Microsoft.SqlServer.Server.TriggerAction.Insert> action occurred. If a row was inserted into the `user`'s table, the user name and real name are retrieved from the inserted row and then added to the **UserNameAudit** table.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlTriggerContext Sample/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTriggerContext Sample/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlTriggerContext/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -149,7 +149,7 @@
  The following example shows an auditing trigger. If an <xref:Microsoft.SqlServer.Server.TriggerAction.Insert> or <xref:Microsoft.SqlServer.Server.TriggerAction.Delete> action occurred, the affected rows are retrieved from the INSERTED and DELETED tables.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlTriggerContext Sample/CS/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTriggerContext Sample/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlTriggerContext/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.xml b/xml/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.xml
index f2bd63dc352..b36268498c8 100644
--- a/xml/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.xml
@@ -51,7 +51,7 @@
  The following example shows the <xref:Microsoft.SqlServer.Server.SqlUserDefinedAggregateAttribute> attribute for a user-defined aggregate.  The aggregate uses custom serialization, has a maximum size of 8000 bytes when serialized, and is invariant to nulls, duplicates, and order.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedAggregateAttribute Sample/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedAggregateAttribute Sample/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.xml b/xml/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.xml
index b435c19ad0c..13e0c3a9885 100644
--- a/xml/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.xml
+++ b/xml/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.xml
@@ -49,7 +49,7 @@
  The following example shows the `UserDefinedType` attribute of the Point UDT.  The UDT is byte-ordered, is named "Point", has a validation method named "ValidatePoint", and uses the native serialization format.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedTypeAttribute Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlUserDefinedTypeAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/Microsoft.SqlServer.Server/Format/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.Common/DataAdapter.xml b/xml/System.Data.Common/DataAdapter.xml
index 41725f42548..8578a8d2ac0 100644
--- a/xml/System.Data.Common/DataAdapter.xml
+++ b/xml/System.Data.Common/DataAdapter.xml
@@ -315,7 +315,7 @@
  This example demonstrates extracting changed rows from a `DataTable` and using a <xref:System.Data.SqlClient.SqlDataAdapter> to update the data source and retrieve a new identity column value. By setting the `AcceptChangesDuringUpdate` property of the <xref:System.Data.SqlClient.SqlDataAdapter> to `false` to preserve the original auto increment value, the new data can then be merged into the original <xref:System.Data.DataTable>, even if the new identity value does not match the original auto increment value in the `DataTable`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlClient.AcceptChangesDuringUpdate/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlClient.AcceptChangesDuringUpdate/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataAdapter/AcceptChangesDuringUpdate/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1326,7 +1326,7 @@ If a unique clustered index is defined on a column or columns in a SQL Server ta
  The following example creates a derived class, <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataAdapter.MissingMappingAction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.MissingMappingAction Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataAdapter/MissingMappingAction/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1393,7 +1393,7 @@ If a unique clustered index is defined on a column or columns in a SQL Server ta
  The following example creates a derived class, <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataAdapter.MissingMappingAction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.MissingMappingAction Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataAdapter/MissingMappingAction/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1801,7 +1801,7 @@ If a unique clustered index is defined on a column or columns in a SQL Server ta
  The following example uses a derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to add <xref:System.Data.Common.DataTableMapping> objects to its <xref:System.Data.Common.DataAdapter.TableMappings%2A> collection and display a list of those mapped source tables. This example assumes that an <xref:System.Data.OleDb.OleDbDataAdapter> has already been created.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataAdapter.TableMappings Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.TableMappings Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataAdapter/TableMappings/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1920,7 +1920,7 @@ If a unique clustered index is defined on a column or columns in a SQL Server ta
  The following example uses the derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to <xref:System.Data.Common.DataAdapter.Update%2A> the data source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataAdapter.IDataAdapter.Update Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.IDataAdapter.Update Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataAdapter/Update/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Common/DataColumnMapping.xml b/xml/System.Data.Common/DataColumnMapping.xml
index edaebac669e..66b9fc7b0f9 100644
--- a/xml/System.Data.Common/DataColumnMapping.xml
+++ b/xml/System.Data.Common/DataColumnMapping.xml
@@ -76,7 +76,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMapping> object and adds it to a <xref:System.Data.Common.DataColumnMappingCollection>. It then tells the user that the mapping was added to the collection and shows the Parent for the mapping.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -135,7 +135,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMapping> object, sets its properties, and clones it.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataColumnMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataColumnMapping Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMapping/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -190,7 +190,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMapping> object, sets its properties, and clones it.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataColumnMapping1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataColumnMapping1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMapping/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -255,7 +255,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMapping> object, and sets its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMapping/DataSetColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -476,7 +476,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMapping> object, and sets its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMapping/DataSetColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -584,7 +584,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMapping> object and adds it to a <xref:System.Data.Common.DataColumnMappingCollection> collection. It then tells the user that the mapping was added to the collection and shows the parent of mapping.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Common/DataColumnMappingCollection.xml b/xml/System.Data.Common/DataColumnMappingCollection.xml
index 3f4ca48eb37..48b5efdc9a9 100644
--- a/xml/System.Data.Common/DataColumnMappingCollection.xml
+++ b/xml/System.Data.Common/DataColumnMappingCollection.xml
@@ -73,7 +73,7 @@
  The following example uses a <xref:System.Data.Common.DataTableMapping> to <xref:System.Data.Common.DataColumnMappingCollection.Add%2A> several <xref:System.Data.Common.DataColumnMapping> objects to its <xref:System.Data.Common.DataTableMapping.ColumnMappings%2A> collection, and then displays a list of those mapped source columns. This example assumes that a <xref:System.Data.Common.DataTableMapping> has already been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMappingCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -121,7 +121,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMappingCollection> collection, adds <xref:System.Data.Common.DataColumnMapping> objects to the collection, and displays a list of the mapped source columns.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.DataColumnMappingCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.DataColumnMappingCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> object within the collection. If the mapping exists in the collection, it is removed. If the mapping does not exist within the collection, it is added to the collection and its index is displayed. The example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection and a <xref:System.Data.Common.DataColumnMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Add Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Add Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -258,7 +258,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMappingCollection> collection, adds <xref:System.Data.Common.DataColumnMapping> objects to the collection, and displays a list of the mapped source columns.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.DataColumnMappingCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.DataColumnMappingCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -413,7 +413,7 @@
  The following example exports the collection to an array of <xref:System.Data.Common.DataColumnMapping> objects. It then clears the collection, and returns `true` if the parameters are no longer persisting. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Clear Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Clear Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Clear/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> within the collection. If the mapping exists in the collection, it is removed. If the mapping does not exist within the collection, it is added to the collection and its index is displayed. The example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection and a <xref:System.Data.Common.DataColumnMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Contains1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Contains1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Contains/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -547,7 +547,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> object with the given source column name within a <xref:System.Data.Common.DataColumnMappingCollection> collection. If the <xref:System.Data.Common.DataColumnMapping> exists, the example displays the name and the index of the mapping. If the mapping does not exist, the example displays an error. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMappingCollection/IndexOf/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -723,7 +723,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMappingCollection> collection, adds <xref:System.Data.Common.DataColumnMapping> objects to the collection, and displays a list of the mapped source columns.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Count Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Count Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Count/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -779,7 +779,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> within the collection. If the object exists, it is returned. The example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection and a <xref:System.Data.Common.DataColumnMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetByDataSetColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetByDataSetColumn Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/GetByDataSetColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -866,7 +866,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> with the given source column name within the collection. If the object exists, it is returned. The example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection and a <xref:System.Data.Common.DataColumnMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetColumnMappingBySchemaAction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetColumnMappingBySchemaAction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/GetColumnMappingBySchemaAction/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1068,7 +1068,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> within the collection. If the mapping exists in the collection, it is removed. If the mapping does not exist within the collection, it is added to the collection and its index is displayed. The example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection and a <xref:System.Data.Common.DataColumnMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Contains1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Contains1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Contains/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1128,7 +1128,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> object with the given source column name within a <xref:System.Data.Common.DataColumnMappingCollection> collection. If the <xref:System.Data.Common.DataColumnMapping> exists, the example displays the name and the index of the mapping. If the mapping does not exist, the example displays an error. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMappingCollection/IndexOf/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1185,7 +1185,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> within the collection. If the object exists, it is returned. The example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection and a <xref:System.Data.Common.DataColumnMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetByDataSetColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.GetByDataSetColumn Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/GetByDataSetColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1374,7 +1374,7 @@
  The following example creates a <xref:System.Data.Common.DataColumnMappingCollection> collection, adds <xref:System.Data.Common.DataColumnMapping> objects to the collection, and displays a list of the mapped source columns.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Count Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Count Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Count/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1444,7 +1444,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> object with the given source column name within a <xref:System.Data.Common.DataColumnMappingCollection> collection. If the <xref:System.Data.Common.DataColumnMapping> exists, the example displays the name and the index of the mapping. If the mapping does not exist, the example displays an error. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMappingCollection/IndexOf/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1558,7 +1558,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> within the collection. If the mapping exists in the collection, it is removed. If the mapping does not exist within the collection, it is added to the collection and its index is displayed. The example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection and a <xref:System.Data.Common.DataColumnMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Add Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.Add Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1629,7 +1629,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> object with the given index within a <xref:System.Data.Common.DataColumnMappingCollection> collection. If the <xref:System.Data.Common.DataColumnMapping> exists, the mapping is removed. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataColumnMappingCollection/RemoveAt/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1688,7 +1688,7 @@
  The following example searches for a <xref:System.Data.Common.DataColumnMapping> object with the given source column name within a <xref:System.Data.Common.DataColumnMappingCollection> collection. If the <xref:System.Data.Common.DataColumnMapping> exists, the mapping is removed. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMappingCollection/RemoveAt/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Common/DataTableMapping.xml b/xml/System.Data.Common/DataTableMapping.xml
index 67b6e0604cf..9a485b62f42 100644
--- a/xml/System.Data.Common/DataTableMapping.xml
+++ b/xml/System.Data.Common/DataTableMapping.xml
@@ -74,7 +74,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMapping> object and adds it to a <xref:System.Data.Common.DataTableMappingCollection>. It then informs the user that the mapping was added to the collection and displays the parent mapping.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ITableMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -133,7 +133,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMapping> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMapping/DataSetTable/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -188,7 +188,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMapping> object and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMapping> object, sets some of its properties, and copies its <xref:System.Data.Common.DataTableMapping.ColumnMappings%2A> to an array. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataTableMapping2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -314,7 +314,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMapping> object, sets some of its properties, and copies its <xref:System.Data.Common.DataTableMapping.ColumnMappings%2A> to an array. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ColumnMappings Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ColumnMappings Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ITableMapping/ColumnMappings/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -379,7 +379,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMapping> object and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataSetTable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataSetTable Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -609,7 +609,7 @@
  The following example gets the <xref:System.Data.DataTable> for a given <xref:System.Data.DataSet>. If there is no current table for the <xref:System.Data.DataSet>, `null` is returned. This example assumes that a <xref:System.Data.DataSet> and a <xref:System.Data.Common.DataTableMappingCollection> collection have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.GetDataTableBySchemaAction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.GetDataTableBySchemaAction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMapping/GetDataTableBySchemaAction/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -674,7 +674,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMapping> object and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataSetTable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.DataSetTable Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMapping/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -835,7 +835,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMapping> object and adds it to a <xref:System.Data.Common.DataTableMappingCollection> collection. It then informs the user that the mapping has been added to the collection and displays the parent mapping.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ToString Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ToString Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMapping/ToString/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Common/DataTableMappingCollection.xml b/xml/System.Data.Common/DataTableMappingCollection.xml
index 588fb966af5..7b939a757ff 100644
--- a/xml/System.Data.Common/DataTableMappingCollection.xml
+++ b/xml/System.Data.Common/DataTableMappingCollection.xml
@@ -89,7 +89,7 @@
  The following example uses an <xref:System.Data.OleDb.OleDbDataAdapter> to <xref:System.Data.Common.DataTableMappingCollection.Add%2A><xref:System.Data.Common.DataTableMapping> objects to its <xref:System.Data.Common.DataAdapter.TableMappings%2A> collection, and then displays a list of those mapped source tables. This example assumes that an <xref:System.Data.OleDb.OleDbDataAdapter> has already been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMappingCollection>, adds <xref:System.Data.Common.DataTableMapping> objects to the collection, and displays a list of the mapped source tables.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.DataTableMappingCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.DataTableMappingCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -205,7 +205,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> within the collection. If the mapping exists in the collection, it is removed. If the mapping does not exist within the collection, it is added to the collection and its index is displayed. The example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection and a <xref:System.Data.Common.DataTableMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Add Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Add Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -270,7 +270,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMappingCollection>, adds <xref:System.Data.Common.DataTableMapping> objects to the collection, and displays a list of the mapped source tables.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.DataTableMappingCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.DataTableMappingCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -421,7 +421,7 @@
  The following example uses the <xref:System.Data.Common.DataTableMappingCollection.CopyTo%2A> method to export the collection to an array of <xref:System.Data.Common.DataTableMapping> objects. It then clears the collection, and returns `true` if the parameters are no longer persisting. This example assumes that a <xref:System.Data.Common.DataTableMappingCollection> has already been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Clear Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Clear Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Clear/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -491,7 +491,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> within the collection. If the mapping exists in the collection, it is removed. If the mapping does not exist within the collection, it is added to the collection and its index is displayed. The example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection and a <xref:System.Data.Common.DataTableMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Contains1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Contains1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -551,7 +551,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> object with the given source table name within a <xref:System.Data.Common.DataTableMappingCollection> collection. If the <xref:System.Data.Common.DataTableMapping> exists, the example displays the name and the index of the mapping. If the mapping does not exist, the example displays an error. This example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -723,7 +723,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMappingCollection>, adds <xref:System.Data.Common.DataTableMapping> objects to the collection, and displays a list of the mapped source tables.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Count Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Count Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Count/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -778,7 +778,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> within the collection. If the object exists, it is returned. The example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection and a <xref:System.Data.Common.DataTableMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetByDataSetTable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetByDataSetTable Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/GetByDataSetTable/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -917,7 +917,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> with the given source table name within the collection. If the object exists, it is returned. The example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection and a <xref:System.Data.Common.DataTableMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetTableMappingBySchemaAction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetTableMappingBySchemaAction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/GetTableMappingBySchemaAction/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -987,7 +987,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> within the collection. If the mapping exists in the collection, it is removed. If the mapping does not exist within the collection, it is added to the collection and its index is displayed. The example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection and a <xref:System.Data.Common.DataTableMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Contains1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Contains1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1046,7 +1046,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> object with the given source table name within a <xref:System.Data.Common.DataTableMappingCollection> collection. If the <xref:System.Data.Common.DataTableMapping> exists, the example displays the name and the index of the mapping. If the mapping does not exist, the example displays an error. This example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1102,7 +1102,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> within the collection. If the object exists, it is returned. The example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection and a <xref:System.Data.Common.DataTableMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetByDataSetTable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.GetByDataSetTable Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/GetByDataSetTable/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1286,7 +1286,7 @@
  The following example creates a <xref:System.Data.Common.DataTableMappingCollection> collection, adds <xref:System.Data.Common.DataTableMapping> objects to the collection, and displays a list of the mapped source tables.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Count Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Count Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Count/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1355,7 +1355,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> object with the given source table name within a <xref:System.Data.Common.DataTableMappingCollection> collection. If the <xref:System.Data.Common.DataTableMapping> exists, the example displays the name and the index of the mapping. If the mapping does not exist, the example displays an error. This example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Contains/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1466,7 +1466,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> within the collection. If the mapping exists in the collection, it is removed. If the mapping does not exist within the collection, it is added to the collection and its index is displayed. The example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection and a <xref:System.Data.Common.DataTableMapping> object have been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Add Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.Add Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1535,7 +1535,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> object with the given source table name within a <xref:System.Data.Common.DataTableMappingCollection> collection. If the <xref:System.Data.Common.DataTableMapping> exists, the mapping is removed. This example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.RemoveAt Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.RemoveAt Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/RemoveAt/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1593,7 +1593,7 @@
  The following example searches for a <xref:System.Data.Common.DataTableMapping> object with the given source table name within a <xref:System.Data.Common.DataTableMappingCollection> collection. If the <xref:System.Data.Common.DataTableMapping> exists, the mapping is removed. This example assumes that a <xref:System.Data.Common.DataTableMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.RemoveAt1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMappingCollection.RemoveAt1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DataTableMappingCollection/RemoveAt/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Common/DbConnectionStringBuilder.xml b/xml/System.Data.Common/DbConnectionStringBuilder.xml
index be612474810..a8576d28564 100644
--- a/xml/System.Data.Common/DbConnectionStringBuilder.xml
+++ b/xml/System.Data.Common/DbConnectionStringBuilder.xml
@@ -116,7 +116,7 @@ initial catalog="AdventureWorks;NewValue=Bad"
  The following console application builds two connection strings, one for a Microsoft Jet database, and one for a SQL Server database. In each case, the code uses a generic <xref:System.Data.Common.DbConnectionStringBuilder> class to create the connection string, and then passes the <xref:System.Data.Common.DbConnectionStringBuilder.ConnectionString%2A> property of the <xref:System.Data.Common.DbConnectionStringBuilder> instance to the constructor of the strongly typed connection class. This is not required; the code could also have created individual strongly typed connection string builder instances. The example also parses an existing connection string, and demonstrates various ways of manipulating the connection string's contents.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -369,7 +369,7 @@ initial catalog="AdventureWorks;NewValue=Bad"
  If some process has created a connection string, but now an application must perform a simple modification to that connection string, it may be more efficient to just add the key/value pair using a <xref:System.Text.StringBuilder> object. Instead of creating a new <xref:System.Data.Common.DbConnectionStringBuilder>, developers can call the `AppendKeyValuePair` method, passing in a <xref:System.Text.StringBuilder> that contains the supplied connection string. The following procedure shows a simple example of this technique.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.AppendKeyValuePair/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.AppendKeyValuePair/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/AppendKeyValuePair/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -446,7 +446,7 @@ initial catalog="AdventureWorks;NewValue=Bad"
  If some process has created a connection string, but now an application must perform a simple modification to that connection string, it might be more efficient to just add the key/value pair using a <xref:System.Text.StringBuilder> object. Instead of creating a new <xref:System.Data.Common.DbConnectionStringBuilder>, developers can call the `AppendKeyValuePair` method, passing in a <xref:System.Text.StringBuilder> that contains the supplied connection string. The following procedure shows a simple example of this technique, using ODBC rules for quoting values.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.AppendKeyValuePair/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.AppendKeyValuePair/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/AppendKeyValuePair/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -701,7 +701,7 @@ initial catalog="AdventureWorks;NewValue=Bad"
 >  This example includes a password to demonstrate how <xref:System.Data.Common.DbConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ConnectionString/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/ConnectionString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -759,7 +759,7 @@ initial catalog="AdventureWorks;NewValue=Bad"
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ContainsKey/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.ContainsKey/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/ContainsKey/source.vb" id="Snippet1":::
 
  This code produces the following output:
 
@@ -834,7 +834,7 @@ The collection contains the key "Data Source".
  The following example demonstrates the <xref:System.Data.Common.DbConnectionStringBuilder.Count%2A> property both before and after you modify the contents of the <xref:System.Data.Common.DbConnectionStringBuilder.ConnectionString%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Count/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Count/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Count/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -898,7 +898,7 @@ The collection contains the key "Data Source".
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.EquivalentTo/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.EquivalentTo/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/EquivalentTo/source.vb" id="Snippet1":::
 
  This sample displays the following output:
 
@@ -1152,7 +1152,7 @@ builder2.EquivalentTo(builder3) = False
  The following console application creates a new <xref:System.Data.Common.DbConnectionStringBuilder> and adds key/value pairs to its connection string, using the <xref:System.Data.Common.DbConnectionStringBuilder.Item%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Item/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Item/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1231,7 +1231,7 @@ builder2.EquivalentTo(builder3) = False
  The following console application example creates a new <xref:System.Data.Common.DbConnectionStringBuilder>, and adds some keys. The code loops through the <xref:System.Collections.ICollection> returned by the <xref:System.Data.Common.DbConnectionStringBuilder.Keys%2A> property displaying the key/value pairs, and then adds a new key. Because the <xref:System.Data.Common.DbConnectionStringBuilder.Keys%2A> property returns a dynamic <xref:System.Collections.ICollection>, the second loop displays all the key/value pairs, including the newest item.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Keys/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Keys/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Keys/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1293,7 +1293,7 @@ builder2.EquivalentTo(builder3) = False
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Remove/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.Remove/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/Remove/source.vb" id="Snippet1":::
 
  This sample displays the following output:
 
@@ -2813,7 +2813,7 @@ This member is an explicit interface member implementation. It can be used only
  The following example calls the <xref:System.Data.Common.DbConnectionStringBuilder.TryGetValue%2A> method, demonstrating several possible outcomes.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.TryGetValue/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder.TryGetValue/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbConnectionStringBuilder/TryGetValue/source.vb" id="Snippet1":::
 
  The sample displays the following results:
 
diff --git a/xml/System.Data.Common/DbDataAdapter.xml b/xml/System.Data.Common/DbDataAdapter.xml
index 9f7f5031377..396b2a51d14 100644
--- a/xml/System.Data.Common/DbDataAdapter.xml
+++ b/xml/System.Data.Common/DbDataAdapter.xml
@@ -590,7 +590,7 @@
  The following example creates the derived class <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.DeleteCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.DeleteCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/DeleteCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -977,7 +977,7 @@ adapter.Fill(dataset, "AAA"); // Fills table "aaa" because only one similarly na
  The following example uses the derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to fill a <xref:System.Data.DataSet> with rows from the categories table. This example assumes that you have created an <xref:System.Data.OleDb.OleDbDataAdapter> and a <xref:System.Data.DataSet>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Fill2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Fill2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/Fill/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1295,7 +1295,7 @@ adapter.Fill(dataset, "AAA"); // Fills table "aaa" because only one similarly na
  The following example uses the derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to fill a <xref:System.Data.DataSet> with 15 rows, beginning at row 10, from the **Categories** table. This example assumes that you have created an <xref:System.Data.OleDb.OleDbDataAdapter> and a <xref:System.Data.DataSet>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Fill3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Fill3 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/Fill/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1767,7 +1767,7 @@ adapter.Fill(dataset, "AAA"); // Fills table "aaa" because only one similarly na
  The following example uses the derived class, <xref:System.Data.SqlClient.SqlDataAdapter>, to fill a <xref:System.Data.DataSet> with the schema, and returns a <xref:System.Data.DataSet>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1879,7 +1879,7 @@ adapter.Fill(dataset, "AAA"); // Fills table "aaa" because only one similarly na
  The following example uses the derived class, <xref:System.Data.SqlClient.SqlDataAdapter>, to fill a <xref:System.Data.DataSet> with the schema, and returns a <xref:System.Data.DataTable>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema3/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema3/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2004,7 +2004,7 @@ adapter.FillSchema(dataset, "AAA"); // Fills the schema of table "aaa" because o
  The following example uses the derived class, <xref:System.Data.SqlClient.SqlDataAdapter>, to fill a <xref:System.Data.DataSet> with the schema, and returns a <xref:System.Data.DataSet>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.FillSchema2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/FillSchema/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2533,7 +2533,7 @@ adapter.FillSchema(dataset, "AAA"); // Fills the schema of table "aaa" because o
  The following example creates the derived class <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.InsertCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.InsertCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/InsertCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2751,7 +2751,7 @@ adapter.FillSchema(dataset, "AAA"); // Fills the schema of table "aaa" because o
  The following example creates the derived class <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.SelectCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.SelectCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/SelectCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -3228,7 +3228,7 @@ adapter.FillSchema(dataset, "AAA"); // Fills the schema of table "aaa" because o
  The following example uses the derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to update the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -3353,7 +3353,7 @@ adapter.FillSchema(dataset, "AAA"); // Fills the schema of table "aaa" because o
  The following example uses the derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to update the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -3465,7 +3465,7 @@ adapter.FillSchema(dataset, "AAA"); // Fills the schema of table "aaa" because o
  The following example uses the derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to update the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -3724,7 +3724,7 @@ DataSet dataset = new DataSet();
  The following example uses the derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to update the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update3/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.Update3/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/Update/source3.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -3880,7 +3880,7 @@ DataSet dataset = new DataSet();
  The following example creates the derived class <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.UpdateCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.UpdateCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Common/DbDataAdapter/UpdateCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcCommand.xml b/xml/System.Data.Odbc/OdbcCommand.xml
index aa26cb7abda..2e898020838 100644
--- a/xml/System.Data.Odbc/OdbcCommand.xml
+++ b/xml/System.Data.Odbc/OdbcCommand.xml
@@ -96,7 +96,7 @@
  The following example uses <xref:System.Data.Odbc.OdbcCommand.ExecuteNonQuery%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommand/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcCommand/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.Odbc/OdbcCommandBuilder.xml b/xml/System.Data.Odbc/OdbcCommandBuilder.xml
index 3447dd6bb11..6c263395a61 100644
--- a/xml/System.Data.Odbc/OdbcCommandBuilder.xml
+++ b/xml/System.Data.Odbc/OdbcCommandBuilder.xml
@@ -61,7 +61,7 @@
  The following example uses <xref:System.Data.Odbc.OdbcCommand>, together with <xref:System.Data.Odbc.OdbcDataAdapter> and <xref:System.Data.Odbc.OdbcConnection>, to select rows from a data source. The example is passed an initialized <xref:System.Data.DataSet>, a connection string, a query string that is an SQL SELECT statement, and a string that is the name of the data source table. The example then creates an <xref:System.Data.Odbc.OdbcCommandBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcCommandBuilder/CS/mysample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcCommandBuilder/VB/mysample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcCommandBuilder/Overview/mysample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.Odbc/OdbcConnection.xml b/xml/System.Data.Odbc/OdbcConnection.xml
index cd37867e2ab..65a69b1d47d 100644
--- a/xml/System.Data.Odbc/OdbcConnection.xml
+++ b/xml/System.Data.Odbc/OdbcConnection.xml
@@ -77,7 +77,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcCommand> and an <xref:System.Data.Odbc.OdbcConnection>. The <xref:System.Data.Odbc.OdbcConnection> is opened and set as the <xref:System.Data.Odbc.OdbcCommand.Connection%2A> property. The example then calls <xref:System.Data.Odbc.OdbcCommand.ExecuteNonQuery%2A>, and closes the connection. To accomplish this, the <xref:System.Data.Odbc.OdbcCommand.ExecuteNonQuery%2A> is passed a connection string and a query string that is an SQL INSERT statement.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -134,7 +134,7 @@
  The following example creates and opens an <xref:System.Data.Odbc.OdbcConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.OdbcConnection/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.OdbcConnection/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -186,7 +186,7 @@
  The following example creates and opens an <xref:System.Data.Odbc.OdbcConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.OdbcConnection1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.OdbcConnection1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -276,7 +276,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection> and an <xref:System.Data.Odbc.OdbcTransaction>. It also demonstrates how to use the <xref:System.Data.Odbc.OdbcConnection.BeginTransaction%2A>, <xref:System.Data.Odbc.OdbcTransaction.Commit%2A>, and <xref:System.Data.Odbc.OdbcTransaction.Rollback%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/BeginTransaction/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -327,7 +327,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection> and an <xref:System.Data.Odbc.OdbcTransaction>. It also demonstrates how to use the <xref:System.Data.Odbc.OdbcConnection.BeginTransaction%2A>, <xref:System.Data.Odbc.OdbcTransaction.Commit%2A>, and <xref:System.Data.Odbc.OdbcTransaction.Rollback%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/BeginTransaction/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -382,7 +382,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection> and changes the current database.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Database/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Database/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/ChangeDatabase/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -444,7 +444,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection>, opens it, displays some of its properties, and then closes the connection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Close/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -725,7 +725,7 @@ driver-defined-attribute-keyword ::= identifier
  The following example creates an <xref:System.Data.Odbc.OdbcConnection> and changes the current database.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Database/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.Database/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/ChangeDatabase/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -781,7 +781,7 @@ driver-defined-attribute-keyword ::= identifier
  The following example creates an <xref:System.Data.Odbc.OdbcConnection> and displays the backend data source name.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.DataSource/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.DataSource/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/DataSource/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcConnectionStringBuilder.xml b/xml/System.Data.Odbc/OdbcConnectionStringBuilder.xml
index 4b9fd52842f..ab18cf5e0cc 100644
--- a/xml/System.Data.Odbc/OdbcConnectionStringBuilder.xml
+++ b/xml/System.Data.Odbc/OdbcConnectionStringBuilder.xml
@@ -87,7 +87,7 @@ Driver={SQL Server};Server="MyServer;NewValue=Bad"
  The following console application builds connection strings for several ODBC databases. First, the example creates a connection string for a Microsoft Access database. It then creates a connection string for an IBM DB2 database. The example also parses an existing connection string, and demonstrates various ways of manipulating the contents of the connection string.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -199,7 +199,7 @@ You can pass a connection string in the constructor, or you can set the <xref:Sy
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Clear/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Clear/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -242,7 +242,7 @@ You can pass a connection string in the constructor, or you can set the <xref:Sy
  The following example creates an <xref:System.Data.Odbc.OdbcConnectionStringBuilder> instance, sets some of its properties, and then tries to determine whether various keys exist within the object by calling the <xref:System.Data.Odbc.OdbcConnectionStringBuilder.ContainsKey%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.ContainsKey/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.ContainsKey/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/ContainsKey/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -381,7 +381,7 @@ You can pass a connection string in the constructor, or you can set the <xref:Sy
  The following code, in a console application, creates a new <xref:System.Data.Odbc.OdbcConnectionStringBuilder> and adds key/value pairs to its connection string, using the <xref:System.Data.Odbc.OdbcConnectionStringBuilder.Item%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Item/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Item/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -468,7 +468,7 @@ The order of the values in the <xref:System.Collections.ICollection> is the same
  The following example creates an <xref:System.Data.Odbc.OdbcConnectionStringBuilder> instance and demonstrates the behavior of the <xref:System.Data.Odbc.OdbcConnectionStringBuilder.Remove%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Remove/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.Remove/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -532,7 +532,7 @@ The order of the values in the <xref:System.Collections.ICollection> is the same
  The following example demonstrates the behavior of the <xref:System.Data.Odbc.OdbcConnectionStringBuilder.TryGetValue%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.TryGetValue/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OdbcConnectionStringBuilder.TryGetValue/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnectionStringBuilder/TryGetValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcDataAdapter.xml b/xml/System.Data.Odbc/OdbcDataAdapter.xml
index f5c0f5aabdc..675152e2b41 100644
--- a/xml/System.Data.Odbc/OdbcDataAdapter.xml
+++ b/xml/System.Data.Odbc/OdbcDataAdapter.xml
@@ -105,7 +105,7 @@
  The following example uses <xref:System.Data.Odbc.OdbcCommand>, <xref:System.Data.Odbc.OdbcDataAdapter>, and <xref:System.Data.Odbc.OdbcConnection> to select records and populate a `DataSet` with the selected rows.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -161,7 +161,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter1/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source3.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -260,7 +260,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter3/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/InsertCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -306,7 +306,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.OdbcDataAdapter2/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/DeleteCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -460,7 +460,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcDataAdapter> and sets the <xref:System.Data.Odbc.OdbcDataAdapter.SelectCommand%2A> and <xref:System.Data.Odbc.OdbcDataAdapter.DeleteCommand%2A> properties. It assumes that you have already created an <xref:System.Data.Odbc.OdbcConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.DeleteCommand/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -554,7 +554,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcDataAdapter> and sets the <xref:System.Data.Odbc.OdbcDataAdapter.SelectCommand%2A> and <xref:System.Data.Odbc.OdbcDataAdapter.InsertCommand%2A> properties. It assumes that you have already created an <xref:System.Data.Odbc.OdbcConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.InsertCommand/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -776,7 +776,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcDataAdapter> and sets the <xref:System.Data.Odbc.OdbcDataAdapter.SelectCommand%2A> and <xref:System.Data.Odbc.OdbcDataAdapter.InsertCommand%2A> properties. It assumes that you have already created an <xref:System.Data.Odbc.OdbcConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.SelectCommand/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/SelectCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1030,7 +1030,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcDataAdapter> and sets the <xref:System.Data.Odbc.OdbcDataAdapter.SelectCommand%2A> and <xref:System.Data.Odbc.OdbcDataAdapter.UpdateCommand%2A> properties. It assumes that you have already created an <xref:System.Data.Odbc.OdbcConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataAdapter.UpdateCommand/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataAdapter/UpdateCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcDataReader.xml b/xml/System.Data.Odbc/OdbcDataReader.xml
index 1de53056ca9..b4117a6cf9e 100644
--- a/xml/System.Data.Odbc/OdbcDataReader.xml
+++ b/xml/System.Data.Odbc/OdbcDataReader.xml
@@ -69,7 +69,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection>, an <xref:System.Data.Odbc.OdbcCommand>, and an <xref:System.Data.Odbc.OdbcDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.Odbc.OdbcDataReader>, and then the <xref:System.Data.Odbc.OdbcConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataReader/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -123,7 +123,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection>, an <xref:System.Data.Odbc.OdbcCommand>, and an <xref:System.Data.Odbc.OdbcDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.Odbc.OdbcDataReader>, and then the <xref:System.Data.Odbc.OdbcConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Read/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1223,7 +1223,7 @@
  The following example demonstrates how to use the <xref:System.Data.Odbc.OdbcDataReader.GetOrdinal%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader.GetOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader.GetOrdinal/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataRecord/GetOrdinal/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1492,7 +1492,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/odbcdatareader_getvalues/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/odbcdatareader_getvalues/vb/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcDataReader/GetValues/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1813,7 +1813,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection>, an <xref:System.Data.Odbc.OdbcCommand>, and an <xref:System.Data.Odbc.OdbcDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.Odbc.OdbcDataReader>, and then the <xref:System.Data.Odbc.OdbcConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Read/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcError.xml b/xml/System.Data.Odbc/OdbcError.xml
index f166af100c8..fb8e86f2890 100644
--- a/xml/System.Data.Odbc/OdbcError.xml
+++ b/xml/System.Data.Odbc/OdbcError.xml
@@ -53,7 +53,7 @@
  The following example displays the properties of the <xref:System.Data.Odbc.OdbcError> class.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -92,7 +92,7 @@
  The following example displays the properties of the <xref:System.Data.Odbc.OdbcError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -131,7 +131,7 @@
  The following example displays the properties of the <xref:System.Data.Odbc.OdbcError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -170,7 +170,7 @@
  The following example displays the properties of an <xref:System.Data.Odbc.OdbcError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
  The following example displays the properties of the <xref:System.Data.Odbc.OdbcError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -249,7 +249,7 @@
  The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.ToString/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.ToString/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcError/ToString/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcErrorCollection.xml b/xml/System.Data.Odbc/OdbcErrorCollection.xml
index e475e0ab588..cace95c5849 100644
--- a/xml/System.Data.Odbc/OdbcErrorCollection.xml
+++ b/xml/System.Data.Odbc/OdbcErrorCollection.xml
@@ -58,7 +58,7 @@
  The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcErrorCollection/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -114,7 +114,7 @@
  The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection> collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcErrorCollection/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -159,7 +159,7 @@
  The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection> collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcErrorCollection/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -200,7 +200,7 @@
  The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcErrorCollection/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcException.xml b/xml/System.Data.Odbc/OdbcException.xml
index 4e9ed09f544..92ae304f6a9 100644
--- a/xml/System.Data.Odbc/OdbcException.xml
+++ b/xml/System.Data.Odbc/OdbcException.xml
@@ -61,7 +61,7 @@
  The following example generates an <xref:System.Data.Odbc.OdbcException> because of a missing data source, and then displays the exception.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcException/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcException/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcException/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -105,7 +105,7 @@
  The following example displays each <xref:System.Data.Odbc.OdbcError> within an <xref:System.Data.Odbc.OdbcErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcErrorCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -222,7 +222,7 @@
  The following example displays the <xref:System.Data.Odbc.OdbcError.Message%2A>, <xref:System.Data.Odbc.OdbcError.Source%2A>, and <xref:System.Data.Odbc.OdbcError.NativeError%2A> properties of the first <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcException.Source/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcException.Source/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcException/Source/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcParameter.xml b/xml/System.Data.Odbc/OdbcParameter.xml
index 16568d14b3d..36055345fd8 100644
--- a/xml/System.Data.Odbc/OdbcParameter.xml
+++ b/xml/System.Data.Odbc/OdbcParameter.xml
@@ -91,7 +91,7 @@ OleDbDataReader reader = command.ExecuteReader();
  The following example creates multiple instances of <xref:System.Data.Odbc.OdbcParameter> through the <xref:System.Data.Odbc.OdbcParameterCollection> within the <xref:System.Data.Odbc.OdbcDataAdapter>. These parameters are used to select data from the data source and place the data in the <xref:System.Data.DataSet>. This example assumes that a <xref:System.Data.DataSet> and an <xref:System.Data.Odbc.OdbcDataAdapter> have already been created by using the appropriate schema, commands, and connection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -140,7 +140,7 @@ OleDbDataReader reader = command.ExecuteReader();
  The following example creates an <xref:System.Data.Odbc.OdbcParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -181,7 +181,7 @@ OleDbDataReader reader = command.ExecuteReader();
  The following example creates an <xref:System.Data.Odbc.OdbcParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -269,7 +269,7 @@ Parameter = new OdbcParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.Odbc.OdbcParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter2/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -315,7 +315,7 @@ Parameter = new OdbcParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.Odbc.OdbcParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter3/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter3/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -380,7 +380,7 @@ Parameter = new OdbcParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.Odbc.OdbcParameter> and displays the <xref:System.Data.Odbc.OdbcParameter.ParameterName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter4/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.OdbcParameter4/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameter/.ctor/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -527,7 +527,7 @@ public void CreateOdbcParameter()
  The following example calls a **Stored Procedure** with three parameters using the ODBC managed provider.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.DbType/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.DbType/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameter/DbType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcParameterCollection.xml b/xml/System.Data.Odbc/OdbcParameterCollection.xml
index bb60befadad..8d5a261f6ae 100644
--- a/xml/System.Data.Odbc/OdbcParameterCollection.xml
+++ b/xml/System.Data.Odbc/OdbcParameterCollection.xml
@@ -92,7 +92,7 @@ INSERT INTO MyTable VALUES (@p1, @p2, @p3);
  The example creates parameters and calls the **MoneyProcedure** stored procedure.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.DbType/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameter.DbType/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameter/DbType/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -240,7 +240,7 @@ INSERT INTO MyTable VALUES (@p1, @p2, @p3);
  The following example adds an <xref:System.Data.Odbc.OdbcParameter> to the <xref:System.Data.Odbc.OdbcCommand.Parameters%2A> collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add2/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -361,7 +361,7 @@ INSERT INTO MyTable VALUES (@p1, @p2, @p3);
  The following example adds an <xref:System.Data.Odbc.OdbcParameter> to the `OdbcCommand.Parameters` collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add3/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add3/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -418,7 +418,7 @@ INSERT INTO MyTable VALUES (@p1, @p2, @p3);
  The following example adds an <xref:System.Data.Odbc.OdbcParameter> to the <xref:System.Data.Odbc.OdbcCommand.Parameters%2A> collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add4/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Add4/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Add/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -707,7 +707,7 @@ INSERT INTO MyTable VALUES (@p1, @p2, @p3);
  The following example searches for an <xref:System.Data.Odbc.OdbcParameter> with a given <xref:System.Data.Odbc.OdbcParameter.ParameterName%2A> within an <xref:System.Data.Odbc.OdbcParameterCollection>. If the parameter exists, the example displays the name and index of the parameter. If the parameter does not exist, the example displays an error. This example assumes that an <xref:System.Data.Odbc.OdbcParameterCollection> has already been created.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.this1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.this1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1298,7 +1298,7 @@ INSERT INTO MyTable VALUES (@p1, @p2, @p3);
  The following example creates an <xref:System.Data.Odbc.OdbcParameterCollection>, adds instances of <xref:System.Data.Odbc.OdbcParameter> to the collection, displays the names of its <xref:System.Data.Odbc.OdbcParameter> objects, and then clears the collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Count/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.Count/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1352,7 +1352,7 @@ INSERT INTO MyTable VALUES (@p1, @p2, @p3);
  The following example searches for an <xref:System.Data.Odbc.OdbcParameter> with a given <xref:System.Data.Odbc.OdbcParameter.ParameterName%2A> within an <xref:System.Data.Odbc.OdbcParameterCollection>. If the parameter exists, the example displays the name and index of the parameter. If the parameter does not exist, the example displays an error. This example assumes that an <xref:System.Data.Odbc.OdbcParameterCollection> has already been created.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.this1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcParameterCollection.this1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcParameterCollection/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.Odbc/OdbcTransaction.xml b/xml/System.Data.Odbc/OdbcTransaction.xml
index 9ef4136be0e..f8f01661c7a 100644
--- a/xml/System.Data.Odbc/OdbcTransaction.xml
+++ b/xml/System.Data.Odbc/OdbcTransaction.xml
@@ -63,7 +63,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection> and an <xref:System.Data.Odbc.OdbcTransaction>. It also demonstrates how to use the <xref:System.Data.Odbc.OdbcConnection.BeginTransaction%2A>, <xref:System.Data.Odbc.OdbcTransaction.Commit%2A>, and <xref:System.Data.Odbc.OdbcTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -111,7 +111,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection> and an <xref:System.Data.Odbc.OdbcTransaction>. It also demonstrates how to use the <xref:System.Data.Odbc.OdbcConnection.BeginTransaction%2A>, <xref:System.Data.Odbc.OdbcTransaction.Commit%2A>, and <xref:System.Data.Odbc.OdbcTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/BeginTransaction/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -301,7 +301,7 @@
  The following example creates an <xref:System.Data.Odbc.OdbcConnection> and an <xref:System.Data.Odbc.OdbcTransaction>. It also demonstrates how to use the <xref:System.Data.Odbc.OdbcConnection.BeginTransaction%2A>, <xref:System.Data.Odbc.OdbcTransaction.Commit%2A>, and <xref:System.Data.Odbc.OdbcTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcConnection.BeginTransaction1/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.Odbc/OdbcConnection/BeginTransaction/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbCommand.xml b/xml/System.Data.OleDb/OleDbCommand.xml
index 65dcf9ec3ac..9b9c6903395 100644
--- a/xml/System.Data.OleDb/OleDbCommand.xml
+++ b/xml/System.Data.OleDb/OleDbCommand.xml
@@ -101,7 +101,7 @@
  The following example uses the <xref:System.Data.OleDb.OleDbCommand>, along <xref:System.Data.OleDb.OleDbDataAdapter> and <xref:System.Data.OleDb.OleDbConnection>, to select rows from an Access database. The filled <xref:System.Data.DataSet> is then returned. The example is passed an initialized <xref:System.Data.DataSet>, a connection string, a query string that is an SQL SELECT statement, and a string that is the name of the source database table.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -159,7 +159,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -210,7 +210,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -265,7 +265,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -322,7 +322,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand3/CS/mysample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.OleDbCommand3/VB/mysample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/.ctor/mysample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -373,7 +373,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand>, executes it, and then cancels the execution. To accomplish this, the method is passed a string that is an SQL SELECT statement and a string to use to connect to the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Cancel Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Cancel Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/Cancel/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -492,7 +492,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.CommandText Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.CommandText Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/CommandText/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -675,7 +675,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Connection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Connection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/Connection/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -991,7 +991,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and then executes it using <xref:System.Data.OleDb.OleDbCommand.ExecuteNonQuery%2A>. The example is passed a string that is an SQL statement such as UPDATE, INSERT, or DELETE, and a string to use to connect to the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/ExecuteNonQuery/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1057,7 +1057,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand>, and then executes it by passing a string that is an SQL SELECT statement, and a string to use to connect to the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteReader1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteReader1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteReader/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1112,7 +1112,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand>, and then executes it by passing a string that is a Transact-SQL SELECT statement, and a string to use to connect to the data source. <xref:System.Data.CommandBehavior> is set to <xref:System.Data.CommandBehavior.CloseConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteReader2/CS/mysample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteReader2/VB/mysample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteReader/mysample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1173,7 +1173,7 @@ Int32 count = (Int32) ExecuteScalar();
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and then executes it using <xref:System.Data.OleDb.OleDbCommand.ExecuteScalar%2A>. The example is passed a string that is an SQL statement that returns an aggregate result, and a string to use to connect to the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteScalar/CS/mysample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteScalar/VB/mysample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/ExecuteScalar/mysample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1240,7 +1240,7 @@ Int32 count = (Int32) ExecuteScalar();
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and displays its parameters. To accomplish this, the method is passed an <xref:System.Data.OleDb.OleDbConnection>, a query string that is an SQL SELECT statement, and an array of <xref:System.Data.OleDb.OleDbParameter> objects.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Parameters Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Parameters Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommand/Parameters/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1297,7 +1297,7 @@ Int32 count = (Int32) ExecuteScalar();
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and opens the connection. The example then prepares a stored procedure on the data source by passing a string that is an SQL SELECT statement and a string to use to connect to the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/Prepare/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbCommandBuilder.xml b/xml/System.Data.OleDb/OleDbCommandBuilder.xml
index 30128d0f5c4..7cf5694e30e 100644
--- a/xml/System.Data.OleDb/OleDbCommandBuilder.xml
+++ b/xml/System.Data.OleDb/OleDbCommandBuilder.xml
@@ -63,7 +63,7 @@
  The following example uses the <xref:System.Data.OleDb.OleDbCommand>, along <xref:System.Data.OleDb.OleDbDataAdapter> and <xref:System.Data.OleDb.OleDbConnection>, to select rows from a data source. The example is passed an initialized <xref:System.Data.DataSet>, a connection string, a query string that is an SQL SELECT statement, and a string that is the name of the data source table. The example then creates an <xref:System.Data.OleDb.OleDbCommandBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommandBuilder/CS/mysample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommandBuilder/VB/mysample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbCommandBuilder/Overview/mysample.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.OleDb/OleDbConnection.xml b/xml/System.Data.OleDb/OleDbConnection.xml
index a4760aac031..0ac79cfe9fa 100644
--- a/xml/System.Data.OleDb/OleDbConnection.xml
+++ b/xml/System.Data.OleDb/OleDbConnection.xml
@@ -91,7 +91,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbCommand> and an <xref:System.Data.OleDb.OleDbConnection>. The <xref:System.Data.OleDb.OleDbConnection> is opened and set as the <xref:System.Data.OleDb.OleDbCommand.Connection%2A> for the <xref:System.Data.OleDb.OleDbCommand>. The example then calls <xref:System.Data.OleDb.OleDbCommand.ExecuteNonQuery%2A> and closes the connection. To accomplish this, <xref:System.Data.OleDb.OleDbCommand.ExecuteNonQuery%2A> is passed a connection string and a query string that is an SQL INSERT statement.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -149,7 +149,7 @@
  The following example creates and opens an <xref:System.Data.OleDb.OleDbConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.OleDbConnection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.OleDbConnection Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -202,7 +202,7 @@
  The following example creates and opens an <xref:System.Data.OleDb.OleDbConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.OleDbConnection1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.OleDbConnection1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -287,7 +287,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and an <xref:System.Data.OleDb.OleDbTransaction>. It also demonstrates how to use the <xref:System.Data.OleDb.OleDbConnection.BeginTransaction%2A>, <xref:System.Data.OleDb.OleDbTransaction.Commit%2A>, and <xref:System.Data.OleDb.OleDbTransaction.Rollback%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/BeginTransaction/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -339,7 +339,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and an <xref:System.Data.OleDb.OleDbTransaction>. It also demonstrates how to use the <xref:System.Data.OleDb.OleDbConnection.BeginTransaction%2A>, a <xref:System.Data.OleDb.OleDbTransaction.Commit%2A>, and <xref:System.Data.OleDb.OleDbTransaction.Rollback%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/BeginTransaction/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -394,7 +394,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and displays some of its read-only properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Database Example/CS/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Database Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ChangeDatabase/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -572,7 +572,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and sets some of its properties in the connection string.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.DataSource Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.DataSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ConnectionString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -632,7 +632,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and sets some of its properties in the connection string.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ConnectionTimeout Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ConnectionTimeout Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ConnectionTimeout/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -752,7 +752,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and displays some of its read-only properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Database Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Database Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ChangeDatabase/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -815,7 +815,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and displays some of its read-only properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.DataSource Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.DataSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ConnectionString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -981,7 +981,7 @@
  The following sample returns a list of tables in a database.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.GetOleDbSchemaTable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.GetOleDbSchemaTable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/GetOleDbSchemaTable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1264,7 +1264,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and displays some of its read-only properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Provider Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.Provider Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/Provider/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1319,7 +1319,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection>, opens it, displays some of its properties, closes the connection, and releases the object pool to conserve resources.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ReleaseObjectPool Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ReleaseObjectPool Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ReleaseObjectPool/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1422,7 +1422,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and displays some of its read-only properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ServerVersion Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.ServerVersion Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/ServerVersion/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbConnectionStringBuilder.xml b/xml/System.Data.OleDb/OleDbConnectionStringBuilder.xml
index 99372c81f96..ced9c6eab39 100644
--- a/xml/System.Data.OleDb/OleDbConnectionStringBuilder.xml
+++ b/xml/System.Data.OleDb/OleDbConnectionStringBuilder.xml
@@ -96,7 +96,7 @@ Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\Sample.mdb;User ID="Admin;NewVal
 >  This example includes a password to demonstrate how <xref:System.Data.OleDb.OleDbConnectionStringBuilder> works with connection strings. In your applications, we recommend that you use Windows Authentication. If you must use a password, do not include a hard-coded password in your application.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -303,7 +303,7 @@ Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\Sample.mdb;User ID="Admin;NewVal
  The following example console application creates a new <xref:System.Data.OleDb.OleDbConnectionStringBuilder> instance, and then sets the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.DataSource%2A> and <xref:System.Data.OleDb.OleDbConnectionStringBuilder.Provider%2A> properties. Finally, the example creates a new <xref:System.Data.OleDb.OleDbConnection> instance, and uses that object to connect to the indicated data store.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.DataSource/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.DataSource/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/DataSource/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@ Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\Sample.mdb;User ID="Admin;NewVal
  The following example uses the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.Item%2A> property (the indexer, in C#) to retrieve and set values within the collection of key/value pairs. Note that setting the provider, in this case, also provides default values for all the key/value pairs associated with the selected provider.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Item/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -527,7 +527,7 @@ The order of the values in the <xref:System.Collections.ICollection> is unspecif
  The following example works with the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.OleDbServices%2A> property in two ways. First, it assigns a value directly to the property, demonstrating the effect this action has on the resulting connection string. Then, the example clears the <xref:System.Data.OleDb.OleDbConnectionStringBuilder> and assigns a complete connection string that contains a value for the OLE DB Services key. This step demonstrates that setting the value from the connection string modifies the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.OleDbServices%2A> property, as well.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.OleDbServices/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.OleDbServices/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/OleDbServices/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -580,7 +580,7 @@ The order of the values in the <xref:System.Collections.ICollection> is unspecif
  The following example works with the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.PersistSecurityInfo%2A> property in two ways. First, it assigns a value directly to the property, demonstrating the effect this action has on the resulting connection string. Then, the example clears the <xref:System.Data.OleDb.OleDbConnectionStringBuilder> and assigns a complete connection string that contains a value for the "Persist Security Info" key. This step demonstrates that setting the value from the connection string modifies the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.PersistSecurityInfo%2A> property, as well.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.PersistSecurityInfo/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.PersistSecurityInfo/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/PersistSecurityInfo/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -681,7 +681,7 @@ The order of the values in the <xref:System.Collections.ICollection> is unspecif
  The following example creates a <xref:System.Data.OleDb.OleDbConnectionStringBuilder> and demonstrates the behavior of the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.Remove%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Remove/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.Remove/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -745,7 +745,7 @@ The order of the values in the <xref:System.Collections.ICollection> is unspecif
  The following example demonstrates the behavior of the <xref:System.Data.OleDb.OleDbConnectionStringBuilder.TryGetValue%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.TryGetValue/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks OleDbConnectionStringBuilder.TryGetValue/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnectionStringBuilder/TryGetValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbDataAdapter.xml b/xml/System.Data.OleDb/OleDbDataAdapter.xml
index f58e94007aa..486a9c66e76 100644
--- a/xml/System.Data.OleDb/OleDbDataAdapter.xml
+++ b/xml/System.Data.OleDb/OleDbDataAdapter.xml
@@ -102,7 +102,7 @@
  The following example uses the <xref:System.Data.OleDb.OleDbCommand>, <xref:System.Data.OleDb.OleDbDataAdapter> and <xref:System.Data.OleDb.OleDbConnection>, to select records from an Access data source, and populate a <xref:System.Data.DataSet> with the selected rows. The filled <xref:System.Data.DataSet> is then returned. To accomplish this, the method is passed an initialized <xref:System.Data.DataSet>, a connection string, and a query string that is an SQL SELECT statement.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -158,7 +158,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -211,7 +211,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -266,7 +266,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter3 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source3.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -321,7 +321,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbDataAdapter> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.OleDbDataAdapter2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/.ctor/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -479,7 +479,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbDataAdapter> and sets the <xref:System.Data.OleDb.OleDbDataAdapter.SelectCommand%2A> and <xref:System.Data.OleDb.OleDbDataAdapter.DeleteCommand%2A> properties. It assumes that you have already created an <xref:System.Data.OleDb.OleDbConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.DeleteCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.DeleteCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/DeleteCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -787,7 +787,7 @@ OleDbDataAdapter custDA = new OleDbDataAdapter();
  The following example creates an <xref:System.Data.OleDb.OleDbDataAdapter> and sets the <xref:System.Data.OleDb.OleDbDataAdapter.SelectCommand%2A> and <xref:System.Data.OleDb.OleDbDataAdapter.InsertCommand%2A> properties. It assumes that you have already created an <xref:System.Data.OleDb.OleDbConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.InsertCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.InsertCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/InsertCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -910,7 +910,7 @@ OleDbDataAdapter custDA = new OleDbDataAdapter();
  The following example shows the <xref:System.Data.OleDb.OleDbDataAdapter.RowUpdating> and <xref:System.Data.OleDb.OleDbDataAdapter.RowUpdated> events being used.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.RowUpdated Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.RowUpdated Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/RowUpdated/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -973,7 +973,7 @@ OleDbDataAdapter custDA = new OleDbDataAdapter();
  The following example shows the <xref:System.Data.OleDb.OleDbDataAdapter.RowUpdating> and <xref:System.Data.OleDb.OleDbDataAdapter.RowUpdated> events being used.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.RowUpdated Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.RowUpdated Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataAdapter/RowUpdated/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1041,7 +1041,7 @@ OleDbDataAdapter custDA = new OleDbDataAdapter();
  The following example creates an <xref:System.Data.OleDb.OleDbDataAdapter> and sets the <xref:System.Data.OleDb.OleDbDataAdapter.SelectCommand%2A> and <xref:System.Data.OleDb.OleDbDataAdapter.InsertCommand%2A> properties. It assumes that you have already created an <xref:System.Data.OleDb.OleDbConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.SelectCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.SelectCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/SelectCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1299,7 +1299,7 @@ OleDbDataAdapter custDA = new OleDbDataAdapter();
  The following example creates an <xref:System.Data.OleDb.OleDbDataAdapter> and sets the <xref:System.Data.OleDb.OleDbDataAdapter.SelectCommand%2A> and <xref:System.Data.OleDb.OleDbDataAdapter.UpdateCommand%2A> properties. It assumes that you have already created an <xref:System.Data.OleDb.OleDbConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.UpdateCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.UpdateCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/UpdateCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbDataReader.xml b/xml/System.Data.OleDb/OleDbDataReader.xml
index 19aa6def502..8d71d57a5a9 100644
--- a/xml/System.Data.OleDb/OleDbDataReader.xml
+++ b/xml/System.Data.OleDb/OleDbDataReader.xml
@@ -74,7 +74,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection>, an <xref:System.Data.OleDb.OleDbCommand>, and an <xref:System.Data.OleDb.OleDbDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.OleDb.OleDbDataReader> and then the <xref:System.Data.OleDb.OleDbConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataReader/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -128,7 +128,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection>, an <xref:System.Data.OleDb.OleDbCommand>, and an <xref:System.Data.OleDb.OleDbDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.OleDb.OleDbDataReader>, and then the <xref:System.Data.OleDb.OleDbConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Read/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1201,7 +1201,7 @@
  The following example demonstrates how to use the <xref:System.Data.OleDb.OleDbDataReader.GetOrdinal%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataReader.GetOrdinal/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataReader/GetOrdinal/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1468,7 +1468,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/oledbdatareader_getvalues/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/oledbdatareader_getvalues/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbDataReader/GetValues/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1789,7 +1789,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection>, an <xref:System.Data.OleDb.OleDbCommand>, and an <xref:System.Data.OleDb.OleDbDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.OleDb.OleDbDataReader> and then the <xref:System.Data.OleDb.OleDbConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Read/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbError.xml b/xml/System.Data.OleDb/OleDbError.xml
index ef43241406b..d0aebe596e1 100644
--- a/xml/System.Data.OleDb/OleDbError.xml
+++ b/xml/System.Data.OleDb/OleDbError.xml
@@ -56,7 +56,7 @@
  The following example displays the properties of the <xref:System.Data.OleDb.OleDbError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -95,7 +95,7 @@
  The following example displays the properties of the <xref:System.Data.OleDb.OleDbError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -134,7 +134,7 @@
  The following example displays the properties of the <xref:System.Data.OleDb.OleDbError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -173,7 +173,7 @@
  The following example displays the properties of an <xref:System.Data.OleDb.OleDbError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -212,7 +212,7 @@
  The following example displays the properties of the <xref:System.Data.OleDb.OleDbError>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -259,7 +259,7 @@
  The following example displays each <xref:System.Data.OleDb.OleDbError> within the <xref:System.Data.OleDb.OleDbErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError.ToString Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.ToString Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbError/ToString/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbErrorCollection.xml b/xml/System.Data.OleDb/OleDbErrorCollection.xml
index 1a10edaf497..7fb57f22f4b 100644
--- a/xml/System.Data.OleDb/OleDbErrorCollection.xml
+++ b/xml/System.Data.OleDb/OleDbErrorCollection.xml
@@ -65,7 +65,7 @@
  The following example displays each <xref:System.Data.OleDb.OleDbError> within the <xref:System.Data.OleDb.OleDbErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbErrorCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -121,7 +121,7 @@
  The following example displays each <xref:System.Data.OleDb.OleDbError> within the <xref:System.Data.OleDb.OleDbErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbErrorCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
  The following example displays each <xref:System.Data.OleDb.OleDbError> within the <xref:System.Data.OleDb.OleDbErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbErrorCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -207,7 +207,7 @@
  The following example displays each <xref:System.Data.OleDb.OleDbError> within the <xref:System.Data.OleDb.OleDbErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbErrorCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbException.xml b/xml/System.Data.OleDb/OleDbException.xml
index 998ea2c6662..70fa4e90746 100644
--- a/xml/System.Data.OleDb/OleDbException.xml
+++ b/xml/System.Data.OleDb/OleDbException.xml
@@ -64,7 +64,7 @@
  The following example generates an <xref:System.Data.OleDb.OleDbException> because of a missing data source, and then displays the exception.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbException Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbException Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbException/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -150,7 +150,7 @@
  The following example displays each <xref:System.Data.OleDb.OleDbError> within the <xref:System.Data.OleDb.OleDbErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbError.Message Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbErrorCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbParameter.xml b/xml/System.Data.OleDb/OleDbParameter.xml
index f5264c57ff6..927c3ace369 100644
--- a/xml/System.Data.OleDb/OleDbParameter.xml
+++ b/xml/System.Data.OleDb/OleDbParameter.xml
@@ -94,7 +94,7 @@ OleDbDataReader reader = command.ExecuteReader();
  The following example creates multiple instances of <xref:System.Data.OleDb.OleDbParameter> through the <xref:System.Data.OleDb.OleDbParameterCollection> collection within the <xref:System.Data.OleDb.OleDbDataAdapter>. These parameters are used to select data from the data source and place the data in the <xref:System.Data.DataSet>. This example assumes that a <xref:System.Data.DataSet> and an <xref:System.Data.OleDb.OleDbDataAdapter> have already been created by using the appropriate schema, commands, and connection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -138,7 +138,7 @@ OleDbDataReader reader = command.ExecuteReader();
  The following example creates an <xref:System.Data.OleDb.OleDbParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@ OleDbDataReader reader = command.ExecuteReader();
  The following example creates an <xref:System.Data.OleDb.OleDbParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -237,7 +237,7 @@ Parameter = new OleDbParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OleDb.OleDbParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter5 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter5 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -285,7 +285,7 @@ Parameter = new OleDbParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OleDb.OleDbParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/DbType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -336,7 +336,7 @@ Parameter = new OleDbParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OleDb.OleDbParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -406,7 +406,7 @@ Parameter = new OleDbParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OleDb.OleDbParameter> and displays the <xref:System.Data.OleDb.OleDbParameter.ParameterName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter4 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -475,7 +475,7 @@ Parameter = new OleDbParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OleDb.OleDbParameter> and displays the <xref:System.Data.OleDb.OleDbParameter.ParameterName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter4 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.OleDbParameter4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -545,7 +545,7 @@ Parameter = new OleDbParameter("@pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OleDb.OleDbParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.DbType Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter.DbType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbParameterCollection.xml b/xml/System.Data.OleDb/OleDbParameterCollection.xml
index f033bfe9fbc..a1c2e41483b 100644
--- a/xml/System.Data.OleDb/OleDbParameterCollection.xml
+++ b/xml/System.Data.OleDb/OleDbParameterCollection.xml
@@ -84,7 +84,7 @@
  The following example creates multiple instances of <xref:System.Data.OleDb.OleDbParameter> through the <xref:System.Data.OleDb.OleDbParameterCollection> collection within the <xref:System.Data.OleDb.OleDbDataAdapter>. These parameters are used to select data within the data source and place the data in the <xref:System.Data.DataSet>. This example assumes that a <xref:System.Data.DataSet> and an <xref:System.Data.OleDb.OleDbDataAdapter> have already been created with the appropriate schema, commands, and connection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -139,7 +139,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbParameterCollection> and adds an <xref:System.Data.OleDb.OleDbParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add5 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add5 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -242,7 +242,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbParameterCollection> and adds an <xref:System.Data.OleDb.OleDbParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add6 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add6 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -363,7 +363,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbParameterCollection>, adds an instance of <xref:System.Data.OleDb.OleDbParameter> to the collection, and returns a reference to the new <xref:System.Data.OleDb.OleDbParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -420,7 +420,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbParameterCollection>, adds an instance of <xref:System.Data.OleDb.OleDbParameter> to the collection, and returns a reference to the new <xref:System.Data.OleDb.OleDbParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add4 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Add4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Add/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1290,7 +1290,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbParameterCollection>, adds instances of <xref:System.Data.OleDb.OleDbParameter> to the collection, displays the names of its <xref:System.Data.OleDb.OleDbParameter> objects, and then clears the collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Count Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.Count Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1344,7 +1344,7 @@
  The following example searches for an <xref:System.Data.OleDb.OleDbParameter> with a given <xref:System.Data.OleDb.OleDbParameter.ParameterName%2A> within an <xref:System.Data.OleDb.OleDbParameterCollection>. If the parameter exists, the example displays the name and index of the parameter. If the parameter does not exist, the example displays an error. This example assumes that an <xref:System.Data.OleDb.OleDbParameterCollection> has already been created.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbParameterCollection.this1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbParameterCollection/Item/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OleDb/OleDbTransaction.xml b/xml/System.Data.OleDb/OleDbTransaction.xml
index 230f8e00a51..9c581a6f183 100644
--- a/xml/System.Data.OleDb/OleDbTransaction.xml
+++ b/xml/System.Data.OleDb/OleDbTransaction.xml
@@ -189,7 +189,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and an <xref:System.Data.OleDb.OleDbTransaction>. It also demonstrates how to use the <xref:System.Data.OleDb.OleDbConnection.BeginTransaction%2A>, a <xref:System.Data.OleDb.OleDbTransaction.Commit%2A>, and <xref:System.Data.OleDb.OleDbTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/BeginTransaction/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -405,7 +405,7 @@
  The following example creates an <xref:System.Data.OleDb.OleDbConnection> and an <xref:System.Data.OleDb.OleDbTransaction>. It also demonstrates how to use the <xref:System.Data.OleDb.OleDbConnection.BeginTransaction%2A>, a <xref:System.Data.OleDb.OleDbTransaction.Commit%2A>, and <xref:System.Data.OleDb.OleDbTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbConnection.BeginTransaction1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OleDb/OleDbConnection/BeginTransaction/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OracleClient/OracleDataReader.xml b/xml/System.Data.OracleClient/OracleDataReader.xml
index 7a2ee78fc26..96d2cdd6baa 100644
--- a/xml/System.Data.OracleClient/OracleDataReader.xml
+++ b/xml/System.Data.OracleClient/OracleDataReader.xml
@@ -243,7 +243,7 @@ public void ReadOracleTypesExample(string connectionString)
  The following example creates an <xref:System.Data.OracleClient.OracleConnection>, an <xref:System.Data.OracleClient.OracleCommand>, and an <xref:System.Data.OracleClient.OracleDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.OracleClient.OracleDataReader>, then the <xref:System.Data.OracleClient.OracleConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleDataReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleDataReader/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleDataReader/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -2161,7 +2161,7 @@ public void ReadOracleData(string connectionString)
  The following example creates an <xref:System.Data.OracleClient.OracleConnection>, an <xref:System.Data.OracleClient.OracleCommand>, and an <xref:System.Data.OracleClient.OracleDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.OracleClient.OracleDataReader>, then the <xref:System.Data.OracleClient.OracleConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Read/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OracleClient/OracleException.xml b/xml/System.Data.OracleClient/OracleException.xml
index 6c72eff6082..b99be186749 100644
--- a/xml/System.Data.OracleClient/OracleException.xml
+++ b/xml/System.Data.OracleClient/OracleException.xml
@@ -43,7 +43,7 @@
  The following example generates an <xref:System.Data.OracleClient.OracleException> due to a missing database, and then displays the exception.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleException/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleException/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleException/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.OracleClient/OracleParameter.xml b/xml/System.Data.OracleClient/OracleParameter.xml
index 1788a52fdda..4a7f45b21dc 100644
--- a/xml/System.Data.OracleClient/OracleParameter.xml
+++ b/xml/System.Data.OracleClient/OracleParameter.xml
@@ -71,7 +71,7 @@ OleDbDataReader reader = command.ExecuteReader();
  The following example creates multiple instances of <xref:System.Data.OracleClient.OracleParameter> through the <xref:System.Data.OracleClient.OracleParameterCollection> within the <xref:System.Data.OracleClient.OracleDataAdapter>. These parameters are used to select data from the database and place the data in the <xref:System.Data.DataSet>. This example assumes that a <xref:System.Data.DataSet> and an <xref:System.Data.OracleClient.OracleDataAdapter> have already been created by using the appropriate schema, commands, and connection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameter/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -134,7 +134,7 @@ OleDbDataReader reader = command.ExecuteReader();
  The following example creates an <xref:System.Data.OracleClient.OracleParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -212,7 +212,7 @@ Parameter = new OracleParameter("pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OracleClient.OracleParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter2/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@ Parameter = new OracleParameter("pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OracleClient.OracleParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter3/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter3/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -343,7 +343,7 @@ Parameter = new OracleParameter("pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OracleClient.OracleParameter> and displays the <xref:System.Data.OracleClient.OracleParameter.ParameterName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter4/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.OracleParameter4/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameter/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -406,7 +406,7 @@ Parameter = new OracleParameter("pname", Convert.ToInt32(0));
  The following example creates an <xref:System.Data.OracleClient.OracleParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameter.DbType/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter.DbType/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameter/DbType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OracleClient/OracleParameterCollection.xml b/xml/System.Data.OracleClient/OracleParameterCollection.xml
index e2b46cbcb40..3e387298e3d 100644
--- a/xml/System.Data.OracleClient/OracleParameterCollection.xml
+++ b/xml/System.Data.OracleClient/OracleParameterCollection.xml
@@ -74,7 +74,7 @@ SELECT * FROM Customers WHERE CustomerID = :pCustomerID
  The following example creates multiple instances of <xref:System.Data.OracleClient.OracleParameter> through the <xref:System.Data.OracleClient.OracleParameterCollection> within the <xref:System.Data.OracleClient.OracleDataAdapter>. These parameters are used to select data within the database and then place the data in the <xref:System.Data.DataSet>. This example assumes that a <xref:System.Data.DataSet> and an <xref:System.Data.OracleClient.OracleDataAdapter> have already been created with the appropriate schema, commands, and connection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameter/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameter/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -140,7 +140,7 @@ SELECT * FROM Customers WHERE CustomerID = :pCustomerID
  The following example creates an <xref:System.Data.OracleClient.OracleParameterCollection>, adds instances of <xref:System.Data.OracleClient.OracleParameter> to the collection, and returns a reference to the new <xref:System.Data.OracleClient.OracleParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add2/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -223,7 +223,7 @@ SELECT * FROM Customers WHERE CustomerID = :pCustomerID
  The following example creates an <xref:System.Data.OracleClient.OracleParameterCollection>, adds instances of <xref:System.Data.OracleClient.OracleParameter> to the collection, and returns a reference to the new <xref:System.Data.OracleClient.OracleParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add2/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add2/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -313,7 +313,7 @@ SELECT * FROM Customers WHERE CustomerID = :pCustomerID
  The following example creates an <xref:System.Data.OracleClient.OracleParameterCollection>, adds an instance of <xref:System.Data.OracleClient.OracleParameter> to the collection, and returns a reference to the new <xref:System.Data.OracleClient.OracleParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add3/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add3/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -357,7 +357,7 @@ SELECT * FROM Customers WHERE CustomerID = :pCustomerID
  The following example creates an <xref:System.Data.OracleClient.OracleParameterCollection>, adds an instance of <xref:System.Data.OracleClient.OracleParameter> to the collection, and returns a reference to the new <xref:System.Data.OracleClient.OracleParameter>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add4/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Add4/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Add/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1085,7 +1085,7 @@ SELECT * FROM Customers WHERE CustomerID = :pCustomerID
  The following example creates an <xref:System.Data.OracleClient.OracleParameterCollection>, adds instances of <xref:System.Data.OracleClient.OracleParameter> to the collection, displays the names of its <xref:System.Data.OracleClient.OracleParameter> objects, and then clears the collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Count/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.Count/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1123,7 +1123,7 @@ SELECT * FROM Customers WHERE CustomerID = :pCustomerID
  The following example searches for an <xref:System.Data.OracleClient.OracleParameter> with a given <xref:System.Data.OracleClient.OracleParameter.ParameterName%2A> within an <xref:System.Data.OracleClient.OracleParameterCollection>. If the parameter exists, the example displays the name and index of the parameter. If the parameter does not exist, the example displays an error. This example assumes that an <xref:System.Data.OracleClient.OracleParameterCollection> has already been created.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.this1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleParameterCollection.this1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleParameterCollection/Item/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.OracleClient/OracleRowUpdatedEventArgs.xml b/xml/System.Data.OracleClient/OracleRowUpdatedEventArgs.xml
index 49992d18860..eba8163a0ce 100644
--- a/xml/System.Data.OracleClient/OracleRowUpdatedEventArgs.xml
+++ b/xml/System.Data.OracleClient/OracleRowUpdatedEventArgs.xml
@@ -53,7 +53,7 @@
  `Event Arguments: (command= OracleCommend commandType=2 recordsAffected=1 row=System.Data.DataRow[37] status=0)`  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleRowUpdatedEventArgs/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleRowUpdatedEventArgs/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleRowUpdatedEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.OracleClient/OracleRowUpdatingEventArgs.xml b/xml/System.Data.OracleClient/OracleRowUpdatingEventArgs.xml
index 233c7176c5e..5f2c3db3715 100644
--- a/xml/System.Data.OracleClient/OracleRowUpdatingEventArgs.xml
+++ b/xml/System.Data.OracleClient/OracleRowUpdatingEventArgs.xml
@@ -53,7 +53,7 @@
  `Event Arguments: (command=OracleCommand commandType=2 recordsAffected=1 row=DataRow[37] status=0)`  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleRowUpdatingEventArgs/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleRowUpdatingEventArgs/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleRowUpdatingEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.OracleClient/OracleTransaction.xml b/xml/System.Data.OracleClient/OracleTransaction.xml
index 0cc6d3124b1..2d40e8d2469 100644
--- a/xml/System.Data.OracleClient/OracleTransaction.xml
+++ b/xml/System.Data.OracleClient/OracleTransaction.xml
@@ -42,7 +42,7 @@
  The following example creates an <xref:System.Data.OracleClient.OracleConnection> and an <xref:System.Data.OracleClient.OracleTransaction>. It also demonstrates how to use the <xref:System.Data.OracleClient.OracleConnection.BeginTransaction%2A>, <xref:System.Data.OracleClient.OracleTransaction.Commit%2A>, and <xref:System.Data.OracleClient.OracleTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleTransaction/Commit/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -85,7 +85,7 @@
  The following example creates an <xref:System.Data.OracleClient.OracleConnection> and an <xref:System.Data.OracleClient.OracleTransaction>. It also demonstrates how to use the <xref:System.Data.OracleClient.OracleConnection.BeginTransaction%2A>, <xref:System.Data.OracleClient.OracleTransaction.Commit%2A>, and <xref:System.Data.OracleClient.OracleTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction1/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -278,7 +278,7 @@
  The following example creates an <xref:System.Data.OracleClient.OracleConnection> and an <xref:System.Data.OracleClient.OracleTransaction>. It also demonstrates how to use the <xref:System.Data.OracleClient.OracleConnection.BeginTransaction%2A>, <xref:System.Data.OracleClient.OracleTransaction.Commit%2A>, and <xref:System.Data.OracleClient.OracleTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OracleConnection.BeginTransaction1/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.OracleClient/OracleTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlBulkCopy.xml b/xml/System.Data.SqlClient/SqlBulkCopy.xml
index c35afa0a794..7405ddd4794 100644
--- a/xml/System.Data.SqlClient/SqlBulkCopy.xml
+++ b/xml/System.Data.SqlClient/SqlBulkCopy.xml
@@ -61,7 +61,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks BulkCopy.Single/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks BulkCopy.Single/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -125,7 +125,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks BulkCopy.Single/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks BulkCopy.Single/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -181,7 +181,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ConnectionString/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ConnectionString/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -235,7 +235,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.KeepIdentity/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.KeepIdentity/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -342,7 +342,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.BatchSize/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.BatchSize/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/BatchSize/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -396,7 +396,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL`INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.Timeout/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.Timeout/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/BulkCopyTimeout/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -452,7 +452,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.OrdersDetails/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.OrdersDetails/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -556,7 +556,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.Single/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.Single/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/DestinationTableName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -651,7 +651,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.NotifyAfter/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.NotifyAfter/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/NotifyAfter/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -708,7 +708,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.NotifyAfter/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.NotifyAfter/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/NotifyAfter/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -862,7 +862,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.RowArray/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.RowArray/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -917,7 +917,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.DataTable/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.DataTable/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -972,7 +972,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ConnectionString/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ConnectionString/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1032,7 +1032,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.DataRowState/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.DataRowState/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/WriteToServer/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlBulkCopyColumnMapping.xml b/xml/System.Data.SqlClient/SqlBulkCopyColumnMapping.xml
index d264c85b5c5..d30f527283a 100644
--- a/xml/System.Data.SqlClient/SqlBulkCopyColumnMapping.xml
+++ b/xml/System.Data.SqlClient/SqlBulkCopyColumnMapping.xml
@@ -59,7 +59,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -117,7 +117,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdinal/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdinalName/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdinalName/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -263,7 +263,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingNameOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingNameOrdinal/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -364,7 +364,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationColumn/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationColumn/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/DestinationColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -416,7 +416,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationOrdinal/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/DestinationOrdinal/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -468,7 +468,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationColumn/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationColumn/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/DestinationColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -520,7 +520,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingDestinationOrdinal/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/DestinationOrdinal/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml b/xml/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml
index ec9f6f65d48..fd5822ffb72 100644
--- a/xml/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml
+++ b/xml/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml
@@ -75,7 +75,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollection/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollection/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMapping/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollectionOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollectionOrdinal/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingIndexColName/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingIndexColName/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -310,7 +310,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingColNameIndex/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingColNameIndex/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Add/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -368,7 +368,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollection/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingCollection/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -428,7 +428,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdersDetails/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingOrdersDetails/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Clear/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -737,7 +737,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingRemove/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingRemove/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/Remove/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -800,7 +800,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT ... SELECT` statement to copy the data.
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingRemoveAt/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.ColumnMappingRemoveAt/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection/RemoveAt/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlBulkCopyOptions.xml b/xml/System.Data.SqlClient/SqlBulkCopyOptions.xml
index d03f7f13e0d..c33c97db2ce 100644
--- a/xml/System.Data.SqlClient/SqlBulkCopyOptions.xml
+++ b/xml/System.Data.SqlClient/SqlBulkCopyOptions.xml
@@ -58,7 +58,7 @@
 >  This sample will not run unless you have created the work tables as described in [Bulk Copy Example Setup](/dotnet/framework/data/adonet/sql/bulk-copy-example-setup). This code is provided to demonstrate the syntax for using **SqlBulkCopy** only. If the source and destination tables are in the same SQL Server instance, it is easier and faster to use a Transact-SQL `INSERT … SELECT` statement to copy the data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.KeepIdentity/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlBulkCopy.KeepIdentity/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlBulkCopy/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.SqlClient/SqlClientFactory.xml b/xml/System.Data.SqlClient/SqlClientFactory.xml
index d9ce2a91e11..db8b664981f 100644
--- a/xml/System.Data.SqlClient/SqlClientFactory.xml
+++ b/xml/System.Data.SqlClient/SqlClientFactory.xml
@@ -86,7 +86,7 @@
  The following example displays a list of all available SQL Server data sources, using code that could enumerate data sources for any provider.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlClientFactory.DataSourceEnumerator/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlClientFactory.DataSourceEnumerator/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlClientFactory/CanCreateDataSourceEnumerator/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -368,7 +368,7 @@ DbDataAdapter cmd = newFactory.CreateDataAdapter();
  The following example displays a list of all available SQL Server data sources, using code that could enumerate data sources for any provider.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlClientFactory.DataSourceEnumerator/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlClientFactory.DataSourceEnumerator/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlClientFactory/CanCreateDataSourceEnumerator/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlCommand.xml b/xml/System.Data.SqlClient/SqlCommand.xml
index 7c196f387f5..3b4b573a6d5 100644
--- a/xml/System.Data.SqlClient/SqlCommand.xml
+++ b/xml/System.Data.SqlClient/SqlCommand.xml
@@ -111,7 +111,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlConnection>, a <xref:System.Data.SqlClient.SqlCommand>, and a <xref:System.Data.SqlClient.SqlDataReader>. The example reads through the data, writing it to the console. Finally, the example closes the <xref:System.Data.SqlClient.SqlDataReader> and then the <xref:System.Data.SqlClient.SqlConnection> as it exits the `Using` code blocks.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/Overview/source.vb" id="Snippet1":::
 
  The following sample shows how to create and execute different types of SqlCommand objects.
 
@@ -497,7 +497,7 @@ class Program {
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and sets the `CommandTimeout` property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandTimeout Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandTimeout Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/CommandTimeout/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -557,7 +557,7 @@ class Program {
  The following example creates a <xref:System.Data.SqlClient.SqlCommand>, passing in the connection string and command text.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -619,7 +619,7 @@ class Program {
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -767,7 +767,7 @@ class Program {
  The following console application creates updates data within the **AdventureWorks** sample database, doing its work asynchronously. In order to emulate a long-running process, this example inserts a WAITFOR statement in the command text. Normally, you would not take efforts to make your commands run slower, but doing this in this case makes it easier to demonstrate the asynchronous behavior.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQuery/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQuery/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -852,7 +852,7 @@ The <see cref="T:System.Data.SqlClient.SqlConnection" /> closed or dropped durin
  To set up this example, create a new Windows application. Put a <xref:System.Windows.Forms.Button> control and a <xref:System.Windows.Forms.Label> control on the form (accepting the default name for each control). Add the following code to the form's class, modifying the connection string as needed for your environment.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/CS/Form1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteNonQueryForm/VB/Form1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteNonQuery/Form1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -937,7 +937,7 @@ A <see cref="P:System.Data.SqlClient.SqlParameter.SqlDbType" /> other than **Xml
  The following console application starts the process of retrieving a data reader asynchronously. While waiting for the results, this simple application sits in a loop, investigating the <xref:System.IAsyncResult.IsCompleted%2A> property value. As soon as the process has completed, the code retrieves the <xref:System.Data.SqlClient.SqlDataReader> and displays its contents.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReader/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1017,7 +1017,7 @@ A timeout occurred during a streaming operation. For more information about stre
  This example also passes the `CommandBehavior.CloseConnection` and `CommandBehavior.SingleRow` values in the behavior parameter, causing the connection to be closed with the returned <xref:System.Data.SqlClient.SqlDataReader> is closed, and to optimize for a single row result.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncSimple/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncSimple/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1104,7 +1104,7 @@ A timeout occurred during a streaming operation. For more information about stre
  To set up this example, create a new Windows application. Put a <xref:System.Windows.Forms.Button> control, a <xref:System.Windows.Forms.DataGridView> control, and a <xref:System.Windows.Forms.Label> control on the form (accepting the default name for each control). Add the following code to the form's class, modifying the connection string as needed for your environment.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsync/CS/Form1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsync/VB/Form1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1197,7 +1197,7 @@ A <see cref="P:System.Data.SqlClient.SqlParameter.SqlDbType" /> other than **Xml
  This example passes the `CommandBehavior.CloseConnection` value in the `behavior` parameter, causing the returned <xref:System.Data.SqlClient.SqlDataReader> to automatically close its connection when it is closed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/CS/Form1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteReaderAsyncBehavior/VB/Form1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteReader/Form11.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1294,7 +1294,7 @@ SqlCommand command = new SqlCommand("SELECT ContactID, FirstName, LastName FROM
  The following console application starts the process of retrieving XML data asynchronously. While waiting for the results, this simple application sits in a loop, investigating the <xref:System.IAsyncResult.IsCompleted%2A> property value. Once the process has completed, the code retrieves the XML and displays its contents.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReader/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1391,7 +1391,7 @@ SqlCommand command = new SqlCommand("SELECT ContactID, FirstName, LastName FROM
  To set up this example, create a new Windows application. Put a <xref:System.Windows.Forms.Button> control, a <xref:System.Windows.Forms.ListBox> control, and a <xref:System.Windows.Forms.Label> control on the form (accepting the default name for each control). Add the following code to the form's class, modifying the connection string as needed for your environment.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/CS/Form1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.BeginExecuteXmlReaderAsync/VB/Form1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/BeginExecuteXmlReader/Form1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1473,7 +1473,7 @@ The <see cref="T:System.Data.SqlClient.SqlConnection" /> closed or dropped durin
  The following example demonstrates the use of the <xref:System.Data.SqlClient.SqlCommand.Cancel%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Cancel/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Cancel/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Cancel/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1628,7 +1628,7 @@ SELECT * FROM dbo.Customers WHERE CustomerID = @CustomerID
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.CommandText Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.CommandText Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/CommandText/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1801,7 +1801,7 @@ public class A {
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandTimeout Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandTimeout Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/CommandTimeout/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1877,7 +1877,7 @@ public class A {
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Connection Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Connection/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2438,7 +2438,7 @@ If no statements are detected that contribute to the count, the return value is
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and then executes it using <xref:System.Data.SqlClient.SqlCommand.ExecuteNonQuery%2A>. The example is passed a string that is a Transact-SQL statement (such as UPDATE, INSERT, or DELETE) and a string to use to connect to the data source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteNonQuery/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2595,7 +2595,7 @@ The <see cref="T:System.Data.SqlClient.SqlConnection" /> closed or dropped durin
  The following example creates a <xref:System.Data.SqlClient.SqlCommand>, and then executes it by passing a string that is a Transact-SQL SELECT statement, and a string to use to connect to the data source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2679,7 +2679,7 @@ The <see cref="T:System.Data.SqlClient.SqlConnection" /> closed or dropped durin
  The following example creates a <xref:System.Data.SqlClient.SqlCommand>, and then executes it by passing a string that is a Transact-SQL SELECT statement, and a string to use to connect to the data source. <xref:System.Data.CommandBehavior> is set to <xref:System.Data.CommandBehavior.CloseConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/CS/mysample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/mysample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteReader/mysample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3064,7 +3064,7 @@ Int32 count = (Int32) cmd.ExecuteScalar();
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and then executes it using <xref:System.Data.SqlClient.SqlCommand.ExecuteScalar%2A>. The example is passed a string representing a new value to be inserted into a table, and a string to use to connect to the data source. The function returns the new **Identity** column value if a new row was inserted, 0 on failure.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlCommand.ExecuteScalar/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlCommand.ExecuteScalar/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteScalar/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3218,7 +3218,7 @@ SqlCommand command = new SqlCommand("SELECT * FROM dbo.Customers FOR XML AUTO, X
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and then executes it using <xref:System.Data.SqlClient.SqlCommand.ExecuteXmlReader%2A>. The example is passed a string that is a Transact-SQL FOR XML SELECT statement, and a string to use to connect to the data source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/CS/mysample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteXmlReader/VB/mysample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteXmlReader/mysample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3551,7 +3551,7 @@ A timeout occurred during a streaming operation. For more information about stre
  The following example demonstrates how to create a <xref:System.Data.SqlClient.SqlCommand> and add parameters to the <xref:System.Data.SqlClient.SqlParameterCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParameterCollection.AddWithValue/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParameterCollection.AddWithValue/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Parameters/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3619,7 +3619,7 @@ A timeout occurred during a streaming operation. For more information about stre
  The following example demonstrates the use of the <xref:System.Data.SqlClient.SqlCommand.Prepare%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/CS/Source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.Prepare/VB/Source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Prepare/Source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlCommandBuilder.xml b/xml/System.Data.SqlClient/SqlCommandBuilder.xml
index a3ebfb86b7e..52911fd2b35 100644
--- a/xml/System.Data.SqlClient/SqlCommandBuilder.xml
+++ b/xml/System.Data.SqlClient/SqlCommandBuilder.xml
@@ -62,7 +62,7 @@
  The following example uses the <xref:System.Data.SqlClient.SqlCommand>, along <xref:System.Data.SqlClient.SqlDataAdapter> and <xref:System.Data.SqlClient.SqlConnection>, to select rows from a data source. The example is passed a connection string, a query string that is a Transact-SQL SELECT statement, and a string that is the name of the database table. The example then creates a <xref:System.Data.SqlClient.SqlCommandBuilder>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommandBuilder/CS/Source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommandBuilder/VB/Source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommandBuilder/Overview/Source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.SqlClient/SqlConnection.xml b/xml/System.Data.SqlClient/SqlConnection.xml
index d5ebe239892..81608b26246 100644
--- a/xml/System.Data.SqlClient/SqlConnection.xml
+++ b/xml/System.Data.SqlClient/SqlConnection.xml
@@ -115,7 +115,7 @@ using (SqlConnection connection = new SqlConnection(connectionString))
  The following example creates a <xref:System.Data.SqlClient.SqlCommand> and a <xref:System.Data.SqlClient.SqlConnection>. The <xref:System.Data.SqlClient.SqlConnection> is opened and set as the <xref:System.Data.SqlClient.SqlCommand.Connection%2A> for the <xref:System.Data.SqlClient.SqlCommand>. The example then calls <xref:System.Data.SqlClient.SqlCommand.ExecuteNonQuery%2A>. To accomplish this, the <xref:System.Data.SqlClient.SqlCommand.ExecuteNonQuery%2A> is passed a SqlConnection and a query string that is a Transact-SQL INSERT statement. The connection is closed automatically when the code exits the using block.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteNonQuery Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/ExecuteNonQuery/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -181,7 +181,7 @@ using (SqlConnection connection = new SqlConnection(connectionString))
  The following example creates and opens a <xref:System.Data.SqlClient.SqlConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.SqlConnection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.SqlConnection Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -241,7 +241,7 @@ using (SqlConnection connection = new SqlConnection(connectionString))
  The following example creates and opens a <xref:System.Data.SqlClient.SqlConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.SqlConnection1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.SqlConnection1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -418,7 +418,7 @@ using (SqlConnection connection = new SqlConnection(connectionString))
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, a <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@ using (SqlConnection connection = new SqlConnection(connectionString))
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, a <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -553,7 +553,7 @@ using (SqlConnection connection = new SqlConnection(connectionString))
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, a <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -624,7 +624,7 @@ using (SqlConnection connection = new SqlConnection(connectionString))
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, a <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -687,7 +687,7 @@ using (SqlConnection connection = new SqlConnection(connectionString))
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and displays some of its read-only properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Database Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Database Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ChangeDatabase/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1017,7 +1017,7 @@ The connection string contains <see langword="Context Connection=true" />.
  The following example creates a <xref:System.Data.SqlClient.SqlConnection>, opens it, displays some of its properties. The connection is automatically closed at the end of the `using` block.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Open Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Open Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1293,7 +1293,7 @@ The <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A> is similar to
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and sets the <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A> property before opening the connection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.ConnectionString Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.ConnectionString Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ConnectionString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1363,7 +1363,7 @@ The <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A> is similar to
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and sets the `Connection Timeout` to 30 seconds in the connection string. The code opens the connection and displays the <xref:System.Data.SqlClient.SqlConnection.ConnectionTimeout%2A> property in the console window.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.ConnectionTimeout Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.ConnectionTimeout Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ConnectionTimeout/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1411,7 +1411,7 @@ The <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A> is similar to
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/sqlconnection_createcommand/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/sqlconnection_createcommand/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/CreateCommand/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1566,7 +1566,7 @@ The <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A> is similar to
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and displays some of its read-only properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Database Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Database Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ChangeDatabase/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1636,7 +1636,7 @@ The <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A> is similar to
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and displays some of its read-only properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.DataSource Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.DataSource Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/DataSource/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2314,7 +2314,7 @@ class Program {
  The following example creates a <xref:System.Data.SqlClient.SqlConnection>, opens it, and displays some of its properties. The connection is automatically closed at the end of the `using` block.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Open Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.Open Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2444,7 +2444,7 @@ class Program {
  The following example creates a <xref:System.Data.SqlClient.SqlConnection>, including setting the `Packet Size` to 512 in the connection string. It displays the <xref:System.Data.SqlClient.SqlConnection.PacketSize%2A> and <xref:System.Data.SqlClient.SqlConnection.ServerVersion%2A> properties in the console window.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.PacketSize Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.PacketSize Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/PacketSize/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2635,7 +2635,7 @@ SqlConnection.RegisterColumnEncryptionKeyStoreProviders(customKeyStoreProviders)
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and displays the <xref:System.Data.SqlClient.SqlConnection.ServerVersion%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ISqlConnection.ServerVersion Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ISqlConnection.ServerVersion Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/ServerVersion/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2978,7 +2978,7 @@ Once the transaction has completed, you must explicitly commit or roll back the
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and displays the <xref:System.Data.SqlClient.SqlConnection.WorkstationId%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.WorkstationId Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.WorkstationId Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/WorkstationId/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlConnectionStringBuilder.xml b/xml/System.Data.SqlClient/SqlConnectionStringBuilder.xml
index cc5b4b59a18..ba44273e942 100644
--- a/xml/System.Data.SqlClient/SqlConnectionStringBuilder.xml
+++ b/xml/System.Data.SqlClient/SqlConnectionStringBuilder.xml
@@ -88,7 +88,7 @@ Integrated Security=True
 The following console application builds connection strings for a SQL Server database. The code uses the <xref:System.Data.SqlClient.SqlConnectionStringBuilder> class to create the connection string. The example then parses the connection string and demonstrates various ways of manipulating the its contents.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -271,7 +271,7 @@ The <xref:System.Data.SqlClient.SqlConnectionStringBuilder> class provides a fix
  The following example creates a new <xref:System.Data.SqlClient.SqlConnectionStringBuilder> and assigns a connection string in the object's constructor. The code displays the parsed and recreated version of the connection string, and then modifies the <xref:System.Data.SqlClient.SqlConnectionStringBuilder.ApplicationName%2A> property of the object. Finally, the code displays the new connection string, including the new key/value pair.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ApplicationName/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ApplicationName/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ApplicationName/source.vb" id="Snippet1":::
 
  The sample displays the following text in the console window:
 
@@ -332,7 +332,7 @@ Modified: Data Source=(local);Initial Catalog=AdventureWorks;Integrated Security
  The following example retrieves a connection string and verifies that the connection string is configured to allow for asynchronous processing. (In this case, the string comes from a procedure within the application, but in a production application, the connection string might come from a configuration file, or some other source.) Then, the example performs an asynchronous operation, updating values within a sample database on a background thread.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Async/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Async/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/AsynchronousProcessing/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -406,7 +406,7 @@ Modified: Data Source=(local);Initial Catalog=AdventureWorks;Integrated Security
  The following example creates a new <xref:System.Data.SqlClient.SqlConnectionStringBuilder> instance, and sets the `AttachDBFilename` property in order to specify the name of an attached data file.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.AttachDBFilename/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.AttachDBFilename/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/AttachDBFilename/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -490,7 +490,7 @@ Modified: Data Source=(local);Initial Catalog=AdventureWorks;Integrated Security
  The following example demonstrates calling the <xref:System.Data.Common.DbConnectionStringBuilder.Clear%2A> method. This example populates the <xref:System.Data.SqlClient.SqlConnectionStringBuilder> with some key/value pairs, and then calls the <xref:System.Data.Common.DbConnectionStringBuilder.Clear%2A> method and shows the results.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Clear/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Clear/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -718,7 +718,7 @@ Modified: Data Source=(local);Initial Catalog=AdventureWorks;Integrated Security
  The following example first displays the contents of a connection string that does not specify the "Connect Timeout" value, sets the <xref:System.Data.SqlClient.SqlConnectionStringBuilder.ConnectTimeout%2A> property, and then displays the new connection string.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ConnectTimeout/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ConnectTimeout/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ConnectTimeout/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -772,7 +772,7 @@ Modified: Data Source=(local);Initial Catalog=AdventureWorks;Integrated Security
  The following example creates a <xref:System.Data.SqlClient.SqlConnectionStringBuilder> instance, sets some of its properties, and then tries to determine whether various keys exist within the object by calling the **ContainsKey** method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ContainsKey/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.ContainsKey/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/ContainsKey/source.vb" id="Snippet1":::
 
  The example displays the following output in the console window:
 
@@ -946,7 +946,7 @@ False
  The following example demonstrates that the <xref:System.Data.SqlClient.SqlConnectionStringBuilder> class converts synonyms for the "Data Source" connection string key into the well-known key:
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.DataSource/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.DataSource/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/DataSource/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1217,7 +1217,7 @@ False
  The following example creates a simple connection string and then uses the <xref:System.Data.SqlClient.SqlConnectionStringBuilder> class to add the name of the database to the connection string. The code displays the contents of the <xref:System.Data.SqlClient.SqlConnectionStringBuilder.InitialCatalog%2A> property, just to verify that the class was able to convert from the synonym ("Database") to the appropriate property value.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.InitialCatalog/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.InitialCatalog/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/InitialCatalog/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1349,7 +1349,7 @@ This property corresponds to the "Integrated Security" and "trusted_connection"
  The following code, in a console application, creates a new <xref:System.Data.SqlClient.SqlConnectionStringBuilder> and adds key/value pairs to its connection string, using the <xref:System.Data.SqlClient.SqlConnectionStringBuilder.Item%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Item/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Item/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1402,7 +1402,7 @@ This property corresponds to the "Integrated Security" and "trusted_connection"
  The following console application example creates a new <xref:System.Data.SqlClient.SqlConnectionStringBuilder>. The code loops through the <xref:System.Collections.ICollection> returned by the <xref:System.Data.SqlClient.SqlConnectionStringBuilder.Keys%2A> property displaying the key/value pairs.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Keys/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Keys/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Keys/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1618,7 +1618,7 @@ This property corresponds to the "Integrated Security" and "trusted_connection"
  The following example explicitly enables the Multiple Active Result Sets feature.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.MARS/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.MARS/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/MultipleActiveResultSets/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1827,7 +1827,7 @@ This property corresponds to the "Integrated Security" and "trusted_connection"
  The following example shows how to set <xref:System.Data.SqlClient.SqlConnectionStringBuilder.Password%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/dataworks sqlconnectionstringbuilder.password.2/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/dataworks sqlconnectionstringbuilder.password.2/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Password/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2381,7 +2381,7 @@ This property corresponds to the "Integrated Security" and "trusted_connection"
  The following example demonstrates the behavior of the **TryGetValue** method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.TryGetValue/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.TryGetValue/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/TryGetValue/source.vb" id="Snippet1":::
 
  The sample displays the following results:
 
@@ -2617,7 +2617,7 @@ Unable to retrieve value for null key.
  The following example first creates a new <xref:System.Data.SqlClient.SqlConnectionStringBuilder>, and then iterates through all the values within the object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Values/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlConnectionStringBuilder.Values/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnectionStringBuilder/Values/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlDataAdapter.xml b/xml/System.Data.SqlClient/SqlDataAdapter.xml
index 4837506f9e8..00695fa859c 100644
--- a/xml/System.Data.SqlClient/SqlDataAdapter.xml
+++ b/xml/System.Data.SqlClient/SqlDataAdapter.xml
@@ -107,7 +107,7 @@
  The following example uses the <xref:System.Data.SqlClient.SqlCommand>, <xref:System.Data.SqlClient.SqlDataAdapter>, and <xref:System.Data.SqlClient.SqlConnection> to select records from a database and populate a <xref:System.Data.DataSet> with the selected rows. The filled <xref:System.Data.DataSet> is then returned. To accomplish this, the method is passed an initialized <xref:System.Data.DataSet>, a connection string, and a query string that is a Transact-SQL SELECT statement.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataAdapter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -166,7 +166,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlDataAdapter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -222,7 +222,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlDataAdapter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -278,7 +278,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlDataAdapter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -334,7 +334,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlDataAdapter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.SqlDataAdapter2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -535,7 +535,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlDataAdapter> and sets the <xref:System.Data.SqlClient.SqlDataAdapter.SelectCommand%2A>, <xref:System.Data.SqlClient.SqlDataAdapter.InsertCommand%2A>, <xref:System.Data.SqlClient.SqlDataAdapter.UpdateCommand%2A>, and <xref:System.Data.SqlClient.SqlDataAdapter.DeleteCommand%2A> properties. It assumes you have already created a <xref:System.Data.SqlClient.SqlConnection> object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/DeleteCommand/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -751,7 +751,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlDataAdapter> and sets the <xref:System.Data.SqlClient.SqlDataAdapter.SelectCommand%2A>, <xref:System.Data.SqlClient.SqlDataAdapter.InsertCommand%2A>, <xref:System.Data.SqlClient.SqlDataAdapter.UpdateCommand%2A>, and <xref:System.Data.SqlClient.SqlDataAdapter.DeleteCommand%2A> properties. It assumes you have already created a <xref:System.Data.SqlClient.SqlConnection> object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/DeleteCommand/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -883,7 +883,7 @@
  event args: (command=System.Data.SqlClient.SqlCommand commandType=2 recordsAffected=1 row=System.Data.DataRow[37] status=0)
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/RowUpdated/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -955,7 +955,7 @@
  event args: (command=System.Data.SqlClient.SqlCommand commandType=2 recordsAffected=1 row=System.Data.DataRow[37] status=0)
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/RowUpdated/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1024,7 +1024,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlDataAdapter> and sets the <xref:System.Data.SqlClient.SqlDataAdapter.SelectCommand%2A>, <xref:System.Data.SqlClient.SqlDataAdapter.InsertCommand%2A>, <xref:System.Data.SqlClient.SqlDataAdapter.UpdateCommand%2A>, and <xref:System.Data.SqlClient.SqlDataAdapter.DeleteCommand%2A> properties. It assumes you have already created a <xref:System.Data.SqlClient.SqlConnection> object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/DeleteCommand/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1375,7 +1375,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlDataAdapter> and sets the <xref:System.Data.SqlClient.SqlDataAdapter.SelectCommand%2A>, <xref:System.Data.SqlClient.SqlDataAdapter.InsertCommand%2A>, <xref:System.Data.SqlClient.SqlDataAdapter.UpdateCommand%2A> and <xref:System.Data.SqlClient.SqlDataAdapter.DeleteCommand%2A> properties. It assumes you have already created a <xref:System.Data.SqlClient.SqlConnection> object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlDataAdapter.Command/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/DeleteCommand/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlDataReader.xml b/xml/System.Data.SqlClient/SqlDataReader.xml
index 8a4fc695f9a..232403fdf9a 100644
--- a/xml/System.Data.SqlClient/SqlDataReader.xml
+++ b/xml/System.Data.SqlClient/SqlDataReader.xml
@@ -94,7 +94,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlConnection>, a <xref:System.Data.SqlClient.SqlCommand>, and a <xref:System.Data.SqlClient.SqlDataReader>. The example reads through the data, writing it out to the console window. The code then closes the <xref:System.Data.SqlClient.SqlDataReader>. The <xref:System.Data.SqlClient.SqlConnection> is closed automatically at the end of the `using` code block.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -152,7 +152,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlConnection>, a `SqlCommand`, and a <xref:System.Data.SqlClient.SqlDataReader>. The example reads through the data, writing it out to the console window. The code then closes the <xref:System.Data.SqlClient.SqlDataReader>. The <xref:System.Data.SqlClient.SqlConnection> is closed automatically at the end of the `using` code block.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataReader/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1593,7 +1593,7 @@ Boolean, Byte, Char, DateTime, DateTimeOffset, Decimal, Double, Float, Guid, Int
  The following example demonstrates how to use the <xref:System.Data.SqlClient.SqlDataReader.GetOrdinal%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.GetOrdinal/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataReader/GetOrdinal/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3118,7 +3118,7 @@ Boolean, Byte, Char, DateTime, DateTimeOffset, Decimal, Double, Float, Guid, Int
  The following example demonstrates using a correctly sized  array  to read all values from the current row in the supplied <xref:System.Data.SqlClient.SqlDataReader>. In addition, the sample demonstrates using a fixed-sized array that could be either smaller or larger than the number of available columns.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValueObject/CS/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValueObject/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetValues/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3371,7 +3371,7 @@ Boolean, Byte, Char, DateTime, DateTimeOffset, Decimal, Double, Float, Guid, Int
  Call this method to check for null column values before calling the typed get methods (for example, <xref:System.Data.SqlClient.SqlDataReader.GetByte%2A>, <xref:System.Data.SqlClient.SqlDataReader.GetChar%2A>, and so on) to avoid raising an error.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/sqldatareader_isdbnull/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/sqldatareader_isdbnull/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataReader/IsDBNull/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3715,7 +3715,7 @@ Boolean, Byte, Char, DateTime, DateTimeOffset, Decimal, Double, Float, Guid, Int
  The following example creates a <xref:System.Data.SqlClient.SqlConnection>, a <xref:System.Data.SqlClient.SqlCommand>, and a <xref:System.Data.SqlClient.SqlDataReader>. The example reads through the data, writing it out to the console window. The code then closes the <xref:System.Data.SqlClient.SqlDataReader>. The <xref:System.Data.SqlClient.SqlConnection> is closed automatically at the end of the `using` code block.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlError.xml b/xml/System.Data.SqlClient/SqlError.xml
index bb54ce42398..af45ca88b94 100644
--- a/xml/System.Data.SqlClient/SqlError.xml
+++ b/xml/System.Data.SqlClient/SqlError.xml
@@ -60,7 +60,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -113,7 +113,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -164,7 +164,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -208,7 +208,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -270,7 +270,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -314,7 +314,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -358,7 +358,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -402,7 +402,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@ Some error messages can be raised at multiple points in the code for the Databas
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -504,7 +504,7 @@ Some error messages can be raised at multiple points in the code for the Databas
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlErrorCollection.xml b/xml/System.Data.SqlClient/SqlErrorCollection.xml
index 89d567d8bb6..9390f4a7926 100644
--- a/xml/System.Data.SqlClient/SqlErrorCollection.xml
+++ b/xml/System.Data.SqlClient/SqlErrorCollection.xml
@@ -67,7 +67,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -212,7 +212,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -305,7 +305,7 @@
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlException.xml b/xml/System.Data.SqlClient/SqlException.xml
index f369d272794..6565022260d 100644
--- a/xml/System.Data.SqlClient/SqlException.xml
+++ b/xml/System.Data.SqlClient/SqlException.xml
@@ -112,7 +112,7 @@ catch (Exception ex) {
  The following example generates a <xref:System.Data.SqlClient.SqlException> and then displays the exception.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlException Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlException/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -169,7 +169,7 @@ catch (Exception ex) {
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -270,7 +270,7 @@ catch (Exception ex) {
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlError Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlError/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -364,7 +364,7 @@ catch (Exception ex) {
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -443,7 +443,7 @@ catch (Exception ex) {
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -498,7 +498,7 @@ catch (Exception ex) {
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -553,7 +553,7 @@ catch (Exception ex) {
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -608,7 +608,7 @@ catch (Exception ex) {
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -663,7 +663,7 @@ catch (Exception ex) {
  The following example displays each <xref:System.Data.SqlClient.SqlError> within the <xref:System.Data.SqlClient.SqlErrorCollection> collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlException.State Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlException/Class/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlParameter.xml b/xml/System.Data.SqlClient/SqlParameter.xml
index 43ab0ec43eb..d1ea8570599 100644
--- a/xml/System.Data.SqlClient/SqlParameter.xml
+++ b/xml/System.Data.SqlClient/SqlParameter.xml
@@ -87,7 +87,7 @@
  The following example creates multiple instances of <xref:System.Data.SqlClient.SqlParameter> through the <xref:System.Data.SqlClient.SqlParameterCollection> collection within the <xref:System.Data.SqlClient.SqlDataAdapter>. These parameters are used to select data from the data source and put the data in the <xref:System.Data.DataSet>. This example assumes that a <xref:System.Data.DataSet> and a <xref:System.Data.SqlClient.SqlDataAdapter> have already been created by using the appropriate schema, commands, and connection. For more information and additional examples on using parameters, see [Retrieving and Modifying Data in ADO.NET](/dotnet/framework/data/adonet/retrieving-and-modifying-data) and [Configuring Parameters and Parameter Data Types](/dotnet/framework/data/adonet/configuring-parameters-and-parameter-data-types).
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -142,7 +142,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -196,7 +196,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -257,7 +257,7 @@ If you do not perform this conversion, the compiler assumes that you are trying
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter6 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter6 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -313,7 +313,7 @@ If you do not perform this conversion, the compiler assumes that you are trying
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter4 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -372,7 +372,7 @@ If you do not perform this conversion, the compiler assumes that you are trying
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter5 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter5 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -444,7 +444,7 @@ If you do not perform this conversion, the compiler assumes that you are trying
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SqlParameter1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -625,7 +625,7 @@ If you do not perform this conversion, the compiler assumes that you are trying
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.IsNullable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.IsNullable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/IsNullable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -810,7 +810,7 @@ If you do not perform this conversion, the compiler assumes that you are trying
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/CS/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -940,7 +940,7 @@ static void CreateSqlParameterLocaleId(){
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/CS/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1008,7 +1008,7 @@ static void CreateSqlParameterLocaleId(){
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.ParameterName Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.ParameterName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/ParameterName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1081,7 +1081,7 @@ static void CreateSqlParameterLocaleId(){
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Precision Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Precision Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/Precision/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1247,7 +1247,7 @@ static void CreateSqlParameterLocaleId(){
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/CS/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1332,7 +1332,7 @@ static void CreateSqlParameterLocaleId(){
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/CS/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1403,7 +1403,7 @@ static void CreateSqlParameterLocaleId(){
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/CS/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1524,7 +1524,7 @@ FieldName = @OriginalFieldName
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/CS/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1918,7 +1918,7 @@ FieldName = @OriginalFieldName
  The following example creates a <xref:System.Data.SqlClient.SqlParameter> and sets some of its properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/CS/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParam.Properties/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameter/IsNullable/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlParameterCollection.xml b/xml/System.Data.SqlClient/SqlParameterCollection.xml
index 1cceff0c6c3..1d95f33e360 100644
--- a/xml/System.Data.SqlClient/SqlParameterCollection.xml
+++ b/xml/System.Data.SqlClient/SqlParameterCollection.xml
@@ -88,7 +88,7 @@
  The following example creates multiple instances of <xref:System.Data.SqlClient.SqlParameter> through the <xref:System.Data.SqlClient.SqlParameterCollection> collection. The parameters are used to select data within the data source and populate the <xref:System.Data.DataSet>. This code assumes that a <xref:System.Data.DataSet> and a <xref:System.Data.SqlClient.SqlDataAdapter> have already been created with the appropriate schema, commands, and connection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -148,7 +148,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -275,7 +275,7 @@ This member is an explicit interface member implementation. It can be used only
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -338,7 +338,7 @@ parameters.Add("@pname", Convert.ToInt32(0));
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -396,7 +396,7 @@ parameters.Add("@pname", Convert.ToInt32(0));
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -446,7 +446,7 @@ parameters.Add("@pname", Convert.ToInt32(0));
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add5 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Add5 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Add/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -593,7 +593,7 @@ parameters.Add("@pname", Convert.ToInt32(0));
  The following example demonstrates how to use the `AddWithValue` method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlParameterCollection.AddWithValue/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlParameterCollection.AddWithValue/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlCommand/Parameters/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1751,7 +1751,7 @@ This member is an explicit interface member implementation. It can be used only
  The following example searches for a <xref:System.Data.SqlClient.SqlParameter> object in a <xref:System.Data.SqlClient.SqlParameterCollection> collection. If the parameter exists, the example removes it. This example assumes that a <xref:System.Data.SqlClient.SqlParameterCollection> collection has already been created by a <xref:System.Data.SqlClient.SqlCommand>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Remove Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameterCollection.Remove Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlParameterCollection/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlClient/SqlRowUpdatedEventArgs.xml b/xml/System.Data.SqlClient/SqlRowUpdatedEventArgs.xml
index a511283e290..9aab22b08ed 100644
--- a/xml/System.Data.SqlClient/SqlRowUpdatedEventArgs.xml
+++ b/xml/System.Data.SqlClient/SqlRowUpdatedEventArgs.xml
@@ -70,7 +70,7 @@
  Event Arguments: (command=System.Data.SqlClient.SqlCommand commandType=2 recordsAffected=1 row=System.Data.DataRow[37] status=0)  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter.RowUpdated Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlDataAdapter/RowUpdated/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.SqlClient/SqlRowUpdatingEventArgs.xml b/xml/System.Data.SqlClient/SqlRowUpdatingEventArgs.xml
index f4f1388eff2..e2d83704dc9 100644
--- a/xml/System.Data.SqlClient/SqlRowUpdatingEventArgs.xml
+++ b/xml/System.Data.SqlClient/SqlRowUpdatingEventArgs.xml
@@ -70,7 +70,7 @@
  event args: (command=System.Data.SqlClient.SQLCommand commandType=2 recordsAffected=1 row=System.Data.DataRow[37] status=0)  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlRowUpdatingEventArgs Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlRowUpdatingEventArgs Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlRowUpdatingEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data.SqlClient/SqlTransaction.xml b/xml/System.Data.SqlClient/SqlTransaction.xml
index 4066719975c..2a3746ed7a6 100644
--- a/xml/System.Data.SqlClient/SqlTransaction.xml
+++ b/xml/System.Data.SqlClient/SqlTransaction.xml
@@ -69,7 +69,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods. The transaction is rolled back on any error, or if it is disposed without first being committed. `Try`/`Catch` error handling is used to handle any errors when attempting to commit or roll back the transaction.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -133,7 +133,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods. The transaction is rolled back on any error. `Try`/`Catch` error handling is used to handle any errors when attempting to commit or roll back the transaction.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -406,7 +406,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods. The transaction is rolled back on any error. `Try`/`Catch` error handling is used to handle any errors when attempting to commit or roll back the transaction.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -473,7 +473,7 @@
  The following example creates a <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods. The transaction is rolled back on any error. `Try`/`Catch` error handling is used to handle any errors when attempting to commit or roll back the transaction.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlClient/SqlConnection/BeginTransaction/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data.SqlTypes/INullable.xml b/xml/System.Data.SqlTypes/INullable.xml
index 344098b9c8d..24e02e0d736 100644
--- a/xml/System.Data.SqlTypes/INullable.xml
+++ b/xml/System.Data.SqlTypes/INullable.xml
@@ -116,7 +116,7 @@
  The following code example creates a <xref:System.Data.DataTable> with two columns defined as <xref:System.Data.SqlTypes.SqlInt32> and <xref:System.Data.SqlTypes.SqlString>. The code adds one row of known values, one row of null values and then iterates through the <xref:System.Data.DataTable>, assigning the values to variables and displaying the output in the console window.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks SqlTypes.IsNull/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks SqlTypes.IsNull/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data.SqlTypes/INullable/IsNull/source.vb" id="Snippet1":::  
   
  This example displays the following results:  
   
diff --git a/xml/System.Data/AcceptRejectRule.xml b/xml/System.Data/AcceptRejectRule.xml
index 19be7ef14e8..bc9ad030c35 100644
--- a/xml/System.Data/AcceptRejectRule.xml
+++ b/xml/System.Data/AcceptRejectRule.xml
@@ -54,7 +54,7 @@
  The following example creates a <xref:System.Data.ForeignKeyConstraint>, sets various of its properties, including the <xref:System.Data.ForeignKeyConstraint.AcceptRejectRule%2A>, and adds it to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks Data.AcceptRejectRule/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.AcceptRejectRule/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/AcceptRejectRule/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/Constraint.xml b/xml/System.Data/Constraint.xml
index b95843faf44..e767286ea59 100644
--- a/xml/System.Data/Constraint.xml
+++ b/xml/System.Data/Constraint.xml
@@ -76,7 +76,7 @@
  The following example examines the collection of constraints for a <xref:System.Data.DataTable> and determines whether each constraint is a <xref:System.Data.UniqueConstraint> or a <xref:System.Data.ForeignKeyConstraint>. The properties of the constraint are then displayed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Data/Constraint/Overview/constraint.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/Constraint/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -280,7 +280,7 @@
  The following example iterates through the <xref:System.Data.ConstraintCollection> of a <xref:System.Data.DataTable> and prints each <xref:System.Data.Constraint.ConstraintName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Data/Constraint/ConstraintName/constraintname.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.ConstraintName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/Constraint/ConstraintName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -394,7 +394,7 @@
  The following example uses the <xref:System.Data.Constraint.SetDataSet%2A> method to set the <xref:System.Data.DataSet> for a constraint.
 
  :::code language="csharp" source="~/snippets/csharp/System.Data/Constraint/SetDataSet/setdataset.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.SetDataSet Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/Constraint/SetDataSet/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -456,7 +456,7 @@
  The following example returns the <xref:System.Data.DataTable> of a <xref:System.Data.Constraint>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Data/Constraint/Table/table.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.Table Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/Constraint/Table/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -508,7 +508,7 @@
  The following example returns the <xref:System.Data.Constraint.ConstraintName%2A> using the <xref:System.Data.Constraint.ToString%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Data/Constraint/ToString/tostring.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData Constraint.ToString Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/Constraint/ToString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/ConstraintCollection.xml b/xml/System.Data/ConstraintCollection.xml
index 6e482675ca4..194bd7c3093 100644
--- a/xml/System.Data/ConstraintCollection.xml
+++ b/xml/System.Data/ConstraintCollection.xml
@@ -96,7 +96,7 @@
  The first example creates a <xref:System.Data.DataTable>, and adds a <xref:System.Data.DataColumn> (with its <xref:System.Data.DataColumn.Unique%2A> property set to `true`) to the <xref:System.Data.DataColumnCollection>. The second example creates a <xref:System.Data.DataSet>, two <xref:System.Data.DataTable> objects, four columns, and a <xref:System.Data.DataRelation>. The count of constraints is then printed to show that a <xref:System.Data.ForeignKeyConstraint> and a <xref:System.Data.UniqueConstraint> are created when a <xref:System.Data.DataRelation> is added to the <xref:System.Data.DataSet> object's <xref:System.Data.DataRelationCollection.%23ctor%2A>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Data/ConstraintCollection/Overview/constraintcollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -169,7 +169,7 @@
  The following example adds a <xref:System.Data.UniqueConstraint> to the <xref:System.Data.ConstraintCollection> of a <xref:System.Data.DataTable>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Data/ConstraintCollection/Add/add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -251,7 +251,7 @@
  The following example uses the <xref:System.Data.ConstraintCollection.Add%2A> method to create and add a new <xref:System.Data.UniqueConstraint> to a <xref:System.Data.ConstraintCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Data/ConstraintCollection/Add/add2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Add/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -335,7 +335,7 @@
  The following example adds a new <xref:System.Data.ForeignKeyConstraint> to the <xref:System.Data.ConstraintCollection> of a <xref:System.Data.DataTable>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Data/ConstraintCollection/Add/add3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add3 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Add/source3.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -412,7 +412,7 @@
  The following example creates an array of <xref:System.Data.DataColumn> objects that are used to create a new <xref:System.Data.UniqueConstraint> in a specific <xref:System.Data.DataTable>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Data/ConstraintCollection/Add/add1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Add/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -496,7 +496,7 @@
  The following example creates two arrays of <xref:System.Data.DataColumn> objects, and then creates two <xref:System.Data.ForeignKeyConstraint> relationships between two tables in a dataset.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Data/ConstraintCollection/Add/add4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Add4 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Add/source4.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -563,7 +563,7 @@
  The following example creates primary and foreign key constraints, and adds them to the <xref:System.Data.ConstraintCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.AddRange Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.AddRange Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/AddRange/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -624,7 +624,7 @@
  The following example uses the <xref:System.Data.ConstraintCollection.CanRemove%2A> method to determine whether a <xref:System.Data.Constraint> can be removed, before trying to remove it.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.CanRemove Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.CanRemove Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/CanRemove/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -680,7 +680,7 @@
  The following example clears all constraints from the <xref:System.Data.ConstraintCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Clear Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Clear Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Clear/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -742,7 +742,7 @@
  The following example demonstrates how to use the <xref:System.Data.ConstraintCollection.CollectionChanged> event.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.CollectionChanged Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.CollectionChanged Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/CollectionChanged/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -804,7 +804,7 @@
  The following example determines whether the specified <xref:System.Data.Constraint> exists in the <xref:System.Data.ConstraintCollection> before its deletion.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Contains Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Contains Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Contains/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -921,7 +921,7 @@
  The following example uses the <xref:System.Data.ConstraintCollection.IndexOf%2A> method to return the index of a <xref:System.Data.Constraint>. The index is passed to the <xref:System.Data.ConstraintCollection.Contains%2A> method, before it is removed, to determine whether the collection contains the constraint.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.IndexOf1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.IndexOf1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/IndexOf/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -990,7 +990,7 @@
  The following example uses the <xref:System.Data.ConstraintCollection.IndexOf%2A> method to return the index of a <xref:System.Data.Constraint>. The index is passed to the <xref:System.Data.ConstraintCollection.Contains%2A> method to determine whether the collection contains the constraint, before removing it.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.IndexOf Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.IndexOf Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/IndexOf/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1066,7 +1066,7 @@
  The following example gets each <xref:System.Data.Constraint> from the <xref:System.Data.ConstraintCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.this Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.this Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Item/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1138,7 +1138,7 @@
  The following example gets the named <xref:System.Data.Constraint>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Item/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1278,7 +1278,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Remove Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Remove Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Remove/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1344,7 +1344,7 @@
  The following example removes a <xref:System.Data.Constraint> from a <xref:System.Data.ConstraintCollection> after testing for its presence with the <xref:System.Data.ConstraintCollection.Contains%2A> method, and whether it can be removed with the <xref:System.Data.ConstraintCollection.CanRemove%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Remove1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.Remove1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/Remove/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1410,7 +1410,7 @@
  The following example uses the <xref:System.Data.ConstraintCollection.IndexOf%2A> method together with the <xref:System.Data.ConstraintCollection.RemoveAt%2A> method to remove a constraint from the <xref:System.Data.ConstraintCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.RemoveAt Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ConstraintCollection.RemoveAt Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ConstraintCollection/RemoveAt/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataColumn.xml b/xml/System.Data/DataColumn.xml
index 36da783035b..d6c61f77e98 100644
--- a/xml/System.Data/DataColumn.xml
+++ b/xml/System.Data/DataColumn.xml
@@ -99,7 +99,7 @@
  The following example creates a <xref:System.Data.DataTable> with several <xref:System.Data.DataColumn> objects.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -174,7 +174,7 @@
  The following example creates a new <xref:System.Data.DataColumn>, sets various properties, and adds it to a <xref:System.Data.DataColumnCollection> for the <xref:System.Data.DataTable> object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -237,7 +237,7 @@
  The following example creates a new <xref:System.Data.DataColumn> with a specified <xref:System.Data.DataColumn.ColumnName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -311,7 +311,7 @@
  The following example creates a new <xref:System.Data.DataColumn> with a specified <xref:System.Data.DataColumn.ColumnName%2A> and <xref:System.Data.DataColumn.DataType%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -391,7 +391,7 @@
  The following example creates a computed column.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -483,7 +483,7 @@
  The following example constructs a computed column.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn4 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataColumn4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/.ctor/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -553,7 +553,7 @@
  The following example creates a new <xref:System.Data.DataColumn> and sets its <xref:System.Data.DataColumn.AllowDBNull%2A> property to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.AllowDBNull Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.AllowDBNull Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/AllowDBNull/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -634,7 +634,7 @@
  The following example sets the <xref:System.Data.DataColumn.AutoIncrement%2A>, <xref:System.Data.DataColumn.AutoIncrementSeed%2A>, and <xref:System.Data.DataColumn.AutoIncrementStep%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.AutoIncrementSeed Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.AutoIncrementSeed Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/AutoIncrement/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -702,7 +702,7 @@
  The following example sets the <xref:System.Data.DataColumn.AutoIncrement%2A>, <xref:System.Data.DataColumn.AutoIncrementSeed%2A>, and <xref:System.Data.DataColumn.AutoIncrementStep%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.AutoIncrementSeed Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.AutoIncrementSeed Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/AutoIncrement/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -768,7 +768,7 @@
  The following example sets the <xref:System.Data.DataColumn.AutoIncrement%2A>, <xref:System.Data.DataColumn.AutoIncrementSeed%2A>, and <xref:System.Data.DataColumn.AutoIncrementStep%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.AutoIncrementSeed Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.AutoIncrementSeed Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/AutoIncrement/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -836,7 +836,7 @@
  The following example creates a new <xref:System.Data.DataTable>. It then adds three <xref:System.Data.DataColumn> objects to a <xref:System.Data.DataColumnCollection> and sets the <xref:System.Data.DataColumn.Caption%2A> property for each <xref:System.Data.DataColumn>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.Caption Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Caption Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/Caption/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1014,7 +1014,7 @@
  The following example sets the <xref:System.Data.DataColumn.ColumnMapping%2A> type property of new <xref:System.Data.DataColumn>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.ColumnMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ColumnMapping Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/ColumnMapping/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1087,7 +1087,7 @@
  The following examples gets the <xref:System.Data.DataColumn.ColumnName%2A> for every column in every table in a <xref:System.Data.DataSet>. The example also shows how to create a <xref:System.Data.DataColumn> with a new <xref:System.Data.DataColumn.ColumnName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.ColumnName Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ColumnName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/ColumnName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1240,7 +1240,7 @@ myDataTable.Rows[0][0] = newValue;
  The following example adds columns of several data types to a <xref:System.Data.DataTable>, and then adds one row to the table.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataType Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DataType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/DataType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1371,7 +1371,7 @@ myDataTable.Rows[0][0] = newValue;
 ## Examples
  The following example creates several <xref:System.Data.DataColumn> objects that have different data types, and sets appropriate default values to each column.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.DefaultValue Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/DefaultValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1522,7 +1522,7 @@ The following example creates three columns in a <xref:System.Data.DataTable>. T
  The following example adds a custom property to the <xref:System.Data.PropertyCollection> returned by the <xref:System.Data.DataColumn.ExtendedProperties%2A> property. The second example retrieves the custom property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.ExtendedProperties Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ExtendedProperties Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/ExtendedProperties/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1754,7 +1754,7 @@ The following example creates three columns in a <xref:System.Data.DataTable>. T
  The following example returns the column name, ordinal, and data type of a column.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.Ordinal Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Ordinal Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/Ordinal/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1920,7 +1920,7 @@ The following example creates three columns in a <xref:System.Data.DataTable>. T
  The following example creates a <xref:System.Data.DataColumn> and sets its <xref:System.Data.DataColumn.ReadOnly%2A> property `true`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.ReadOnly Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ReadOnly Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/ReadOnly/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2047,7 +2047,7 @@ The following example creates three columns in a <xref:System.Data.DataTable>. T
  The following example returns the parent table of a <xref:System.Data.DataColumn> through its <xref:System.Data.DataColumn.Table%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.Table Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Table Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/Table/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2101,7 +2101,7 @@ The following example creates three columns in a <xref:System.Data.DataTable>. T
  The following example uses the <xref:System.Data.DataColumn.ToString%2A> property to return the default string of each member of a collection of <xref:System.Data.DataColumn> objects.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.ToString Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ToString Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/ToString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2175,7 +2175,7 @@ The following example creates three columns in a <xref:System.Data.DataTable>. T
  The following example creates new <xref:System.Data.DataColumn>, sets its properties, and adds it to a table's columns collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.Unique Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.Unique Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/Unique/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataColumnCollection.xml b/xml/System.Data/DataColumnCollection.xml
index 4ffb3d4c2db..f2d243785c7 100644
--- a/xml/System.Data/DataColumnCollection.xml
+++ b/xml/System.Data/DataColumnCollection.xml
@@ -87,7 +87,7 @@
  The following example iterates through a collection of <xref:System.Data.DataColumn> objects and prints various properties of each column in the collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -167,7 +167,7 @@
 ## Examples
  The following example creates and adds a new <xref:System.Data.DataColumn> to the <xref:System.Data.DataColumnCollection> of a <xref:System.Data.DataTable>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add5 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Add/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -229,7 +229,7 @@
 ## Examples
  The following example adds a <xref:System.Data.DataColumn> to a <xref:System.Data.DataColumnCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -316,7 +316,7 @@
 ## Examples
  The following example creates and adds a new <xref:System.Data.DataColumn> to a <xref:System.Data.DataColumnCollection> of a <xref:System.Data.DataTable>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Add/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -406,7 +406,7 @@
 ## Examples
  The following example creates and adds a new <xref:System.Data.DataColumn> to a <xref:System.Data.DataColumnCollection> of a <xref:System.Data.DataTable>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Add/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -504,7 +504,7 @@
 ## Examples
  The following example creates and adds a new <xref:System.Data.DataColumn> to a <xref:System.Data.DataColumnCollection> of a <xref:System.Data.DataTable>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Add1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Add/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -626,7 +626,7 @@
  The following example first uses the <xref:System.Data.DataColumnCollection.Contains%2A> method to determine whether a particular column is found in the collection. If found, the <xref:System.Data.DataColumnCollection.CanRemove%2A> method tests whether the column can be removed. If so, the column is removed with the <xref:System.Data.DataColumnCollection.Remove%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.CanRemove Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.CanRemove Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/CanRemove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -694,7 +694,7 @@ Another column's expression depends on this column. </exception>
  The following example clears the columns collection.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Clear Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -756,7 +756,7 @@ Another column's expression depends on this column. </exception>
  The following example adds an event handler for the CollectionChanged event.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.CollectionChanged Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.CollectionChanged Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/CollectionChanged/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -817,7 +817,7 @@ Another column's expression depends on this column. </exception>
  The following example uses the <xref:System.Data.DataColumnCollection.Contains%2A> method and the <xref:System.Data.DataColumnCollection.CanRemove%2A> method to determine whether the column can be removed. If so, the column is removed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Contains Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Contains Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Contains/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -940,7 +940,7 @@ Another column's expression depends on this column. </exception>
  The following example uses the <xref:System.Data.DataColumnCollection.Contains%2A> method to determine whether a specified column exists in a <xref:System.Data.DataColumnCollection>. If so, the <xref:System.Data.DataColumnCollection.IndexOf%2A> method returns the index of the column.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.IndexOf Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.IndexOf Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/IndexOf/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1059,7 +1059,7 @@ Another column's expression depends on this column. </exception>
  The following example uses the <xref:System.Data.DataColumnCollection.Item%2A> property to print the <xref:System.Data.DataColumn.ColumnName%2A> value of a <xref:System.Data.DataColumn> object specified by index. The example uses the <xref:System.Data.DataTable> that is contained by a System.Windows.Forms.DataGrid control.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.this Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.this Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1133,7 +1133,7 @@ Another column's expression depends on this column. </exception>
  The following example uses the <xref:System.Data.DataColumnCollection.Item%2A> property to print the <xref:System.Data.DataColumn.DataType%2A> value of a <xref:System.Data.DataColumn> object specified by index.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.this1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Item/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1306,7 +1306,7 @@ Another column's expression depends on this column. </exception>
  The following example uses the <xref:System.Data.DataColumnCollection.Contains%2A> method to determine whether a named column exists. If so, the <xref:System.Data.DataColumnCollection.Item%2A> property returns the column. The <xref:System.Data.DataColumnCollection.CanRemove%2A> method then checks whether the column can be removed; if so, the <xref:System.Data.DataColumnCollection.Remove%2A> method removes it.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Remove Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Remove Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Remove/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1378,7 +1378,7 @@ Another column's expression depends on this column. </exception>
  The following example first uses the <xref:System.Data.DataColumnCollection.Contains%2A> method to determine whether a particular column is found in the collection. If it is found, the <xref:System.Data.DataColumnCollection.CanRemove%2A> method tests whether the column can be removed. If so, the column is removed with the <xref:System.Data.DataColumnCollection.Remove%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Remove1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.Remove1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/Remove/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1438,7 +1438,7 @@ Another column's expression depends on this column. </exception>
 ## Examples
  The following example first uses the <xref:System.Data.DataColumnCollection.Contains%2A> method to determine whether a particular column is found in the collection. If it is found, the <xref:System.Data.DataColumnCollection.CanRemove%2A> method tests whether the column can be removed. If so, the column is removed with the <xref:System.Data.DataColumnCollection.RemoveAt%2A> method.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnCollection.RemoveAt Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumnCollection/RemoveAt/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataRelation.xml b/xml/System.Data/DataRelation.xml
index eaf403e9660..2660f120d90 100644
--- a/xml/System.Data/DataRelation.xml
+++ b/xml/System.Data/DataRelation.xml
@@ -97,7 +97,7 @@
  The following example creates a new <xref:System.Data.DataRelation> and adds it to the <xref:System.Data.DataRelationCollection> of a <xref:System.Data.DataSet>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRelation Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -178,7 +178,7 @@
  The following example creates a new <xref:System.Data.DataRelation> and adds it to the <xref:System.Data.DataRelationCollection> of a <xref:System.Data.DataSet>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation/CS/datarelation.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation/VB/datarelation.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/.ctor/datarelation.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -248,7 +248,7 @@
 ## Examples  
  The following example creates a new <xref:System.Data.DataRelation> and adds it to the <xref:System.Data.DataRelationCollection> of a <xref:System.Data.DataSet>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -325,7 +325,7 @@
 ## Examples  
  The following example creates a new <xref:System.Data.DataRelation> and adds it to the <xref:System.Data.DataRelationCollection> of a <xref:System.Data.DataSet>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -398,7 +398,7 @@
 ## Examples  
  The following example creates a new <xref:System.Data.DataRelation> and adds it to the <xref:System.Data.DataRelationCollection> of a <xref:System.Data.DataSet>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataRelation3 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/.ctor/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -688,7 +688,7 @@
 ## Examples  
  The following example gets the child <xref:System.Data.DataColumn> objects of a <xref:System.Data.DataRelation>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildColumns Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/ChildColumns/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -752,7 +752,7 @@
 ## Examples  
  The following example sets the `UpdateRule`, `DeleteRule`, and `AcceptReject` rule for the `ForeignKeyConstraint` associated with the `DataRelation`.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildKeyConstraint Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/ChildKeyConstraint/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -805,7 +805,7 @@
 ## Examples  
  The following example gets the child <xref:System.Data.DataTable> of a <xref:System.Data.DataRelation>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ChildTable Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/ChildTable/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -877,7 +877,7 @@
 ## Examples  
  The following example gets the <xref:System.Data.DataSet> of a <xref:System.Data.DataRelation>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.DataSet Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/DataSet/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1102,7 +1102,7 @@
 ## Examples  
  The following example gets the array of <xref:System.Data.DataColumn> objects that function as parent columns for the relation.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentColumns Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/ParentColumns/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1161,7 +1161,7 @@
 ## Examples  
  The following example gets the <xref:System.Data.DataRelation.ParentKeyConstraint%2A> of a <xref:System.Data.DataRelation> object.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentKeyConstraint Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/ParentKeyConstraint/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1213,7 +1213,7 @@
 ## Examples  
  The following example gets the parent <xref:System.Data.DataTable> of a <xref:System.Data.DataRelation>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ParentTable Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/ParentTable/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1324,7 +1324,7 @@
 ## Examples  
  The following example uses the <xref:System.Data.DataRelation.RelationName%2A> property to retrieve a <xref:System.Data.DataRelation> from a <xref:System.Data.DataRelationCollection>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.RelationName Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/RelationName/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1382,7 +1382,7 @@
  The following example uses the <xref:System.Data.DataColumn.ToString%2A> property to return the name of the <xref:System.Data.DataRelation> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRelation.ToString Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelation.ToString Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelation/ToString/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataRelationCollection.xml b/xml/System.Data/DataRelationCollection.xml
index 230e617254b..ff44c276335 100644
--- a/xml/System.Data/DataRelationCollection.xml
+++ b/xml/System.Data/DataRelationCollection.xml
@@ -450,7 +450,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRelationCollection.Add1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelationCollection.Add1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelationCollection/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -712,7 +712,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRelationCollection.AddRange Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRelationCollection.AddRange Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRelationCollection/AddRange/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataRow.xml b/xml/System.Data/DataRow.xml
index e01b3b13951..44e8afeaea0 100644
--- a/xml/System.Data/DataRow.xml
+++ b/xml/System.Data/DataRow.xml
@@ -72,7 +72,7 @@
  The following example creates a new <xref:System.Data.DataRow> by calling the <xref:System.Data.DataTable.NewRow%2A> method of the <xref:System.Data.DataTable> object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -184,7 +184,7 @@
  The following example first creates a new <xref:System.Data.DataTable> with one column, and then creates a single <xref:System.Data.DataRow>. As the <xref:System.Data.DataRow> is created, added, modified, and deleted, its <xref:System.Data.DataRow.RowState*> is printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.AcceptChanges Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.AcceptChanges Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/AcceptChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -264,7 +264,7 @@
  The example creates a simple <xref:System.Data.DataTable> with one <xref:System.Data.DataColumn> and five <xref:System.Data.DataRow> objects, and a <xref:System.Data.UniqueConstraint>. A <xref:System.Data.DataTable.RowChanged> event handler is also added to monitor when the row's value is changing. After invoking <xref:System.Data.DataRow.BeginEdit%2A> on the existing rows, the constraint and event are temporarily disabled and the original and proposed values are printed. The <xref:System.Data.DataRow.BeginEdit%2A> is again invoked to set two rows to the same value. When <xref:System.Data.DataRow.EndEdit%2A> is called, the <xref:System.Data.UniqueConstraint> is enforced on the identical values.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.BeginEdit Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/BeginEdit/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -335,7 +335,7 @@
  The following example edits the value of one column in the last row of a <xref:System.Windows.Forms.DataGrid> control. The example uses the <xref:System.Data.DataRow.BeginEdit%2A>, <xref:System.Data.DataRow.EndEdit%2A>, methods to edit the column's value and commit the change to the row.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.CancelEdit Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.CancelEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/CancelEdit/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -404,7 +404,7 @@
  The following example uses the <xref:System.Data.DataRow.HasErrors%2A> to look for errors. If the row has errors, the <xref:System.Data.DataRow.GetColumnsInError%2A> method returns the array of columns with errors that can then be resolved. The <xref:System.Data.DataRow.ClearErrors%2A> method is then called to clear all errors.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.ClearErrors Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.ClearErrors Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/ClearErrors/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -476,7 +476,7 @@
  The following example creates a simple <xref:System.Data.DataTable> with two columns and ten rows. After deleting several <xref:System.Data.DataRow> items with the <xref:System.Data.DataRow.Delete%2A> method, one of the rows is undeleted by invoking <xref:System.Data.DataRow.RejectChanges%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.Delete Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.Delete Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Delete/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -543,7 +543,7 @@
  The following example uses the <xref:System.Data.DataRow.EndEdit%2A> method to end the edit of a <xref:System.Data.DataRow> value if the validation function returns true.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.CancelEdit Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.CancelEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/CancelEdit/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -633,7 +633,7 @@
  The following example uses the <xref:System.Data.DataRow.GetChildRows%2A> to return the child <xref:System.Data.DataRow> objects for every child <xref:System.Data.DataRelation> in a <xref:System.Data.DataTable>. The value of each column in the row is then printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.GetChildRows2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetChildRows2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetChildRows/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -778,7 +778,7 @@
  The following example uses the <xref:System.Data.DataRow.GetChildRows%2A> to return the child <xref:System.Data.DataRow> objects for every child <xref:System.Data.DataRelation> in a <xref:System.Data.DataTable>. The value of each column with the specified version in the row is then printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.GetChildRows3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetChildRows3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetChildRows/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -932,7 +932,7 @@
  The following example sets an error description for a specified <xref:System.Data.DataRow>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetColumnError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1005,7 +1005,7 @@
  The following example sets an error description for a specified <xref:System.Data.DataRow>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetColumnError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1078,7 +1078,7 @@
  The following example sets an error description for a specified <xref:System.Data.DataRow>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetColumnError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1145,7 +1145,7 @@
  The following example uses the <xref:System.Data.DataRow.HasErrors%2A> to look for errors. If the row has errors, the <xref:System.Data.DataRow.GetColumnsInError%2A> method returns the array of columns with errors that can then be resolved. The <xref:System.Data.DataRow.ClearErrors%2A> method is then called to clear all errors.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.ClearErrors Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.ClearErrors Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/ClearErrors/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1224,7 +1224,7 @@
  The following example uses the <xref:System.Data.DataRow.GetParentRow%2A> to return the child <xref:System.Data.DataRow> objects for every child <xref:System.Data.DataRelation> in a <xref:System.Data.DataTable>. The value of each column in the row is then printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetParentRow/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1300,7 +1300,7 @@
  The following example uses the <xref:System.Data.DataRow.GetParentRow%2A> to print a value from each parent row of each <xref:System.Data.DataRow> in a <xref:System.Data.DataTable>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetParentRow/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1370,7 +1370,7 @@
  The following example uses the <xref:System.Data.DataRow.GetParentRow%2A> to return the child <xref:System.Data.DataRow> objects for every child <xref:System.Data.DataRelation> in a <xref:System.Data.DataTable>. The value of each column in the row is then printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetParentRow/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1452,7 +1452,7 @@
  The following example uses the <xref:System.Data.DataRow.GetParentRow%2A> to print a value from each parent row of each <xref:System.Data.DataRow> in a <xref:System.Data.DataTable>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRow1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetParentRow/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1535,7 +1535,7 @@
 ## Examples
  The following example uses the <xref:System.Data.DataRow.GetParentRows%2A> to return the child <xref:System.Data.DataRow> objects for every child <xref:System.Data.DataRelation> in a <xref:System.Data.DataTable>. The value of each column in the row is then printed.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRows2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetParentRows/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1681,7 +1681,7 @@
 ## Examples
  The following example uses the <xref:System.Data.DataRow.GetParentRows%2A> to return the child <xref:System.Data.DataRow> objects for every child <xref:System.Data.DataRelation> in a <xref:System.Data.DataTable>. The value of each column in the row is then printed.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.GetParentRows3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetParentRows/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1825,7 +1825,7 @@
  The following example uses the <xref:System.Data.DataRow.HasErrors%2A> to look for errors. If the row has errors, the <xref:System.Data.DataRow.GetColumnsInError%2A> method returns the array of columns with errors that can then be resolved. The <xref:System.Data.DataRow.ClearErrors%2A> method is then called to clear all errors.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.HasErrors Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.HasErrors Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/HasErrors/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1890,7 +1890,7 @@
 ## Examples
  The following example uses the <xref:System.Data.DataRow.HasVersion%2A> method to determine whether the current value of a column and the proposed value are the same. If so, the edit is canceled. Otherwise, the <xref:System.Data.DataRow.AcceptChanges%2A> method is called to end the edit.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.HasVersion Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/HasVersion/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1963,7 +1963,7 @@
 ## Examples
  The following example prints each column of each row in each table of a <xref:System.Data.DataSet>. If the row is set to a null value, the value is not printed.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/IsNull/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2021,7 +2021,7 @@
 ## Examples
  The following example changes the value of a column to a null value, and then uses the <xref:System.Data.DataRow.IsNull%2A> method to determine whether the value is null.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/IsNull/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2078,7 +2078,7 @@
 ## Examples
  The following example changes the value of a column to a null value, and then uses the <xref:System.Data.DataRow.IsNull%2A> method to determine whether the value is null.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.IsNull1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/IsNull/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2205,7 +2205,7 @@
 ## Examples
  The following examples demonstrate the use of the <xref:System.Data.DataRow.Item%2A> property to get and set the value of a specific column index. The first example gets the value of the first column in any row that a user clicks in a <xref:System.Windows.Forms.DataGrid> control. The second sets a value passed as an argument to the method.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Item/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2271,7 +2271,7 @@
  The following examples demonstrate the use of the <xref:System.Data.DataRow.Item%2A> property to get and set the value of a specific column index. The first example gets the value of the first column in any row that a user clicks in a <xref:System.Windows.Forms.DataGrid> control.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.this Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2336,7 +2336,7 @@
  The following examples demonstrate the use of the <xref:System.Data.DataRow.Item%2A> property to get and set the value of a specific column index. The first example gets the value of the first column in any row that a user clicks in a <xref:System.Windows.Forms.DataGrid> control. The second sets a value passed as an argument to the method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Item/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2406,7 +2406,7 @@
  The following example gets the current value of a clicked cell in the <xref:System.Windows.Forms.DataGrid> control.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.this5 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this5 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Item/source5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2482,7 +2482,7 @@
 ## Examples
  The following example gets the current value of a column through the <xref:System.Data.DataRow.Item%2A> property of the <xref:System.Data.DataRow> object.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Item/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2552,7 +2552,7 @@
  The following example gets the current version of data at a clicked cell of a <xref:System.Windows.Forms.DataGrid> control.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.this4 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.this4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Item/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2622,7 +2622,7 @@
  The following examples show how to get and set values using the <xref:System.Data.DataRow.ItemArray%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.ItemArray Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.ItemArray Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/ItemArray/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2687,7 +2687,7 @@
  The following example creates a simple <xref:System.Data.DataTable> with 2 columns and 10 rows. After several <xref:System.Data.DataRow> items are deleted with the <xref:System.Data.DataRow.Delete%2A> method, one of the rows is undeleted by invoking <xref:System.Data.DataRow.RejectChanges%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.Delete Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.Delete Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Delete/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2746,7 +2746,7 @@
  The following example sets error text for ten rows of a table displayed in a <xref:System.Windows.Forms.DataGrid> control.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.RowError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.RowError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/RowError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2804,7 +2804,7 @@
  The following example first creates a new <xref:System.Data.DataTable> with one column, and then creates a single <xref:System.Data.DataRow>. As the <xref:System.Data.DataRow> is created, added, modified, and deleted, its <xref:System.Data.DataRow.RowState*> is printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.RowState Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.RowState Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/RowState/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2953,7 +2953,7 @@
  The following example sets an error description for a specified <xref:System.Data.DataRow>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetColumnError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3034,7 +3034,7 @@
  The following example sets an error description for a specified <xref:System.Data.DataRow>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetColumnError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3123,7 +3123,7 @@
  The following example sets an error description for a specified <xref:System.Data.DataRow>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetColumnError Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/GetColumnError/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3341,7 +3341,7 @@
 ## Examples
  The following example sets the parent row of a specific child row.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.SetParentRow1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/SetParentRow/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3401,7 +3401,7 @@
  The following example uses the <xref:System.Data.DataRow.Table%2A> property to return a reference to the columns collection of the <xref:System.Data.DataTable>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRow.Table Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRow.Table Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRow/Table/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataRowChangeEventArgs.xml b/xml/System.Data/DataRowChangeEventArgs.xml
index 5e4162ab2fb..815d059c4a2 100644
--- a/xml/System.Data/DataRowChangeEventArgs.xml
+++ b/xml/System.Data/DataRowChangeEventArgs.xml
@@ -60,7 +60,7 @@
 ## Examples  
  The following example adds a <xref:System.Data.DataRowChangeEventHandler> and the procedure to handle the event when a row is changed.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventArgs/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowChangeEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -120,7 +120,7 @@
 ## Examples  
  The following example adds a <xref:System.Data.DataRowChangeEventHandler> and the procedure to handle the event when a row is changed.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventArgs/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowChangeEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -178,7 +178,7 @@
 ## Examples  
  The following example adds a <xref:System.Data.DataRowChangeEventHandler> and the procedure to handle the event when a row is changed.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventArgs/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowChangeEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -236,7 +236,7 @@
 ## Examples  
  The following example adds a <xref:System.Data.DataRowChangeEventHandler> and the procedure to handle the event when a row is changed.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventArgs/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowChangeEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataRowChangeEventHandler.xml b/xml/System.Data/DataRowChangeEventHandler.xml
index 7304b4d50c8..84822edd17e 100644
--- a/xml/System.Data/DataRowChangeEventHandler.xml
+++ b/xml/System.Data/DataRowChangeEventHandler.xml
@@ -63,7 +63,7 @@
  The following example adds a <xref:System.Data.DataRowChangeEventHandler> and the procedure to handle the event when a row is changed. The procedure prints the action and value of the changed row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventHandler/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks Data.DataRowChangeEventHandler/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowChangeEventHandler/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/DataRowCollection.xml b/xml/System.Data/DataRowCollection.xml
index 614c16f8945..8cfeaa5c140 100644
--- a/xml/System.Data/DataRowCollection.xml
+++ b/xml/System.Data/DataRowCollection.xml
@@ -73,7 +73,7 @@
  The first example in this section prints the value of column 1 for every row in a <xref:System.Data.DataRowCollection>. The second example adds a new row created by using the <xref:System.Data.DataTable.NewRow%2A> method to the <xref:System.Data.DataRowCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -148,7 +148,7 @@
  The following example uses the <xref:System.Data.DataRowCollection.Add%2A> method to add a new <xref:System.Data.DataRow> to a <xref:System.Data.DataRowCollection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Add Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Add Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -236,7 +236,7 @@
  The following example uses the <xref:System.Data.DataRowCollection.Add%2A> method to create and add a new <xref:System.Data.DataRow> object to a <xref:System.Data.DataRowCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Add1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Add1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Add/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -362,7 +362,7 @@
 ## Examples  
  The following Visual Basic example uses the <xref:System.Data.DataRowCollection.Contains%2A> method to determine whether a <xref:System.Data.DataRowCollection> object contains a specific value.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Contains Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Contains/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -435,7 +435,7 @@
 ## Examples  
  The following Visual Basic example uses the <xref:System.Data.DataRowCollection.Contains%2A> method to find a particular row in a <xref:System.Data.DataRowCollection> object. The example creates an array of values, one element for each primary key in the table, and then passes the array to the method to return a `true` or `false`.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Contains1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Contains/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -650,7 +650,7 @@
  The following example uses the <xref:System.Data.DataRowCollection.Find%2A> method to find the primary key value "2" in a collection of <xref:System.Data.DataRow> objects. The method returns the specific <xref:System.Data.DataRow> object letting you change its values, as needed.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Find Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Find Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Find/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -722,7 +722,7 @@
  The following example uses the values of an array to find a specific row in a collection of <xref:System.Data.DataRow> objects. The method assumes that a <xref:System.Data.DataTable> exists with three primary key columns. After creating an array of the values, the code uses the <xref:System.Data.DataRowCollection.Find%2A> method with the array to get the particular object that you want.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Find1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Find1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Find/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -929,7 +929,7 @@
  The following example prints the value of column 1 of each row in a <xref:System.Data.DataRowCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.this Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.this Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Item/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1020,7 +1020,7 @@
 ## Examples  
  The following example uses the <xref:System.Data.DataRowCollection.Remove%2A> method to delete a found row in a <xref:System.Data.DataRowCollection> object. The example first uses the <xref:System.Data.DataRowCollection.Contains%2A> method to determine whether the rows collection contains a row. If it does, the <xref:System.Data.DataRowCollection.Find%2A> method is used to find the specific row, and the <xref:System.Data.DataRowCollection.Remove%2A> method is then used to remove the row.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.Remove Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/Remove/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1084,7 +1084,7 @@
 ## Examples  
  The following example removes the last row in a <xref:System.Data.DataRowCollection> by calling the <xref:System.Data.DataRowCollection.RemoveAt%2A> method.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowCollection.RemoveAt Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowCollection/RemoveAt/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataRowState.xml b/xml/System.Data/DataRowState.xml
index 6e76b092c37..bb31aa26fb7 100644
--- a/xml/System.Data/DataRowState.xml
+++ b/xml/System.Data/DataRowState.xml
@@ -60,7 +60,7 @@
  The following example first creates a new <xref:System.Data.DataTable> with one column, then creates a single <xref:System.Data.DataRow>. As the <xref:System.Data.DataRow> is created, added, modified, and deleted, its <xref:System.Data.DataRow.RowState%2A> is printed.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowState Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowState Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowState/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/DataRowVersion.xml b/xml/System.Data/DataRowVersion.xml
index 308b4721bde..c7ab3467752 100644
--- a/xml/System.Data/DataRowVersion.xml
+++ b/xml/System.Data/DataRowVersion.xml
@@ -69,7 +69,7 @@
  The following example checks the <xref:System.Data.DataRowVersion> of a <xref:System.Data.DataRow> before invoking the <xref:System.Data.DataRow.AcceptChanges%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowVersion Example/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowVersion Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowVersion/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/DataRowView.xml b/xml/System.Data/DataRowView.xml
index 5d0b0ad1876..02ad2ec346d 100644
--- a/xml/System.Data/DataRowView.xml
+++ b/xml/System.Data/DataRowView.xml
@@ -84,7 +84,7 @@
  The following example uses the <xref:System.Data.DataRowView.RowVersion%2A> property to determine the state of a row in the <xref:System.Data.DataRowView>. (See <xref:System.Data.DataView.RowFilter%2A> for another example using <xref:System.Data.DataRowView>.)
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataRowView.RowVersion1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataRowView.RowVersion1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -147,7 +147,7 @@
  The following example edits a row in a <xref:System.Data.DataRowView>. calling the <xref:System.Data.DataRowView.BeginEdit%2A> before, and <xref:System.Data.DataRowView.EndEdit%2A> afterwards.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowView.BeginEdit Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/BeginEdit/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -213,7 +213,7 @@
  The following example edits a row in a <xref:System.Data.DataView>. The <xref:System.Data.DataRowView.CancelEdit%2A> method is called to cancel the changes if the validation fails.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowView.BeginEdit Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.BeginEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/BeginEdit/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -465,7 +465,7 @@
  The following example returns the <xref:System.Data.DataView> of the specified <xref:System.Data.DataRowView>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowView.DataView Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.DataView Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/DataView/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -524,7 +524,7 @@
  The following example uses the <xref:System.Data.DataRowView.Delete%2A> method on a row.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowView.Delete Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.Delete Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/Delete/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -578,7 +578,7 @@
 ## Examples
  The following example edits a row in a <xref:System.Data.DataView>. calling the <xref:System.Data.DataRowView.BeginEdit%2A> before, and <xref:System.Data.DataRowView.EndEdit%2A> afterwards.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.EndEdit Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/EndEdit/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -839,7 +839,7 @@ This method checks for reference equality instead of checking whether <xref:Syst
  The following example displays the value in each item of each <xref:System.Data.DataRowView> in a <xref:System.Data.DataView>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowView.this2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.this2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/Item/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -896,7 +896,7 @@ This method checks for reference equality instead of checking whether <xref:Syst
  The following example appends text to the value of a column in each modified row of a <xref:System.Data.DataView>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowView.this Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.this Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1009,7 +1009,7 @@ The <see cref="P:System.Data.DataRowView.DataView" /> doesn't allow edits and <s
  The following example uses the <xref:System.Data.DataRowView.Row%2A> property to print the value of the third column in each modified row of a <xref:System.Data.DataView>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataRowView.Row Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataRowView.Row Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/Row/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1067,7 +1067,7 @@ The <see cref="P:System.Data.DataRowView.DataView" /> doesn't allow edits and <s
  The following example uses the <xref:System.Data.DataRowView.RowVersion%2A> property to display the <xref:System.Data.DataRowVersion>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataRowView.RowVersion1/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataRowView.RowVersion1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataRowView/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataSet.xml b/xml/System.Data/DataSet.xml
index 78000229779..bcd422979d9 100644
--- a/xml/System.Data/DataSet.xml
+++ b/xml/System.Data/DataSet.xml
@@ -125,7 +125,7 @@
 The following example consists of several methods that, combined, create and fill a <xref:System.Data.DataSet> from the **Northwind** database.
 
 :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet Example/CS/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Overview/source.vb" id="Snippet1":::
       ]]></format>
     </example>
     <threadsafe>This type is safe for multithreaded read operations. You must synchronize any write operations.</threadsafe>
@@ -190,7 +190,7 @@ The following example consists of several methods that, combined, create and fil
 ## Examples
  The following example creates a new <xref:System.Data.DataSet>, and adds two <xref:System.Data.DataTable> objects to it.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSet Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -247,7 +247,7 @@ The following example consists of several methods that, combined, create and fil
 ## Examples
  The following example creates a new <xref:System.Data.DataSet>, to which two <xref:System.Data.DataTable> objects are added.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSet1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -456,7 +456,7 @@ The following example consists of several methods that, combined, create and fil
  The following example adds a <xref:System.Data.DataRow> to a <xref:System.Data.DataTable> in a <xref:System.Data.DataSet>. The <xref:System.Data.DataSet.AcceptChanges%2A> method is then called on the <xref:System.Data.DataSet>, which cascades to all <xref:System.Data.DataTable> objects that it contains.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.AcceptChanges/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.AcceptChanges/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/AcceptChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -577,7 +577,7 @@ The following example consists of several methods that, combined, create and fil
 ## Examples
  The following example toggles the <xref:System.Data.DataSet.CaseSensitive%2A> property.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.CaseSensitive Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/CaseSensitive/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -634,7 +634,7 @@ The following example consists of several methods that, combined, create and fil
  The following example clears the <xref:System.Data.DataSet> of all rows in all tables.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Clear Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -694,7 +694,7 @@ The following example consists of several methods that, combined, create and fil
  The following example creates a clone of a <xref:System.Data.DataSet> object's schema.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Clone Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Clone Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Clone/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -752,7 +752,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  The following example uses the <xref:System.Data.DataSet.Copy%2A> method to create a copy of the original <xref:System.Data.DataSet>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Copy Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Copy Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Copy/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -783,7 +783,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
 >  This example shows how to use one of the overloaded versions of `CreateDataReader`. For other examples that might be available, see the individual overload topics.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataSet.CreateDataReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.CreateDataReader/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/CreateDataReader/source.vb" id="Snippet1":::
 
  The example displays the following code in the Console window:
 
@@ -842,7 +842,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  The following example creates three <xref:System.Data.DataTable> instances, and adds each to a <xref:System.Data.DataSet>. The example then passes the filled `DataSet` to a procedure that calls the <xref:System.Data.DataSet.CreateDataReader%2A> method, and proceeds to iterate through all the result sets contained within the <xref:System.Data.DataTableReader>. The example displays the results in the Console window.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataSet.DataTableReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.DataTableReader/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/CreateDataReader/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -909,7 +909,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  This example, a Console application, creates three <xref:System.Data.DataTable> instances and adds each to a <xref:System.Data.DataSet>. The example calls the <xref:System.Data.DataSet.CreateDataReader%2A> method and displays the contents of the returned <xref:System.Data.DataTableReader>. Note that the order of the result sets in the `DataTableReader` is controlled by the order of the `DataTable` instances passed as parameters. The example displays the results in the Console window.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataSet.DataTableReaderTables/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.DataTableReaderTables/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/CreateDataReader/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -971,7 +971,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  The following example creates a new <xref:System.Data.DataSet> with the given <xref:System.Data.DataSet.DataSetName%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSetName Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DataSetName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/DataSetName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1039,7 +1039,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
 ## Examples
  The following example gets the default <xref:System.Data.DataViewManager> for a <xref:System.Data.DataSet>, and adds a <xref:System.Data.DataTable> to the <xref:System.Data.DataTableCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.DefaultViewManager Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/DefaultViewManager/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1284,7 +1284,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  The following example creates a <xref:System.Data.DataSet> with one table, one column, five rows, and one <xref:System.Data.UniqueConstraint>. The <xref:System.Data.DataSet.EnforceConstraints%2A> property is set to `false` and the values of each row are set to the same value. When the <xref:System.Data.DataSet.EnforceConstraints%2A> property is reset to `true`, a <xref:System.Data.ConstraintException> is generated.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.EnforceConstraints Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.EnforceConstraints Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/EnforceConstraints/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1354,7 +1354,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  The following example adds a custom property to the <xref:System.Data.PropertyCollection> returned by the <xref:System.Data.DataColumn.ExtendedProperties%2A> property. The second example retrieves the custom property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumn.ExtendedProperties Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumn.ExtendedProperties Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataColumn/ExtendedProperties/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1424,7 +1424,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  The following example creates a simple <xref:System.Data.DataSet> with one table, two columns, and ten rows. Two values are changed, and one row is added. A subset of the changed data is created using the <xref:System.Data.DataSet.GetChanges%2A> method. After reconciling errors, a new column is added to the subset, changing the schema. When the <xref:System.Data.DataSet.Merge%2A> method is called with the `missingSchemaAction` set to `MissingSchemaAction.Add`, the new column is added to the original <xref:System.Data.DataSet> object's schema.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/GetChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1489,7 +1489,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  The following example uses the <xref:System.Data.DataSet.GetChanges%2A> method to create a second <xref:System.Data.DataSet> object, which is then used to update a data source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/GetChanges/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1772,7 +1772,7 @@ If these classes have been subclassed, the copy will also be of the same subclas
  The following example creates a <xref:System.Data.DataSet> and <xref:System.Data.DataTable>, adds sample data, and then displays the data in XML format.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.GetXml Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetXml Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/GetXml/source.vb" id="Snippet1":::
 
  This sample demonstrates how to write data into an XML file from a DataSet and read data into DataSet from XML. This sample will create one dataset with two tables, use two ways to export a dataset into the XML files (WriteXml and GetXml), and use two ways (ReadXml and InferXmlSchema) to import a dataset from the XML files.
 
@@ -2165,7 +2165,7 @@ class Program {
  The following example creates a <xref:System.Data.DataSet> and <xref:System.Data.DataTable>, and then displays the schema in XML format.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.GetXmlSchema Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetXmlSchema Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/GetXmlSchema/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2230,7 +2230,7 @@ class Program {
  The following example uses the <xref:System.Data.DataSet.GetChanges%2A> method to create a second <xref:System.Data.DataSet> object that is then used to update a data source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.HasChanges Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.HasChanges Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/HasChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2292,7 +2292,7 @@ class Program {
  The following example uses the <xref:System.Data.DataSet.GetChanges%2A> method to create a second <xref:System.Data.DataSet> object, which is then used to update a data source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/GetChanges/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2360,7 +2360,7 @@ class Program {
  The following example uses the <xref:System.Data.DataSet.HasErrors%2A> property to determine whether a <xref:System.Data.DataSet> object contains errors. If so, the errors for each <xref:System.Data.DataRow> in each <xref:System.Data.DataTable> are printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.HasErrors Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.HasErrors Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/HasErrors/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2970,7 +2970,7 @@ class Program {
  The following example creates a new <xref:System.Data.DataSet>, adds two <xref:System.Data.DataTable> instances to the <xref:System.Data.DataSet>, and then fills the <xref:System.Data.DataSet> using the <xref:System.Data.DataSet.Load%2A> method, retrieving data from a <xref:System.Data.DataTableReader> that contains two result sets. Finally, the example displays the contents of the tables in the console window.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataSet.LoadTables/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.LoadTables/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Load/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3055,7 +3055,7 @@ class Program {
  The following Console application example first creates tables and loads data from a reader into a <xref:System.Data.DataSet>, using the `Load` method. The example then adds tables to a <xref:System.Data.DataSet> and attempts to fill the tables with data from a <xref:System.Data.DataTableReader>. In this example, because the parameters passed to the `Load` method indicate a table name that does not exist, the `Load` method creates a new table to match the name passed as a parameter. Once the data has been loaded, the example displays the contents of all its tables in the Console window.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataSet.LoadString/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.LoadString/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Load/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3152,7 +3152,7 @@ class Program {
  The following example adds a table to a <xref:System.Data.DataSet>, and then attempts to use the <xref:System.Data.DataSet.Load%2A> method to load data from a <xref:System.Data.DataTableReader> that contains an incompatible schema. Rather than trapping the error, this example uses a <xref:System.Data.FillErrorEventHandler> delegate to investigate and handle the error. The output is displayed in the console window.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataSet.Load/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataSet.Load/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Load/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3219,7 +3219,7 @@ class Program {
 ## Examples
  The following example gets the <xref:System.Globalization.CultureInfo> for a <xref:System.Data.DataSet> and prints the <xref:System.Globalization.CultureInfo.DisplayName%2A> and <xref:System.Globalization.CultureInfo.EnglishName%2A> properties.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Locale Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Locale/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3366,7 +3366,7 @@ class Program {
  The following example uses the <xref:System.Data.DataSet.GetChanges%2A>, Update, and <xref:System.Data.DataSet.Merge%2A> methods on a <xref:System.Data.DataSet>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Merge/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3443,7 +3443,7 @@ class Program {
  The following example creates a simple <xref:System.Data.DataSet> with one table, two columns, and ten rows. A second <xref:System.Data.DataTable> is created that is identical to the first. Two rows are added to the second table, which is then merged into the <xref:System.Data.DataSet>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Merge/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3519,7 +3519,7 @@ class Program {
  The following example creates a simple <xref:System.Data.DataSet> with one table, two columns, and ten rows. After adding ten rows, two values are changed, and one row is added. A subset of the changed data is created using the <xref:System.Data.DataSet.GetChanges%2A> method. After reconciling errors, the subset data is merged into the original <xref:System.Data.DataSet>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.GetChanges Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/GetChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3671,7 +3671,7 @@ class Program {
  The following example creates a simple <xref:System.Data.DataSet> with one table, two columns, and ten rows. Two values are changed, and one row is added. A subset of the changed data is created using the <xref:System.Data.DataSet.GetChanges%2A> method. After reconciling errors, a new column is added to the subset, changing the schema. When the <xref:System.Data.DataSet.Merge%2A> method is called with the `missingSchemaAction` set to `MissingSchemaAction.Add`, the new column is added to the original <xref:System.Data.DataSet> object's schema.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Merge/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3749,7 +3749,7 @@ class Program {
  The following example creates a simple <xref:System.Data.DataSet> with one table, two columns, and ten rows. A second <xref:System.Data.DataTable> is created that is nearly identical to the first except that a new `DataColumn` is added to the table. Two rows are added to the second table, which is then merged into the <xref:System.Data.DataSet> with the `preserveChanges` argument set to `false`, and the `missingSchemaAction` argument set to `MissingSchemaAction.Add`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge4 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Merge4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Merge/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3817,7 +3817,7 @@ class Program {
  The following example demonstrates the use of the <xref:System.Data.DataSet.MergeFailed> event.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.MergeFailed Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.MergeFailed Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/MergeFailed/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3886,7 +3886,7 @@ class Program {
  The following example sets the <xref:System.Data.DataSet.Prefix%2A> before calling the <xref:System.Data.DataSet.ReadXml%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Namespace Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Namespace Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Namespace/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4062,7 +4062,7 @@ class Program {
  The following example shows a class derived from the <xref:System.Data.DataSet> with the <xref:System.Data.DataSet.OnRemoveTable%2A> method overridden.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.OnRemoveTable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.OnRemoveTable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/OnRemoveTable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4129,7 +4129,7 @@ class Program {
  The following example sets the <xref:System.Data.DataSet.Prefix%2A> before calling the <xref:System.Data.DataSet.ReadXml%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Namespace Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Namespace Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Namespace/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4284,7 +4284,7 @@ class Program {
  The following example first creates a simple <xref:System.Data.DataSet> with one <xref:System.Data.DataTable>, two columns, and ten rows. The <xref:System.Data.DataSet> schema and data are written to disk by invoking the <xref:System.Data.DataSet.WriteXml%2A> method. A second <xref:System.Data.DataSet> is created and the <xref:System.Data.DataSet.ReadXml%2A> method is used to fill it with schema and data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXml/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4388,7 +4388,7 @@ class Program {
  The following example first creates a simple <xref:System.Data.DataSet> with one <xref:System.Data.DataTable>, two columns, and ten rows. The <xref:System.Data.DataSet> schema and data are written to disk by invoking the <xref:System.Data.DataSet.WriteXml%2A> method. A second <xref:System.Data.DataSet> is created and the <xref:System.Data.DataSet.ReadXml%2A> method is used to fill it with schema and data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXml/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4486,7 +4486,7 @@ class Program {
  The following example first creates a simple <xref:System.Data.DataSet> with one <xref:System.Data.DataTable>, two columns, and ten rows. The <xref:System.Data.DataSet> schema and data are written to disk by invoking the <xref:System.Data.DataSet.WriteXml%2A> method. A second <xref:System.Data.DataSet> is created and the <xref:System.Data.DataSet.ReadXml%2A> method is used to fill it with schema and data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXml/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4589,7 +4589,7 @@ class Program {
  The following example first creates a simple <xref:System.Data.DataSet> with one <xref:System.Data.DataTable>, two columns, and ten rows. The <xref:System.Data.DataSet> schema and data are written to disk by invoking the <xref:System.Data.DataSet.WriteXml%2A> method. A second <xref:System.Data.DataSet> is created and the <xref:System.Data.DataSet.ReadXml%2A> method is used to fill it with schema and data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXml/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5059,7 +5059,7 @@ class Program {
  The following example creates a <xref:System.IO.FileStream> object to read an XML schema with, and invokes the <xref:System.Data.DataSet.ReadXmlSchema%2A> method with the object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5142,7 +5142,7 @@ class Program {
  The following example creates a <xref:System.IO.StreamReader> object to read a schema with, and invokes the <xref:System.Data.DataSet.ReadXmlSchema%2A> method with the object.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5220,7 +5220,7 @@ class Program {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5305,7 +5305,7 @@ class Program {
  The following example creates a new <xref:System.Data.DataSet> and <xref:System.IO.FileStream?displayProperty=nameWithType> object. The <xref:System.IO.FileStream> object, created with a file path and file name, is used to create an <xref:System.Xml.XmlTextReader?displayProperty=nameWithType> that is passed as an argument to the <xref:System.Data.DataSet.ReadXmlSchema%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXmlSchema Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXmlSchema/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5422,7 +5422,7 @@ class Program {
  The following example shows a class derived from the <xref:System.Data.DataSet> class. The <xref:System.Data.DataSet.RejectChanges%2A> event is invoked from within a function.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.RejectChanges Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.RejectChanges Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/RejectChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5483,7 +5483,7 @@ class Program {
 ## Examples
  The following example prints the column name of all child tables through the <xref:System.Data.DataSet.Relations%2A> property.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Relations Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Relations/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5698,7 +5698,7 @@ class Program {
  The following examples show a class derived from the <xref:System.Data.DataSet> class. The <xref:System.Data.DataSet.Reset%2A> and <xref:System.Data.DataSet.ShouldSerializeRelations%2A> methods are invoked from within functions in the derived class.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ShouldSerializeRelations Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ShouldSerializeRelations Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ShouldSerializeRelations/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5757,7 +5757,7 @@ class Program {
  The following example shows a class derived from the <xref:System.Data.DataSet> class. The <xref:System.Data.DataSet.ShouldSerializeTables%2A> method is called from within functions in the derived class.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ShouldSerializeTables Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ShouldSerializeTables Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ShouldSerializeTables/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6185,7 +6185,7 @@ class Program {
  The following example returns the <xref:System.Data.DataSet> object's <xref:System.Data.DataTableCollection>, and prints the columns and rows in each table.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.Tables Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.Tables Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/Tables/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6272,7 +6272,7 @@ class Program {
  The following example creates a <xref:System.IO.FileStream?displayProperty=nameWithType> object. The object is then used with the <xref:System.Data.DataSet.WriteXml%2A> method to write an XML document.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/WriteXml/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6625,7 +6625,7 @@ class Program {
  The following example first creates a simple <xref:System.Data.DataSet> with one <xref:System.Data.DataTable>, two columns, and ten rows. The <xref:System.Data.DataSet> schema and data are written to disk by invoking the <xref:System.Data.DataSet.WriteXml%2A> method. A second <xref:System.Data.DataSet> is created and the <xref:System.Data.DataSet.ReadXml%2A> method is used to fill it with schema and data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.ReadXml2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/ReadXml/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6702,7 +6702,7 @@ class Program {
  The following example uses the <xref:System.Data.DataSet.WriteXml%2A> method to write an XML document.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml7 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml7 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/WriteXml/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6782,7 +6782,7 @@ class Program {
  The following example creates a <xref:System.IO.FileStream?displayProperty=nameWithType> object that is used to create a new <xref:System.Xml.XmlTextWriter>. The <xref:System.Xml.XmlTextWriter> object is used with the <xref:System.Data.DataSet.WriteXml%2A> method to write an XML document.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml6 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXml6 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/WriteXml/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6870,7 +6870,7 @@ class Program {
  The following example creates a new <xref:System.IO.FileStream> object that is passed to the <xref:System.Data.DataSet.WriteXmlSchema%2A> method to write the schema to disk.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6947,7 +6947,7 @@ class Program {
  The following example creates a <xref:System.Text.StringBuilder?displayProperty=nameWithType> object to that is used to create a new <xref:System.IO.StringWriter?displayProperty=nameWithType>. The <xref:System.IO.StringWriter> is passed to the <xref:System.Data.DataSet.WriteXmlSchema%2A> method, and the resulting string is printed to the console window.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7019,7 +7019,7 @@ class Program {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7098,7 +7098,7 @@ class Program {
  The following example creates a new <xref:System.IO.FileStream?displayProperty=nameWithType> object with the specified path. The <xref:System.IO.FileStream> object is used to create an <xref:System.Xml.XmlTextWriter> object. The <xref:System.Data.DataSet.WriteXmlSchema%2A> method is then invoked with the <xref:System.Xml.XmlTextWriter> object to write the schema to the disk.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataSet.WriteXmlSchema2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataSet/WriteXmlSchema/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataTable.xml b/xml/System.Data/DataTable.xml
index 35611198089..8a599ae21cd 100644
--- a/xml/System.Data/DataTable.xml
+++ b/xml/System.Data/DataTable.xml
@@ -128,7 +128,7 @@
 The following example creates two <xref:System.Data.DataTable> objects and one <xref:System.Data.DataRelation> object, and adds the new objects to a <xref:System.Data.DataSet>. The tables are then displayed in a <xref:System.Windows.Forms.DataGridView> control.
 
 :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable Example/CS/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Overview/source.vb" id="Snippet1":::
       ]]></format>
     </example>
     <threadsafe>This type is safe for multithreaded read operations. You must synchronize any write operations.</threadsafe>
@@ -201,7 +201,7 @@ The following example creates two <xref:System.Data.DataTable> objects and one <
  The following example creates a new <xref:System.Data.DataTable> with <xref:System.Data.DataColumn> and <xref:System.Data.DataRow>, and displays it in a <xref:System.Windows.Forms.DataGridView> control.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.DataTable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataTable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@ The following example creates two <xref:System.Data.DataTable> objects and one <
  The following example creates a <xref:System.Data.DataTable> and displays it in a <xref:System.Windows.Forms.DataGridView> control.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.DataTable1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataTable1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -427,7 +427,7 @@ The following example creates two <xref:System.Data.DataTable> objects and one <
  The following example tests each table for errors. If the table's errors can be reconciled (by passing it to an undefined function), <xref:System.Data.DataTable.AcceptChanges%2A> is called; otherwise, <xref:System.Data.DataTable.RejectChanges%2A> is called.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.AcceptChanges Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.AcceptChanges Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/AcceptChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -594,7 +594,7 @@ The following example creates two <xref:System.Data.DataTable> objects and one <
  The following example calls the <xref:System.Data.DataTable.Select%2A> method twice on a <xref:System.Data.DataTable>. The first time, the <xref:System.Data.DataTable.CaseSensitive%2A> property is set to `false`, the second, to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.CaseSensitive Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.CaseSensitive Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/CaseSensitive/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -664,7 +664,7 @@ The following example creates two <xref:System.Data.DataTable> objects and one <
  The following example uses the <xref:System.Data.DataTable.ChildRelations%2A> property to return each child <xref:System.Data.DataRelation> in a <xref:System.Data.DataTable>. Each relation is then used as an argument in the <xref:System.Data.DataRow.GetChildRows%2A> method of the <xref:System.Data.DataRow> to return an array of rows. The value of each column in the row is then printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.ChildRelations Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ChildRelations Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ChildRelations/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -726,7 +726,7 @@ The following example creates two <xref:System.Data.DataTable> objects and one <
  The following example clears the table of all data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Clear Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Clear Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Clear/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1354,7 +1354,7 @@ class Program {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.ColumnChanged Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ColumnChanged Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ColumnChanged/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1420,7 +1420,7 @@ class Program {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.ColumnChanging Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ColumnChanging Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ColumnChanging/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1487,7 +1487,7 @@ class Program {
  The following example prints each value of each row in a table using the <xref:System.Data.DataTable.Columns%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Columns Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Columns Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Columns/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1583,7 +1583,7 @@ class Program {
  The following example sums the values of a column named "Total", for the salesperson whose identification number is five.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Compute Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Compute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Compute/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1660,7 +1660,7 @@ class Program {
  The following example adds a <xref:System.Data.ForeignKeyConstraint> to the collection of constraints.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Constraints Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Constraints Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Constraints/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1717,7 +1717,7 @@ class Program {
  The following example uses the <xref:System.Data.DataTable.Copy%2A> method to create a copy of the original <xref:System.Data.DataTable>. The namespace name is not retained if it is inherited from a parent <xref:System.Data.DataTable> or <xref:System.Data.DataSet>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Copy Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Copy Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Copy/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1771,7 +1771,7 @@ class Program {
  The following console application creates a <xref:System.Data.DataTable> instance. The example then passes the filled <xref:System.Data.DataTable> to a procedure that calls the <xref:System.Data.DataTable.CreateDataReader%2A> method, which iterates through the results contained within the <xref:System.Data.DataTableReader>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.CreateDataReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.CreateDataReader/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/CreateDataReader/source.vb" id="Snippet1":::
 
  The example displays the following output in the console window:
 
@@ -1900,7 +1900,7 @@ class Program {
  The following example returns the parent <xref:System.Data.DataSet> of a given table through the <xref:System.Data.DataTable.DataSet%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.DataSet Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DataSet Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/DataSet/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1967,7 +1967,7 @@ class Program {
  The following example sets a property of the <xref:System.Data.DataTable> object's <xref:System.Data.DataView> through the <xref:System.Data.DataTable.DefaultView%2A> property. The example also shows the binding of a <xref:System.Windows.Forms.DataGridView> control to a <xref:System.Data.DataTable> named "Suppliers" that includes a column named "CompanyName."
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.DefaultView Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.DefaultView Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/DefaultView/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2196,7 +2196,7 @@ class Program {
  The following example adds a timestamp value to the <xref:System.Data.DataTable> through the <xref:System.Data.DataTable.ExtendedProperties%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.ExtendedProperties Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ExtendedProperties Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ExtendedProperties/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2305,7 +2305,7 @@ class Program {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.GetChanges Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetChanges Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/GetChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2368,7 +2368,7 @@ class Program {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.GetChanges1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetChanges1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/GetChanges/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2480,7 +2480,7 @@ class Program {
  The following example uses the <xref:System.Data.DataTable.GetErrors%2A> method to return an array of <xref:System.Data.DataRow> objects that have errors.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.GetErrors Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.GetErrors Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/GetErrors/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2709,7 +2709,7 @@ class Program {
  The following example uses the <xref:System.Data.DataTable.HasErrors%2A> property to check if a table contains errors.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.HasErrors Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.HasErrors Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/HasErrors/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2937,7 +2937,7 @@ class Program {
 >  This example shows how to use one of the overloaded versions of `Load`. For other examples that might be available, see the individual overload topics.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableLoad/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Load/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3032,7 +3032,7 @@ class Program {
  The following example demonstrates several of the issues involved with calling the <xref:System.Data.DataTable.Load%2A> method. First, the example focuses on schema issues, including inferring a schema from the loaded <xref:System.Data.IDataReader>, and then handling incompatible schemas, and schemas with missing or additional columns. The example then calls the `Load` method, displaying the data both before and after the load operation.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableLoad.IDataReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.IDataReader/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Load/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3137,7 +3137,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following example demonstrates several of the issues involved with calling the <xref:System.Data.DataTable.Load%2A> method. First, the example focuses on schema issues, including inferring a schema from the loaded <xref:System.Data.IDataReader>, and then handling incompatible schemas, and schemas with missing or additional columns. The example then focuses on data issues, including handling the various loading options.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableLoad.LoadOption/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.LoadOption/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Load/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3252,7 +3252,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableLoad.ErrorEventHandler/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableLoad.ErrorEventHandler/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Load/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3344,7 +3344,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following example uses the <xref:System.Data.DataTable.LoadDataRow%2A> method to attempt to find a row. If no such row is found, the values are used to create a new row.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.LoadDataRow Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.LoadDataRow Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/LoadDataRow/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3487,7 +3487,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following example sets the <xref:System.Globalization.CultureInfo> through the <xref:System.Data.DataTable.Locale%2A> and prints the ISO language name.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Locale Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Locale Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Locale/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3520,7 +3520,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
 >  This example shows how to use one of the overloaded versions of Merge. For other examples that might be available, see the individual overload topics.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableMergeOverload/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableMergeOverload/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Merge/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3589,7 +3589,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following console application creates a simple <xref:System.Data.DataTable> and adds data to the table. The example then creates a copy of the table, adding rows to the copy. Finally, the example calls the <xref:System.Data.DataTable.Merge%2A> method to merge the data in the second table with the data in the first table.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.Merge/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.Merge/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Merge/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3662,7 +3662,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following console application creates a <xref:System.Data.DataTable> containing rows, modifies some of the data in those rows, and attempts to merge data from a different <xref:System.Data.DataTable>. The example demonstrates the different behaviors for the `preserveChanges` parameter.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.MergePreserveChanges/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.MergePreserveChanges/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Merge/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3741,7 +3741,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following console application demonstrates the behavior of the `missingSchemaAction` parameter of the <xref:System.Data.DataTable.Merge%2A> method. This example creates two versions of the same table, modifying the schema for the second version. The code then attempts to merge the second table into the first.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.MergeMissingSchemaAction/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.MergeMissingSchemaAction/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Merge/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3809,7 +3809,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following example sets the <xref:System.Data.DataTable.MinimumCapacity%2A> of a <xref:System.Data.DataTable>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.MinimumCapacity Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.MinimumCapacity Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/MinimumCapacity/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3915,7 +3915,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following example creates a <xref:System.Data.DataTable>, adds two <xref:System.Data.DataColumn> objects that determine the table's schema, and creates several new <xref:System.Data.DataRow> objects using the <xref:System.Data.DataTable.NewRow%2A> method. Those <xref:System.Data.DataRow> objects are then added to the <xref:System.Data.DataRowCollection> using the <xref:System.Data.DataRowCollection.Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.NewRow Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.NewRow Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/NewRow/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4699,7 +4699,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following example uses the <xref:System.Data.DataTable.ParentRelations%2A> property to return each parent <xref:System.Data.DataRelation> in a <xref:System.Data.DataTable>. Each relation is then used as an argument in the <xref:System.Data.DataRow.GetParentRows%2A> method of the <xref:System.Data.DataRow> to return an array of rows. The value of each column in the row is then printed.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.ParentRelations Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ParentRelations Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ParentRelations/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4832,7 +4832,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The first example shows how to return the primary key columns for a <xref:System.Data.DataTable> displayed in a `DataGrid`. The second example demonstrates how to set the primary key columns for a <xref:System.Data.DataTable>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.PrimaryKey Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.PrimaryKey Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/PrimaryKey/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4946,7 +4946,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following example creates a <xref:System.Data.DataTable> containing two columns and ten rows. The example writes the <xref:System.Data.DataTable> schema and data to a memory stream, by invoking the <xref:System.Data.DataTable.WriteXml%2A> method. The example creates a second <xref:System.Data.DataTable> and calls the <xref:System.Data.DataTable.ReadXml%2A> method to fill it with schema and data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXml/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXml/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ReadXml/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5031,7 +5031,7 @@ Not present)|Current = \<Incoming><br /><br /> Original = \<Not available><br />
  The following example creates a <xref:System.Data.DataTable> containing two columns and ten rows. The example writes the <xref:System.Data.DataTable> schema and data to a memory stream, by invoking the <xref:System.Data.DataTable.WriteXml%2A> method. The example creates a second <xref:System.Data.DataTable> and calls the <xref:System.Data.DataTable.ReadXml%2A> method to fill it with schema and data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlText/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlText/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ReadXml/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5133,7 +5133,7 @@ public class A {
  The following example creates a <xref:System.Data.DataTable> containing two columns and ten rows. The example writes the <xref:System.Data.DataTable> schema and data to disk. The example creates a second <xref:System.Data.DataTable> and calls the <xref:System.Data.DataTable.ReadXml%2A> method to fill it with schema and data.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlString/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlString/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ReadXml/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5218,7 +5218,7 @@ public class A {
  The following example creates a <xref:System.Data.DataTable> containing two columns and ten rows. The example writes the <xref:System.Data.DataTable> schema and data to an <xref:System.Xml.XmlReader>. The example creates a second <xref:System.Data.DataTable> and calls the <xref:System.Data.DataTable.ReadXml%2A> method to fill it with schema and data from the <xref:System.Xml.XmlReader> instance.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlXmlReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlXmlReader/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ReadXml/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5324,7 +5324,7 @@ public class A {
  The following console application creates a new <xref:System.Data.DataTable>, and writes the schema for that table to a <xref:System.IO.MemoryStream>. Then, the example creates a new <xref:System.Data.DataTable> and reads its schema from the saved XML schema.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlIOStream/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlIOStream/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5405,7 +5405,7 @@ public class A {
  The following console application creates a new <xref:System.Data.DataTable>, and writes the schema for that table to a <xref:System.IO.MemoryStream>. Then, the example creates a new <xref:System.Data.DataTable> and reads its schema from the saved XML schema, using a <xref:System.IO.StreamReader> (which inherits from <xref:System.IO.TextReader>) as its source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchema/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchema/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5485,7 +5485,7 @@ public class A {
  The following console application creates a new <xref:System.Data.DataTable>, and writes the schema for that table to a file. Then, the example creates a new <xref:System.Data.DataTable> and reads its schema from the saved XML schema, using the file as its source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchemaString/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchemaString/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5567,7 +5567,7 @@ public class A {
  The following console application creates a new <xref:System.Data.DataTable>, and writes the schema for that table to a <xref:System.IO.MemoryStream>. Then, the example creates a new <xref:System.Data.DataTable> and reads its schema from the saved XML schema, using a <xref:System.Xml.XmlTextReader> (which inherits from <xref:System.Xml.XmlReader>) as its source.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchemaReader/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.ReadXmlSchemaReader/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ReadXmlSchema/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5679,7 +5679,7 @@ public class A {
  The following example makes several changes to a <xref:System.Data.DataTable>, but rejects the changes by invoking the <xref:System.Data.DataTable.RejectChanges%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.RejectChanges Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RejectChanges Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/RejectChanges/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5836,7 +5836,7 @@ public class A {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.RowChanged Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowChanged Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/RowChanged/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5901,7 +5901,7 @@ public class A {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.RowChanging Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowChanging Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/RowChanging/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5966,7 +5966,7 @@ public class A {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.RowDeleted Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowDeleted Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/RowDeleted/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6031,7 +6031,7 @@ public class A {
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.RowDeleting Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.RowDeleting Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/RowDeleting/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6100,7 +6100,7 @@ public class A {
  The following shows two examples of returning and setting rows. The first example uses the <xref:System.Data.DataTable.Rows%2A> property and prints the value of each column for every row. The second example uses the <xref:System.Data.DataTable> object's <xref:System.Data.DataTable.NewRow%2A> method to create a new <xref:System.Data.DataRow> object with the schema of the <xref:System.Data.DataTable>. After setting the row values, the row is added to the <xref:System.Data.DataRowCollection> through the `Add` method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Rows Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Rows Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Rows/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6173,7 +6173,7 @@ public class A {
  The following example returns an array of <xref:System.Data.DataRow> objects through the <xref:System.Data.DataTable.Select%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Select Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Select/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6252,7 +6252,7 @@ To ensure the proper sort order, specify sort criteria with <xref:System.Data.Da
  The following example uses a filter expression to return an array of <xref:System.Data.DataRow> objects.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Select1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Select/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6330,7 +6330,7 @@ To ensure the proper sort order, specify sort criteria with <xref:System.Data.Da
  The following example uses a filter expression to return an array of <xref:System.Data.DataRow> objects.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Select2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Select/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6410,7 +6410,7 @@ To ensure the proper sort order, specify sort criteria with <xref:System.Data.Da
  The following example uses a filter expression and record state to return an array of <xref:System.Data.DataRow> objects.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.Select3 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.Select3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/Select/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6951,7 +6951,7 @@ To ensure the proper sort order, specify sort criteria with <xref:System.Data.Da
  The following example prints the <xref:System.Data.DataTable.TableName%2A> for each table in a collection of <xref:System.Data.DataTable> objects.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.TableName Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.TableName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/TableName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7069,7 +7069,7 @@ To ensure the proper sort order, specify sort criteria with <xref:System.Data.Da
  The following example returns the <xref:System.Data.DataTable.TableName%2A> and <xref:System.Data.DataTable.DisplayExpression%2A> using the <xref:System.Data.DataTable.ToString%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTable.ToString Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTable.ToString Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/ToString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7104,7 +7104,7 @@ To ensure the proper sort order, specify sort criteria with <xref:System.Data.Da
 >  This example shows how to use one of the overloaded versions of WriteXml. For other examples that might be available, see the individual overload topics.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlOverload/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlOverload/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/WriteXml/source2.vb" id="Snippet1":::
 
  The example displays the following output in the console window:
 
@@ -7728,7 +7728,7 @@ sdata:PrimaryKey="true">
  The following console application creates two <xref:System.Data.DataTable> instances, adds each to a <xref:System.Data.DataSet>, creates a <xref:System.Data.DataRelation> relating the two tables, and then uses the <xref:System.Data.DataTable.WriteXml%2A> method to write the data contained within the parent table to a <xref:System.IO.TextWriter>. The example demonstrates the behavior when setting the `writeHierarchy` parameter to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXml/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXml/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/WriteXml/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8237,7 +8237,7 @@ sdata:PrimaryKey="true">
  The following console application creates two <xref:System.Data.DataTable> instances, adds each to a <xref:System.Data.DataSet>, creates a <xref:System.Data.DataRelation> relating the two tables, and then uses the <xref:System.Data.DataTable.WriteXml%2A> method to write the data contained within the parent table to a <xref:System.IO.TextWriter>. The example demonstrates the behavior when setting the `writeHierarchy` parameter to each of its values.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlIO/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlIO/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/WriteXml/source1.vb" id="Snippet1":::
 
  The example displays the following output in the console window:
 
@@ -8558,7 +8558,7 @@ sdata:PrimaryKey="true">
 >  This example shows how to use one of the overloaded versions of `WriteXmlSchema` For other examples that might be available, see the individual overload topics.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlSchemaOverload/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlSchemaOverload/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/WriteXmlSchema/source1.vb" id="Snippet1":::
 
  The example displays the following output in the console window:
 
@@ -9042,7 +9042,7 @@ xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
  The following console application creates two <xref:System.Data.DataTable> instances, adds each to a <xref:System.Data.DataSet>, creates a <xref:System.Data.DataRelation> relating the two tables, and then uses the <xref:System.Data.DataTable.WriteXmlSchema%2A> method to write the data contained within the parent table to a <xref:System.IO.TextWriter>. The example demonstrates the behavior when setting the `writeHierarchy` parameter to each of its values.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlSchema/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTable.WriteXmlSchema/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTable/WriteXmlSchema/source.vb" id="Snippet1":::
 
  The example displays the following output in the console window:
 
diff --git a/xml/System.Data/DataTableCollection.xml b/xml/System.Data/DataTableCollection.xml
index a4d7dcf3907..0342117b277 100644
--- a/xml/System.Data/DataTableCollection.xml
+++ b/xml/System.Data/DataTableCollection.xml
@@ -95,7 +95,7 @@
  The first procedure in this example retrieves the <xref:System.Data.DataTableCollection> of a <xref:System.Data.DataSet> and prints the value of each column, in each row, of each table. The second procedure creates a new <xref:System.Data.DataTable> with two columns, and adds it to the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -174,7 +174,7 @@
  The following example adds three new <xref:System.Data.DataTable> objects to the <xref:System.Data.DataTableCollection> using the <xref:System.Data.DataTableCollection.Add%2A> method without arguments.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Add/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -321,7 +321,7 @@
  The following example adds a <xref:System.Data.DataTable> with the given name to the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -395,7 +395,7 @@
  The following example adds a <xref:System.Data.DataTable> with the given name to the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Add1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Add/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@
  The following example creates two <xref:System.Data.DataTable> objects and adds them to the <xref:System.Data.DataTableCollection> of a <xref:System.Data.DataSet>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.AddRange Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.AddRange Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/AddRange/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -511,7 +511,7 @@
  The following example uses the <xref:System.Data.DataTableCollection.CanRemove%2A> to test whether each table can be removed from a <xref:System.Data.DataSet>. If so, the <xref:System.Data.DataTableCollection.Remove%2A> method is called to remove the table.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CanRemove Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CanRemove Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/CanRemove/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -570,7 +570,7 @@
  The following example gets the <xref:System.Data.DataTableCollection> of a <xref:System.Data.DataSet>, and then clears the collection of all tables.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Clear Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Clear Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Clear/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -626,7 +626,7 @@
  The following example demonstrates how to use the <xref:System.Data.DataTableCollection.CollectionChanged> event.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanged Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanged Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/CollectionChanged/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -682,7 +682,7 @@
  The following example demonstrates how to use the <xref:System.Data.DataTableCollection.CollectionChanging> event.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanging Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.CollectionChanging Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/CollectionChanging/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -759,7 +759,7 @@
  The following example tests whether a table with the name "Suppliers" exists in the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Contains Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Contains Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Contains/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -830,7 +830,7 @@
  The following example tests whether a table with the name "Suppliers" exists in the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Contains Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Contains Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Contains/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -964,7 +964,7 @@
  The following example returns the index of each table in the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/IndexOf/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1034,7 +1034,7 @@ This method returns -1 when two or more tables have the same name but different
  The following example returns the index of a named table in the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/IndexOf/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1098,7 +1098,7 @@ This method returns -1 when two or more tables have the same name but different
  The following example returns the index of a named table in the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.IndexOf1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/IndexOf/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1179,7 +1179,7 @@ This method returns -1 when two or more tables have the same name but different
  The following example retrieves a <xref:System.Data.DataTable> by its index.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.this Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.this Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Item/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1246,7 +1246,7 @@ This method returns -1 when two or more tables have the same name but different
  The following example retrieves a single table by name from the <xref:System.Data.DataTableCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Item/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1478,7 +1478,7 @@ This method returns -1 when two or more tables have the same name but different
  The following example uses the <xref:System.Data.DataTableCollection.CanRemove%2A> method to test whether each table can be removed from a <xref:System.Data.DataSet>. If so, the <xref:System.Data.DataTableCollection.Remove%2A> method is called to remove the table.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Remove/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1547,7 +1547,7 @@ This method returns -1 when two or more tables have the same name but different
  The following example uses the <xref:System.Data.DataTableCollection.Contains%2A> and <xref:System.Data.DataTableCollection.CanRemove%2A> methods to test whether a named table exists and can be removed. If so, the <xref:System.Data.DataTableCollection.Remove%2A> method is called to remove the table.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Remove/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1612,7 +1612,7 @@ This method returns -1 when two or more tables have the same name but different
  The following example uses the <xref:System.Data.DataTableCollection.Contains%2A> and <xref:System.Data.DataTableCollection.CanRemove%2A> methods to test whether a named table exists and can be removed. If so, the <xref:System.Data.DataTableCollection.Remove%2A> method is called to remove the table.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.Remove1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/Remove/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1674,7 +1674,7 @@ This method returns -1 when two or more tables have the same name but different
  The following example uses the <xref:System.Data.DataTableCollection.Contains%2A> and <xref:System.Data.DataTableCollection.CanRemove%2A> methods to test whether a table exists with the index 10. If so, the <xref:System.Data.DataTableCollection.RemoveAt%2A> method is called to remove the table.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.RemoveAt/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableCollection.RemoveAt/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableCollection/RemoveAt/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataTableExtensions.xml b/xml/System.Data/DataTableExtensions.xml
index e4478539c76..6723af08f0e 100644
--- a/xml/System.Data/DataTableExtensions.xml
+++ b/xml/System.Data/DataTableExtensions.xml
@@ -108,7 +108,7 @@
  The following example creates a <xref:System.Data.DataView> from the SalesOrderDetail table and sets it as the data source of a <xref:System.Windows.Forms.BindingSource> object, which acts as a proxy for a <xref:System.Windows.Forms.DataGridView> control:
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DP DataView Samples/CS/Form1.cs" id="Snippetcreateldvfromtable":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.vb" id="Snippetcreateldvfromtable":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.vb" id="Snippetcreateldvfromtable":::
 
  ]]></format>
         </remarks>
@@ -198,7 +198,7 @@
  The following example creates a <xref:System.Data.DataView> of online orders ordered by total due:
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DP DataView Samples/CS/Form1.cs" id="Snippetcreateldvfromquery1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.vb" id="Snippetcreateldvfromquery1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.vb" id="Snippetcreateldvfromquery1":::
 
  ]]></format>
         </remarks>
@@ -346,7 +346,7 @@
  The following example queries the SalesOrderHeader table for orders after August 8, 2001, and uses the <xref:System.Data.DataTableExtensions.CopyToDataTable%2A> method to create a <xref:System.Data.DataTable> from that query. The <xref:System.Data.DataTable> is then bound to a <xref:System.Windows.Forms.BindingSource>, which acts as proxy for a <xref:System.Windows.Forms.DataGridView>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/CS/Program.cs" id="Snippetcopytodatatable1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DP LINQ to DataSet Examples/VB/Module1.vb" id="Snippetcopytodatatable1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableExtensions/CopyToDataTableT/Module1.vb" id="Snippetcopytodatatable1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataTableReader.xml b/xml/System.Data/DataTableReader.xml
index d865fd3cf32..b7e3a9aeffc 100644
--- a/xml/System.Data/DataTableReader.xml
+++ b/xml/System.Data/DataTableReader.xml
@@ -163,7 +163,7 @@
  In the following example, the TestConstructor method creates two <xref:System.Data.DataTable> instances. In order to demonstrate this constructor for the <xref:System.Data.DataTableReader> class, the sample creates a new `DataTableReader` based on an array that contains the two `DataTables`, and performs a simple operation, printing the contents from the first few columns to the console window. In order to test this application, create a new Console application, and paste the sample code into the newly created file.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.ctor/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.ctor/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/.ctor/source.vb" id="Snippet1":::  
   
  The Console window displays the following results:  
   
@@ -372,7 +372,7 @@
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBoolean/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBoolean/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetBoolean/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -437,7 +437,7 @@
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetByte/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetByte/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetByte/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -513,7 +513,7 @@
  The following example creates a <xref:System.Data.DataTableReader> based on data in the AdventureWorks sample database, and saves each image retrieved to a separate file in the C:\ folder. In order to test this application, create a new Console application, reference the System.Drawing.dll assembly, and paste the sample code into the newly created file.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBytes/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetBytes/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetBytes/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -579,7 +579,7 @@
  The following example displays the contents of the column numbered 2 within the passed-in DataTableReader. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetChar/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetChar/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetChar/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -657,7 +657,7 @@
  This procedure demonstrates the use of the `GetChars` method reading data that was stored in the `DataTable` as a character array. Any other type of data causes the `GetChars` method to throw an `InvalidCastException`.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetChars/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetChars/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetChars/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -720,7 +720,7 @@
  The following console application displays a list of fields and their type names from a simple <xref:System.Data.DataTable>:  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDataTypeName/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDataTypeName/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetDataTypeName/source.vb" id="Snippet1":::  
   
  The Console window displays the following results:  
   
@@ -790,7 +790,7 @@ Name: String
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDateTime/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDateTime/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetDateTime/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -855,7 +855,7 @@ Name: String
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDecimal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDecimal/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetDecimal/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -920,7 +920,7 @@ Name: String
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDouble/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetDouble/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetDouble/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -988,7 +988,7 @@ Name: String
  The following example demonstrates the use of the <xref:System.Data.DataTableReader.GetEnumerator%2A> method. This includes the behavior of the enumerator when rows are deleted from the underlying <xref:System.Data.DataTable> while the enumerator is active.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetEnumerator/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetEnumerator/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetEnumerator/source.vb" id="Snippet1":::  
   
  The procedure displays the following text in the Console window:  
   
@@ -1057,7 +1057,7 @@ Russ
  Call the following procedure, passing in a <xref:System.Data.DataTableReader> instance in order to display a list of all the fields and the full name for each type in the Console window.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetFieldType/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetFieldType/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetFieldType/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1120,7 +1120,7 @@ Russ
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetFloat/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetFloat/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetFloat/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1185,7 +1185,7 @@ Russ
  The following example displays the contents of the column numbered 2 within the passed-in DataTableReader. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetGuid/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetGuid/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetGuid/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1250,7 +1250,7 @@ Russ
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt16/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt16/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetInt16/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1315,7 +1315,7 @@ Russ
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt32/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt32/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetInt32/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1380,7 +1380,7 @@ Russ
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column is not of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt64/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetInt64/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetInt64/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1443,7 +1443,7 @@ Russ
  The following simple example includes a procedure that lists the names of all the columns within the specified `DataTableReader`, and the column's ordinal position, to the Console window.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetName/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetName/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetName/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1510,7 +1510,7 @@ Russ
  If you have only a column name, in which case the column name is user supplied, and you must retrieve information from the column, you can use a procedure like the following to extract the required information. In this example, the procedure accepts a column name and returns the data that is contained within that column for the current row in the <xref:System.Data.DataTableReader> :  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetOrdinal/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetOrdinal/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1765,7 +1765,7 @@ Russ
  The following console application example retrieves schema information about the specified column. Pass the `DisplaySchemaTableInfo` procedure a <xref:System.Data.DataTableReader> and an integer representing the ordinal position of a column within the `DataTableReader`, and the procedure outputs schema information to the console window.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetSchemaTable/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetSchemaTable/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetSchemaTable/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1825,7 +1825,7 @@ Russ
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetString/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetString/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetString/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1888,7 +1888,7 @@ Russ
  The following example iterates through all the columns within the current row in a <xref:System.Data.DataTableReader>, displaying the contents of each column and the column name. Generally, if your intent is to work with all the columns within a row retrieved by a <xref:System.Data.DataTableReader>, consider using the <xref:System.Data.DataTableReader.GetValues%2A> method instead, because it is more efficient.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValue/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValue/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetValue/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1954,7 +1954,7 @@ Russ
  The following example demonstrates using an array that is the correct size, to read all values from the current row in the supplied <xref:System.Data.DataTableReader>. In addition, the sample demonstrates using a fixed-sized array that could be either smaller or larger than the number of available columns.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValueObject/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.GetValueObject/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/GetValues/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2015,7 +2015,7 @@ Russ
  The following example fills two <xref:System.Data.DataTable> instances with data. The first <xref:System.Data.DataTable> contains one row, and the second contains no rows. The example then creates a <xref:System.Data.DataTableReader> that contains both <xref:System.Data.DataTable> objects, and calls the PrintData method to display the contents of each, checking the value of the <xref:System.Data.DataTableReader.HasRows%2A> property of each before it makes the call to PrintData.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.HasRows/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.HasRows/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/HasRows/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2126,7 +2126,7 @@ Russ
  The following example displays the contents of the column numbered 2 within the passed-in <xref:System.Data.DataTableReader>. If the value the column within a particular row is null, the code displays the text \<NULL>. If the data within the column of the correct type, the example displays an error message for each row.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.IsDbNull/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.IsDbNull/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/IsDBNull/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2198,7 +2198,7 @@ Russ
  The following example displays the contents of all the columns, in all the rows from the supplied <xref:System.Data.DataTableReader>. The code uses the <xref:System.Data.DataTableReader.Item%2A> method (the indexer, in Microsoft C#) to retrieve the value that is contained in each column.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.Item/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.Item/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/Item/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2263,7 +2263,7 @@ Russ
  Given a <xref:System.Data.DataTableReader> and a column name, the GetValueByName procedure returns the value of the specified column. Before calling this procedure, you must create a new <xref:System.Data.DataTableReader> instance and call its Read method at least one time to position the row pointer on a row of data.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.ItemName/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.ItemName/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/Item/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2325,7 +2325,7 @@ Russ
  In the following example, the TestConstructor method creates two <xref:System.Data.DataTable> instances. In order to demonstrate this constructor for the <xref:System.Data.DataTableReader> class, the sample creates a new `DataTableReader` based on an array that contains the two `DataTables`, and performs a simple operation, printing the contents from the first few columns to the console window. In order to test this application, create a new Console application, and paste the sample code into the newly created file.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.NextResult/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.NextResult/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/NextResult/source.vb" id="Snippet1":::  
   
  The Console window displays the following results:  
   
@@ -2396,7 +2396,7 @@ Russ
  The PrintColumns procedure loops through all the rows in the <xref:System.Data.DataTableReader>, displaying the contents of each column in the Console window.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataTableReader.Read/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataTableReader.Read/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableReader/Read/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/DataView.xml b/xml/System.Data/DataView.xml
index d3e176d296d..acb3504d30e 100644
--- a/xml/System.Data/DataView.xml
+++ b/xml/System.Data/DataView.xml
@@ -141,12 +141,12 @@
  The following example creates a single <xref:System.Data.DataTable> with one column and five rows. Two <xref:System.Data.DataView> objects are created and the <xref:System.Data.DataView.RowStateFilter%2A> is set on each to show different views of the table data. The values are then printed.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/Overview/source.vb" id="Snippet1":::  
   
  The following example creates a <xref:System.Data.DataView> of online orders ordered by total due from a LINQ to DataSet query:  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DP DataView Samples/CS/Form1.cs" id="Snippetcreateldvfromquery1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DP DataView Samples/VB/Form1.vb" id="Snippetcreateldvfromquery1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataTableExtensions/AsDataView/Form1.vb" id="Snippetcreateldvfromquery1":::  
   
  ]]></format>
     </remarks>
@@ -209,7 +209,7 @@
  The following example creates a new <xref:System.Data.DataView>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.DataView Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -264,7 +264,7 @@
  The following example creates a new <xref:System.Data.DataView> with the specified <xref:System.Data.DataTable>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.DataView1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -336,7 +336,7 @@
  The following example creates a new <xref:System.Data.DataView> with the specified <xref:System.Data.DataTable>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.DataView2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.DataView2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/.ctor/source2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -389,7 +389,7 @@
  The following example uses the <xref:System.Data.DataView.AddNew%2A> method to return a new <xref:System.Data.DataRowView> that has been added to the <xref:System.Data.DataTable>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.AddNew Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AddNew Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/AddNew/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@
  The following example checks the <xref:System.Data.DataView.AllowDelete%2A> property before deleting a <xref:System.Data.DataRow> from a <xref:System.Data.DataView>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.AllowDelete Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowDelete Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/AllowDelete/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -517,7 +517,7 @@
  The following example invokes the <xref:System.Data.DataView.AllowEdit%2A> method before editing a row in a <xref:System.Data.DataView>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.AllowEdit Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowEdit Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/AllowEdit/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -583,7 +583,7 @@
  The following example sets the <xref:System.Data.DataView.AllowNew%2A> property to true before adding a new row with the <xref:System.Data.DataView.AddNew%2A> method.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.AllowNew Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.AllowNew Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/AllowNew/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1010,7 +1010,7 @@
 ## Examples  
  The following example uses the <xref:System.Data.DataView.Delete%2A> method to delete a row.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Delete Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/Delete/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1230,7 +1230,7 @@
 ## Examples  
  The following Visual Basic example uses the <xref:System.Data.DataView.Find%2A> method to return the index of the row that contains the value in the sort key column that you want.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Find Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/Find/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1294,7 +1294,7 @@
 ## Examples  
  The following Visual Basic example uses the <xref:System.Data.DataView.Find%2A> method to return the index of a row that contains specified values in its sort key columns.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Find1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/Find/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1778,7 +1778,7 @@
  The following example adds a handler for the <xref:System.Data.DataView.ListChanged> event of a <xref:System.Data.DataView>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.ListChanged Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.ListChanged Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/ListChanged/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1995,7 +1995,7 @@
  The following example creates a <xref:System.Data.DataView> and sets its <xref:System.Data.DataView.RowFilter%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.RowFilter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.RowFilter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/RowFilter/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2071,7 +2071,7 @@
  The following example creates a <xref:System.Data.DataTable> with a single column, and then changes the data and sets the <xref:System.Data.DataView.RowStateFilter%2A> of the <xref:System.Data.DataView> to display different row sets, depending on the <xref:System.Data.DataViewRowState>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.RowStateFilter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.RowStateFilter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/RowStateFilter/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -2147,7 +2147,7 @@
  The following example instructs the <xref:System.Data.DataView> to sort the table by two columns.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.Sort Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Sort Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/Sort/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -4082,7 +4082,7 @@
  The following example gets the <xref:System.Data.DataTable> of the current <xref:System.Data.DataView>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.Table Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.Table Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/Table/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -4161,7 +4161,7 @@
  The following console application example creates a <xref:System.Data.DataTable>, fills the <xref:System.Data.DataTable> with data, creates a filtered view based on the original data, and finally, creates a <xref:System.Data.DataTable> that contains the filtered rows.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataView.ToTableFiltered/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableFiltered/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/ToTable/source.vb" id="Snippet1":::  
   
  The example displays the following text in the console window:  
   
@@ -4250,7 +4250,7 @@ New table name: NewTable
  The following console application example creates a <xref:System.Data.DataTable>, fills the `DataTable` with data, creates a filtered view based on the original data, and finally creates a `DataTable` with a new name that contains the filtered rows.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataView.ToTableNewName/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableNewName/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/ToTable/source1.vb" id="Snippet1":::  
   
  The example displays the following text in the console window:  
   
@@ -4340,7 +4340,7 @@ New table name: FilteredTable
  The following console application example creates a <xref:System.Data.DataTable>, fills the <xref:System.Data.DataTable> with data, sorts the <xref:System.Data.DataView>, and finally creates a <xref:System.Data.DataTable> with just two columns, limited to rows in which all values are unique.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataView.ToTableUniqueValues/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableUniqueValues/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/ToTable/source2.vb" id="Snippet1":::  
   
  The example displays the following output in the console window:  
   
@@ -4448,7 +4448,7 @@ New table name: NewTable
  The following console application example creates a <xref:System.Data.DataTable>, fills the <xref:System.Data.DataTable> with data, sorts the <xref:System.Data.DataView>, and finally creates a <xref:System.Data.DataTable> with a new name that contains just two columns, limited to rows in which all values are unique.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DataView.ToTableUniqueValuesName/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DataView.ToTableUniqueValuesName/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/ToTable/source3.vb" id="Snippet1":::  
   
  The example displays the following output in the console window:  
   
diff --git a/xml/System.Data/DataViewRowState.xml b/xml/System.Data/DataViewRowState.xml
index 8fca7c8f710..6eb2d996420 100644
--- a/xml/System.Data/DataViewRowState.xml
+++ b/xml/System.Data/DataViewRowState.xml
@@ -78,7 +78,7 @@
  In the following example <xref:System.Data.DataTable> is created with a single column. The data is changed, and the <xref:System.Data.DataView.RowStateFilter%2A> of the <xref:System.Data.DataView> is set to display different row sets, depending on the <xref:System.Data.DataViewRowState>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataView.RowStateFilter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataView.RowStateFilter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/DataView/RowStateFilter/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/ForeignKeyConstraint.xml b/xml/System.Data/ForeignKeyConstraint.xml
index 18918f8a6aa..553f02b00ec 100644
--- a/xml/System.Data/ForeignKeyConstraint.xml
+++ b/xml/System.Data/ForeignKeyConstraint.xml
@@ -95,7 +95,7 @@
 ## Examples
  The following example creates a <xref:System.Data.ForeignKeyConstraint>, sets some of its properties, and adds it to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -162,7 +162,7 @@
 ## Examples
  The following example creates a new <xref:System.Data.ForeignKeyConstraint>, sets some of its properties, and adds it to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -220,7 +220,7 @@
 ## Examples
  The following example creates a new <xref:System.Data.ForeignKeyConstraint>, sets some of its properties, and adds it to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -288,7 +288,7 @@
 ## Examples
  The following example creates a new <xref:System.Data.ForeignKeyConstraint>, sets some of its properties, and adds it to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -356,7 +356,7 @@
 ## Examples
  The following example creates a new <xref:System.Data.ForeignKeyConstraint>, sets some of its properties, and adds it to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.ForeignKeyConstraint3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -588,7 +588,7 @@
 ## Examples
  The following example creates a <xref:System.Data.ForeignKeyConstraint>, sets its <xref:System.Data.ForeignKeyConstraint.AcceptRejectRule%2A>, and adds the constraint to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.DeleteRule Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/AcceptRejectRule/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -649,7 +649,7 @@
 ## Examples
  The following example returns an array of <xref:System.Data.DataColumn> objects through the <xref:System.Data.ForeignKeyConstraint.Columns%2A> property.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Columns Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/Columns/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -722,7 +722,7 @@
 ## Examples
  The following example creates a ForeignKeyConstraint, sets various of its properties, and adds it to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.DeleteRule Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/AcceptRejectRule/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -786,7 +786,7 @@
  The following example creates a new <xref:System.Data.ForeignKeyConstraint> and checks it against other collection members with the <xref:System.Data.ForeignKeyConstraint.Equals%2A> method before adding it to a <xref:System.Data.ConstraintCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Equals Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Equals Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/Equals/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1002,7 +1002,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.Table Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/Table/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1066,7 +1066,7 @@
 ## Examples
  The following example creates a <xref:System.Data.ForeignKeyConstraint>, sets various of its properties, and adds it to a <xref:System.Data.DataTable> object's <xref:System.Data.ConstraintCollection>.
 
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint.DeleteRule Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/AcceptRejectRule/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IColumnMapping.xml b/xml/System.Data/IColumnMapping.xml
index 5a138557eb0..0f88a33917f 100644
--- a/xml/System.Data/IColumnMapping.xml
+++ b/xml/System.Data/IColumnMapping.xml
@@ -57,7 +57,7 @@
  The following example creates an instance of the derived class, <xref:System.Data.Common.DataColumnMapping>, and adds it to a <xref:System.Data.Common.DataColumnMappingCollection> collection. It then tells the user that the mapping was added to the collection and shows the parent for the mapping.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -125,7 +125,7 @@
  The following example creates an instance of the derived class, <xref:System.Data.Common.DataColumnMapping>, and sets its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMapping/DataSetColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -176,7 +176,7 @@
  The following example creates an instance of the derived class, <xref:System.Data.Common.DataColumnMapping>, and sets its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMapping.DataSetColumn Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMapping/DataSetColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IColumnMappingCollection.xml b/xml/System.Data/IColumnMappingCollection.xml
index 90ec3894102..2ce9132758e 100644
--- a/xml/System.Data/IColumnMappingCollection.xml
+++ b/xml/System.Data/IColumnMappingCollection.xml
@@ -68,7 +68,7 @@
  The following example uses an instance of the derived class, <xref:System.Data.Common.DataTableMapping>, to <xref:System.Data.Common.DataColumnMappingCollection.Add%2A> several <xref:System.Data.Common.DataColumnMapping> objects to its <xref:System.Data.Common.DataTableMapping.ColumnMappings%2A> collection, and then displays a list of those mapped source tables. This example assumes that a <xref:System.Data.Common.DataTableMapping> has already been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMappingCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -276,7 +276,7 @@
  The following example searches for an instance of the derived class, <xref:System.Data.Common.DataColumnMapping>, with the given source column name within a <xref:System.Data.Common.DataColumnMappingCollection> collection. If the <xref:System.Data.Common.DataColumnMapping> exists, the example displays the name and the index of the mapping. If the mapping does not exist, the example displays an error. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.this1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMappingCollection/IndexOf/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -375,7 +375,7 @@
  The following example searches for an instance of the derived class, <xref:System.Data.Common.DataColumnMapping>, with the given `SourceColumn` name within a <xref:System.Data.Common.DataColumnMappingCollection> collection. If the <xref:System.Data.Common.DataColumnMapping> exists, the mapping is removed. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> collection has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt1 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataColumnMappingCollection.RemoveAt1 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IColumnMappingCollection/RemoveAt/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IDataAdapter.xml b/xml/System.Data/IDataAdapter.xml
index 1e05526b89a..687103866e9 100644
--- a/xml/System.Data/IDataAdapter.xml
+++ b/xml/System.Data/IDataAdapter.xml
@@ -59,7 +59,7 @@
  The following example uses the derived classes, <xref:System.Data.SqlClient.SqlCommand>, <xref:System.Data.SqlClient.SqlDataAdapter>, and <xref:System.Data.SqlClient.SqlConnection>, to select records from a database. The filled <xref:System.Data.DataSet> is then returned. To do this, the method is passed an initialized <xref:System.Data.DataSet>, a connection string, and a query string that is a Transact-SQL SELECT statement.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataAdapter/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -560,7 +560,7 @@ private static void GetParameters(string connectionString)
  The following example uses the derived class, <xref:System.Data.OleDb.OleDbDataAdapter>, to <xref:System.Data.Common.DataAdapter.Update%2A> the data source. This example assumes that you have created an <xref:System.Data.OleDb.OleDbDataAdapter> and a <xref:System.Data.DataSet>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataAdapter.IDataAdapter.Update Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataAdapter.IDataAdapter.Update Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataAdapter/Update/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IDataParameter.xml b/xml/System.Data/IDataParameter.xml
index 0d284bddd2e..a33c31711e5 100644
--- a/xml/System.Data/IDataParameter.xml
+++ b/xml/System.Data/IDataParameter.xml
@@ -58,7 +58,7 @@
  The following example creates multiple instances of the derived class, <xref:System.Data.SqlClient.SqlParameter>, through the <xref:System.Data.SqlClient.SqlParameterCollection> collection within the <xref:System.Data.SqlClient.SqlDataAdapter>. These parameters are used to select data from the data source and place the data in the <xref:System.Data.DataSet>. This example assumes that a <xref:System.Data.DataSet> and a <xref:System.Data.SqlClient.SqlDataAdapter> have already been created with the appropriate schema, commands, and connection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -204,7 +204,7 @@
  The following example creates an instance of the implementing class, <xref:System.Data.SqlClient.SqlParameter>, and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Direction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Direction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/Direction/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -263,7 +263,7 @@
  The following example creates an instance of the implementing class, <xref:System.Data.SqlClient.SqlParameter>, and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.IsNullable Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.IsNullable Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/IsNullable/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -321,7 +321,7 @@
  The following example creates an instance of the implementing class, <xref:System.Data.SqlClient.SqlParameter>, and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.ParameterName Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.ParameterName Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/ParameterName/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -378,7 +378,7 @@
  The following example creates an instance of the implementing class, <xref:System.Data.SqlClient.SqlParameter>, and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SourceColumn Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SourceColumn Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/SourceColumn/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -435,7 +435,7 @@
  The following example creates an instance of the implementing class, <xref:System.Data.SqlClient.SqlParameter>, and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SourceVersion Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.SourceVersion Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/SourceVersion/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -506,7 +506,7 @@
  The following example creates an instance of the implementing class, <xref:System.Data.SqlClient.SqlParameter>, and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Value Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlParameter.Value Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataParameter/Value/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IDataReader.xml b/xml/System.Data/IDataReader.xml
index ff0f01b17a4..060c0da6460 100644
--- a/xml/System.Data/IDataReader.xml
+++ b/xml/System.Data/IDataReader.xml
@@ -68,7 +68,7 @@
  The following example creates instances of the derived classes, <xref:System.Data.SqlClient.SqlConnection>, <xref:System.Data.SqlClient.SqlCommand>, and <xref:System.Data.SqlClient.SqlDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.SqlClient.SqlDataReader>, then the <xref:System.Data.SqlClient.SqlConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -338,7 +338,7 @@ Returns <see langword="null" /> if the executed command returned no resultset, o
  By default, the data reader is positioned on the first result.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/idatareader_nextresult/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/idatareader_nextresult/vb/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/NextResult/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -399,7 +399,7 @@ Returns <see langword="null" /> if the executed command returned no resultset, o
  The following example creates instances of three derived classes <xref:System.Data.OleDb.OleDbConnection>, an <xref:System.Data.OleDb.OleDbCommand>, and an <xref:System.Data.OleDb.OleDbDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.OleDb.OleDbDataReader>, then the <xref:System.Data.OleDb.OleDbConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDataReader.Read Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Read/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IDataRecord.xml b/xml/System.Data/IDataRecord.xml
index fbb25fa286f..561ae0b16e6 100644
--- a/xml/System.Data/IDataRecord.xml
+++ b/xml/System.Data/IDataRecord.xml
@@ -97,7 +97,7 @@
  The following example creates instances of the derived classes, <xref:System.Data.SqlClient.SqlConnection>, <xref:System.Data.SqlClient.SqlCommand>, and <xref:System.Data.SqlClient.SqlDataReader>. The example reads through the data, writing it out to the console. Finally, the example closes the <xref:System.Data.SqlClient.SqlDataReader>, and then the <xref:System.Data.SqlClient.SqlConnection>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataReader.Read Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataReader/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -1075,7 +1075,7 @@
  The following example demonstrates how to use the inherited <xref:System.Data.Odbc.OdbcDataReader.GetOrdinal%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader.GetOrdinal/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcDataReader.GetOrdinal/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataRecord/GetOrdinal/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IDbCommand.xml b/xml/System.Data/IDbCommand.xml
index b45818e9a0c..ecc36f57143 100644
--- a/xml/System.Data/IDbCommand.xml
+++ b/xml/System.Data/IDbCommand.xml
@@ -62,7 +62,7 @@
  The following example creates instances of the derived classes, <xref:System.Data.SqlClient.SqlConnection>, <xref:System.Data.SqlClient.SqlCommand>, and <xref:System.Data.SqlClient.SqlDataReader>. The example reads through the data, writing it to the console. Finally, the example closes the <xref:System.Data.SqlClient.SqlDataReader>, then the <xref:System.Data.SqlClient.SqlConnection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -199,7 +199,7 @@
  The following example creates an instance of a derived class, <xref:System.Data.OleDb.OleDbCommand> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandText Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandText Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/CommandText/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -253,7 +253,7 @@
  The following example creates an instance of a derived class, <xref:System.Data.SqlClient.SqlCommand> and sets some of its properties.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandTimeout Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.CommandTimeout Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/CommandTimeout/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -467,7 +467,7 @@
  The following example creates an instance of the derived class, <xref:System.Data.OleDb.OleDbCommand>, and then executes it. To accomplish this, the method is passed a string that is a SQL SELECT statement and a string to use to connect to the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.ExecuteNonQuery Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/ExecuteNonQuery/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -653,7 +653,7 @@ Int32 count = (int) ExecuteScalar();
  The following example creates an instance of the derived class, <xref:System.Data.SqlClient.SqlCommand>, and then executes it using <xref:System.Data.SqlClient.SqlCommand.ExecuteScalar%2A>. The example is passed a string that is a Transact-SQL statement that returns an aggregate result, and a string to use to connect to the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteScalar/CS/mysample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteScalar/VB/mysample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/ExecuteScalar/mysample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -705,7 +705,7 @@ Int32 count = (int) ExecuteScalar();
  The following example creates an instance of the derived class, <xref:System.Data.SqlClient.SqlCommand>, and displays its parameters. In the example, the application passes a <xref:System.Data.SqlClient.SqlConnection>, a query string that is a Transact-SQL SELECT statement, and an array of <xref:System.Data.SqlClient.SqlParameter> objects.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDbCommand.Parameters Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbCommand.Parameters Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/Parameters/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -763,7 +763,7 @@ Int32 count = (int) ExecuteScalar();
  The following example creates an instance of the derived class, <xref:System.Data.OleDb.OleDbCommand>, and opens the connection. The example then prepares a stored procedure on the data source by passing a string that is a SQL Select statement and a string to use to connect to the data source.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbCommand.Prepare Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbCommand/Prepare/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IDbConnection.xml b/xml/System.Data/IDbConnection.xml
index d49c5930b38..c23a531233c 100644
--- a/xml/System.Data/IDbConnection.xml
+++ b/xml/System.Data/IDbConnection.xml
@@ -62,7 +62,7 @@
  The following example creates instances of the derived classes, <xref:System.Data.SqlClient.SqlCommand> and <xref:System.Data.SqlClient.SqlConnection>. The <xref:System.Data.SqlClient.SqlConnection> is opened and set as the <xref:System.Data.SqlClient.SqlCommand.Connection%2A> for the <xref:System.Data.SqlClient.SqlCommand>. The example then calls <xref:System.Data.SqlClient.SqlCommand.ExecuteNonQuery%2A>, and closes the connection. To accomplish this, the <xref:System.Data.SqlClient.SqlCommand.ExecuteNonQuery%2A> is passed a connection string and a query string that is a Transact-SQL INSERT statement.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbConnection/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -348,7 +348,7 @@
  The following example creates an instance of a derived class, <xref:System.Data.OleDb.OleDbConnection>, sets its <xref:System.Data.OleDb.OleDbConnection.ConnectionString%2A>, and displays its <xref:System.Data.OleDb.OleDbConnection.State%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDbConnection.ConnectionString Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbConnection.ConnectionString Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbConnection/ConnectionString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -595,7 +595,7 @@
  The following example creates an instance of a derived class, <xref:System.Data.OleDb.OleDbConnection>, sets its <xref:System.Data.IDbConnection.ConnectionString%2A>, and displays its <xref:System.Data.IDbConnection.State%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData IDbConnection.ConnectionString Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData IDbConnection.ConnectionString Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbConnection/ConnectionString/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IDbDataAdapter.xml b/xml/System.Data/IDbDataAdapter.xml
index 2243c7f5834..9072d6f5076 100644
--- a/xml/System.Data/IDbDataAdapter.xml
+++ b/xml/System.Data/IDbDataAdapter.xml
@@ -61,7 +61,7 @@
  The following example uses the derived classes, <xref:System.Data.SqlClient.SqlCommand>, <xref:System.Data.SqlClient.SqlDataAdapter> and <xref:System.Data.SqlClient.SqlConnection>, to select records from a data source. The filled <xref:System.Data.DataSet> is then returned. To accomplish this, the method is passed an initialized <xref:System.Data.DataSet>, a connection string, and a query string that is a Transact-SQL SELECT statement.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlDataAdapter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDataAdapter/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -147,7 +147,7 @@
  The following example creates an instance of the inherited <xref:System.Data.OleDb.OleDbDataAdapter> class, and sets the <xref:System.Data.OleDb.OleDbDataAdapter.SelectCommand%2A> and <xref:System.Data.OleDb.OleDbDataAdapter.DeleteCommand%2A> properties. It assumes you have already created an <xref:System.Data.OleDb.OleDbConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.DeleteCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.DeleteCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/DeleteCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
  The following example creates an instance of the inherited <xref:System.Data.OleDb.OleDbDataAdapter> class, and sets the <xref:System.Data.OleDb.OleDbDataAdapter.SelectCommand%2A> and <xref:System.Data.OleDb.OleDbDataAdapter.InsertCommand%2A> properties. It assumes you have already created an <xref:System.Data.OleDb.OleDbConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.InsertCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.InsertCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/InsertCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@
  The following example creates an instance of the inherited <xref:System.Data.OleDb.OleDbDataAdapter> class, and sets the <xref:System.Data.OleDb.OleDbDataAdapter.SelectCommand%2A> and <xref:System.Data.OleDb.OleDbDataAdapter.InsertCommand%2A> properties. It assumes you have already created an <xref:System.Data.OleDb.OleDbConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.SelectCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DbDataAdapter.SelectCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/SelectCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -330,7 +330,7 @@
  The following example creates an instance of the inherited <xref:System.Data.OleDb.OleDbDataAdapter> class, and sets the <xref:System.Data.OleDb.OleDbDataAdapter.SelectCommand%2A> and <xref:System.Data.OleDb.OleDbDataAdapter.UpdateCommand%2A> properties. It assumes you have already created an <xref:System.Data.OleDb.OleDbConnection> object.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.UpdateCommand Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OleDbDataAdapter.UpdateCommand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbDataAdapter/UpdateCommand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/IDbTransaction.xml b/xml/System.Data/IDbTransaction.xml
index ced0e296104..711ec357f52 100644
--- a/xml/System.Data/IDbTransaction.xml
+++ b/xml/System.Data/IDbTransaction.xml
@@ -62,7 +62,7 @@
  The following example creates instances of the derived classes, <xref:System.Data.SqlClient.SqlConnection> and <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -117,7 +117,7 @@
  The following example creates instances of the derived classes, <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -282,7 +282,7 @@
  The following example creates instances of the derived classes, <xref:System.Data.SqlClient.SqlConnection> and a <xref:System.Data.SqlClient.SqlTransaction>. It also demonstrates how to use the <xref:System.Data.SqlClient.SqlConnection.BeginTransaction%2A>, <xref:System.Data.SqlClient.SqlTransaction.Commit%2A>, and <xref:System.Data.SqlClient.SqlTransaction.Rollback%2A> methods.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlConnection.BeginTransaction Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IDbTransaction/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/ITableMapping.xml b/xml/System.Data/ITableMapping.xml
index ecfabccc348..b64865de401 100644
--- a/xml/System.Data/ITableMapping.xml
+++ b/xml/System.Data/ITableMapping.xml
@@ -57,7 +57,7 @@
  The following example creates an instance of the derived class, <xref:System.Data.Common.DataTableMapping>, and adds it to a <xref:System.Data.Common.DataTableMappingCollection> collection. It then informs the user that the mapping was added to the collection and displays the parent mapping.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ITableMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -130,7 +130,7 @@
  The following example creates an instance of the derived class, <xref:System.Data.Common.DataTableMapping>, sets some of its properties, and copies its <xref:System.Data.Common.DataTableMapping.ColumnMappings%2A> to an array. This example assumes that a <xref:System.Data.Common.DataColumnMappingCollection> has been created.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ColumnMappings Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping.ColumnMappings Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ITableMapping/ColumnMappings/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/ITableMappingCollection.xml b/xml/System.Data/ITableMappingCollection.xml
index 0f444b7350b..c971bf1c42f 100644
--- a/xml/System.Data/ITableMappingCollection.xml
+++ b/xml/System.Data/ITableMappingCollection.xml
@@ -68,7 +68,7 @@
  The following example creates an instance of the derived class, <xref:System.Data.Common.DataTableMapping>, and adds it to a <xref:System.Data.Common.DataTableMappingCollection> collection. It then informs the user that the mapping was added to the collection.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData DataTableMapping Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ITableMapping/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/IsolationLevel.xml b/xml/System.Data/IsolationLevel.xml
index d973897cef3..a35b8f5a4be 100644
--- a/xml/System.Data/IsolationLevel.xml
+++ b/xml/System.Data/IsolationLevel.xml
@@ -155,7 +155,7 @@ When using <xref:System.Data.Odbc.OdbcTransaction>, if you do not set <xref:Syst
  If the transaction allows the behavior, the Quantity value will be added twice.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/system_data_isolationlevel/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/system_data_isolationlevel/vb/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/IsolationLevel/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/MappingType.xml b/xml/System.Data/MappingType.xml
index 280c009d663..732aa16e7dd 100644
--- a/xml/System.Data/MappingType.xml
+++ b/xml/System.Data/MappingType.xml
@@ -61,7 +61,7 @@
  The following example returns the <xref:System.Data.DataColumn.ColumnMapping%2A> property value for each column in a table.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData MappingType Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData MappingType Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/MappingType/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/PropertyCollection.xml b/xml/System.Data/PropertyCollection.xml
index 8cfb9e87350..41c926f0782 100644
--- a/xml/System.Data/PropertyCollection.xml
+++ b/xml/System.Data/PropertyCollection.xml
@@ -73,7 +73,7 @@
  The following example creates a timestamp value for a <xref:System.Data.DataTable> and adds it to the <xref:System.Data.PropertyCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData PropertyCollection Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData PropertyCollection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/PropertyCollection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/RowNotInTableException.xml b/xml/System.Data/RowNotInTableException.xml
index 9f05ea90514..de30e143b54 100644
--- a/xml/System.Data/RowNotInTableException.xml
+++ b/xml/System.Data/RowNotInTableException.xml
@@ -78,7 +78,7 @@
  The following example creates a <xref:System.Data.DataTable> with one <xref:System.Data.DataColumn> and 10 <xref:System.Data.DataRow> objects. After deleting a row, the <xref:System.Data.DataRow.AcceptChanges%2A> method is called causing the <xref:System.Data.RowNotInTableException> to be thrown.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData RowNotInTableException Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData RowNotInTableException Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/RowNotInTableException/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/Rule.xml b/xml/System.Data/Rule.xml
index a780c0341d6..28aa1bf998a 100644
--- a/xml/System.Data/Rule.xml
+++ b/xml/System.Data/Rule.xml
@@ -61,7 +61,7 @@
    
   
 ## Examples  
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData ForeignKeyConstraint Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/ForeignKeyConstraint/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/StateChangeEventArgs.xml b/xml/System.Data/StateChangeEventArgs.xml
index 6487fd32f48..f95ee59972d 100644
--- a/xml/System.Data/StateChangeEventArgs.xml
+++ b/xml/System.Data/StateChangeEventArgs.xml
@@ -57,7 +57,7 @@
  The following example shows how to use the `StateChange` event within the <xref:System.Data.SqlClient.SqlConnection> class.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData StateChangeEventArgs Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData StateChangeEventArgs Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/StateChangeEventArgs/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Data/UniqueConstraint.xml b/xml/System.Data/UniqueConstraint.xml
index 5d43f78a7fc..8f24d0c796d 100644
--- a/xml/System.Data/UniqueConstraint.xml
+++ b/xml/System.Data/UniqueConstraint.xml
@@ -85,7 +85,7 @@
 ## Examples  
  The following example adds a <xref:System.Data.UniqueConstraint> to a <xref:System.Data.DataSet> and sets the <xref:System.Data.DataSet.EnforceConstraints%2A> property to `true`.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/UniqueConstraint/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -153,7 +153,7 @@
 ## Examples  
  The following example creates a new <xref:System.Data.UniqueConstraint> and assigns it to the <xref:System.Data.DataRelation.ParentKeyConstraint%2A> property of a <xref:System.Data.DataRelation>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.UniqueConstraint Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/UniqueConstraint/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -346,7 +346,7 @@
 ## Examples  
  The following example creates a new <xref:System.Data.UniqueConstraint> and assigns it to the <xref:System.Data.DataRelation.ParentKeyConstraint%2A> property of a <xref:System.Data.DataRelation>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.UniqueConstraint Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/UniqueConstraint/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -410,7 +410,7 @@
  The following example creates a <xref:System.Data.DataTable> with two columns, and adds a new <xref:System.Data.UniqueConstraint> to the <xref:System.Data.ConstraintCollection>.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.UniqueConstraint2 Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.UniqueConstraint2 Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/UniqueConstraint/.ctor/source1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -649,7 +649,7 @@
 ## Examples  
  The following example returns the <xref:System.Data.DataColumn> objects that the <xref:System.Data.UniqueConstraint> constrains.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Columns Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/UniqueConstraint/Columns/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -718,7 +718,7 @@
 ## Examples  
  The following example compares two UniqueConstraint objects.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Equals Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/UniqueConstraint/Equals/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -824,7 +824,7 @@
 ## Examples  
  The following example checks the <xref:System.Data.UniqueConstraint.IsPrimaryKey%2A> property.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.IsPrimaryKey Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/UniqueConstraint/IsPrimaryKey/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -890,7 +890,7 @@
 ## Examples  
  The following example returns a <xref:System.Data.UniqueConstraint> object's <xref:System.Data.DataTable>.  
   
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData UniqueConstraint.Table Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/UniqueConstraint/Table/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Data/VersionNotFoundException.xml b/xml/System.Data/VersionNotFoundException.xml
index e4f06d9a428..f7bc11f05cb 100644
--- a/xml/System.Data/VersionNotFoundException.xml
+++ b/xml/System.Data/VersionNotFoundException.xml
@@ -61,7 +61,7 @@
  The following example creates a <xref:System.Data.DataTable> with one <xref:System.Data.DataColumn> and ten <xref:System.Data.DataRow> objects. After deleting a <xref:System.Data.DataRow>, trying to return the removed row's current version causes a <xref:System.Data.VersionNotFoundException> exception being thrown.  
   
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData VersionNotFoundException Example/CS/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData VersionNotFoundException Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Data/VersionNotFoundException/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>